Version++

+ code/API cleanup

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.9.{build}
+version: 7.13.{build}
 configuration: Release
 platform: Any CPU
 environment:

.travis.yml

@@ -9,7 +9,7 @@ before_install:
 
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev libqt4-opengl-dev; fi
 
 script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi

README.md

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

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.9
+VERSION = 7.13
 
 QT += core \
     gui \
@@ -180,7 +180,10 @@ HEADERS += src/common/config.h \
     src/map/IMG/netfile.h \
     src/GUI/limitedcombobox.h \
     src/GUI/pathtickitem.h \
-    src/map/IMG/textitem.h
+    src/map/IMG/textitem.h \
+    src/map/IMG/label.h \
+    src/data/csv.h \
+    src/data/cupparser.h
 SOURCES += src/main.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
@@ -311,14 +314,17 @@ SOURCES += src/main.cpp \
     src/map/IMG/style.cpp \
     src/map/IMG/netfile.cpp \
     src/GUI/pathtickitem.cpp \
-    src/map/IMG/textitem.cpp
+    src/map/IMG/textitem.cpp \
+    src/data/csv.cpp \
+    src/data/cupparser.cpp
 
 greaterThan(QT_MAJOR_VERSION, 4) {
     HEADERS += src/data/geojsonparser.h
     SOURCES += src/data/geojsonparser.cpp
 }
 
-DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
+    QT_NO_DEPRECATED_WARNINGS
 DEFINES *= QT_USE_QSTRINGBUILDER
 
 RESOURCES += gpxsee.qrc
@@ -369,7 +375,8 @@ macx {
         icons/formats/wpt.icns \
         icons/formats/loc.icns \
         icons/formats/slf.icns \
-        icons/formats/json.icns
+        icons/formats/json.icns \
+        icons/formats/cup.icns
     QMAKE_BUNDLE_DATA += locale maps icons csv
 }
 
@@ -386,7 +393,8 @@ win32 {
         icons/formats/wpt.ico \
         icons/formats/loc.ico \
         icons/formats/slf.ico \
-        icons/formats/json.ico
+        icons/formats/json.ico \
+        icons/formats/cup.ico
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }

icons/scripts/extensions

@@ -10,3 +10,4 @@ tcx:#ffcc00
 wpt:#66ff00
 loc:#556677
 slf:#881199
+cup:#20a810

lang/gpxsee_es.ts

@@ -30,7 +30,7 @@
     <message>
         <location filename="../src/GUI/cadencegraphitem.cpp" line="17"/>
         <source>Maximum</source>
-        <translation>Mínima</translation>
+        <translation>Máxima</translation>
     </message>
     <message>
         <location filename="../src/GUI/cadencegraphitem.cpp" line="18"/>

lang/gpxsee_fr.ts

@@ -422,7 +422,7 @@
         <location filename="../src/GUI/gui.cpp" line="721"/>
         <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>Paths</source>
-        <translation>Chemin d&apos;accès</translation>
+        <translation>Chemins d&apos;accès</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="248"/>
@@ -1055,7 +1055,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="168"/>
         <source>Palette shift:</source>
-        <translation>Décalage de palette :</translation>
+        <translation>Incrément de palette :</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="112"/>

lang/gpxsee_pl.ts

@@ -64,7 +64,7 @@
     <message>
         <location filename="../src/data/data.cpp" line="152"/>
         <source>GeoJSON files</source>
-        <translation type="unfinished"></translation>
+        <translation>Pliki GeoJSON</translation>
     </message>
     <message>
         <location filename="../src/data/data.cpp" line="154"/>
@@ -79,7 +79,7 @@
     <message>
         <location filename="../src/data/data.cpp" line="156"/>
         <source>JPEG images</source>
-        <translation type="unfinished"></translation>
+        <translation>Pliki JPEG</translation>
     </message>
     <message>
         <location filename="../src/data/data.cpp" line="157"/>
@@ -439,7 +439,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="315"/>
         <source>Show cursor coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż współrzędne kursora</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="322"/>
@@ -459,7 +459,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż obszary</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="342"/>
@@ -469,7 +469,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>km/mi markers</source>
-        <translation type="unfinished"></translation>
+        <translation>Znaczniki km/mi</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="359"/>
@@ -489,7 +489,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show path markers</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż znaczniki ścieżki</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="400"/>
@@ -651,18 +651,18 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="731"/>
         <source>DEM directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Katalog z danymi DEM:</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="733"/>
         <source>Styles directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Katalog ze stylami:</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="1037"/>
         <location filename="../src/GUI/gui.cpp" line="1105"/>
         <source>Areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Obszary</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="1080"/>
@@ -736,7 +736,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="735"/>
         <source>Tile cache directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Katalog pamięci podręcznej kafelków:</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="1031"/>
@@ -1018,7 +1018,7 @@
     <message>
         <location filename="../src/map/maplist.cpp" line="123"/>
         <source>Garmin IMG maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Mapy Garmin IMG</translation>
     </message>
     <message>
         <location filename="../src/map/maplist.cpp" line="125"/>
@@ -1038,7 +1038,7 @@
     <message>
         <location filename="../src/map/maplist.cpp" line="129"/>
         <source>TwoNav maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Mapy TwoNav</translation>
     </message>
     <message>
         <location filename="../src/map/maplist.cpp" line="130"/>
@@ -1309,18 +1309,18 @@
         <location filename="../src/GUI/optionsdialog.cpp" line="378"/>
         <location filename="../src/GUI/optionsdialog.cpp" line="436"/>
         <source>GPS data</source>
-        <translation type="unfinished"></translation>
+        <translation>Dane GPS</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="379"/>
         <location filename="../src/GUI/optionsdialog.cpp" line="437"/>
         <source>DEM data</source>
-        <translation type="unfinished"></translation>
+        <translation>Dane DEM</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="416"/>
         <source>Elevation</source>
-        <translation type="unfinished">Wysokość</translation>
+        <translation>Wysokość</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="427"/>
@@ -1330,7 +1330,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="428"/>
         <source>Sources</source>
-        <translation type="unfinished"></translation>
+        <translation>Źródła</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="429"/>
@@ -1340,7 +1340,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="462"/>
         <source>Radius:</source>
-        <translation type="unfinished"></translation>
+        <translation>Promień:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="410"/>
@@ -1350,37 +1350,37 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="72"/>
         <source>Projection:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odwzorowanie:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="94"/>
         <source>Vector maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Mapy wektorowe</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="147"/>
         <source>Area border width:</source>
-        <translation type="unfinished"></translation>
+        <translation>Szerokość granicy obszaru:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="148"/>
         <source>Area border style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Styl obramowania obszaru:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="149"/>
         <source>Area fill opacity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieprzezroczystość wypełnienia obszaru:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="153"/>
         <source>Fill opacity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieprzezroczystość wypełnienia:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="154"/>
         <source>Areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Obszary</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="448"/>
@@ -1530,12 +1530,12 @@
     <message>
         <location filename="../src/GUI/areaitem.cpp" line="15"/>
         <source>Name</source>
-        <translation type="unfinished">Nazwa</translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <location filename="../src/GUI/areaitem.cpp" line="17"/>
         <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <translation>Opis</translation>
     </message>
 </context>
 <context>

pkg/Info.plist

@@ -211,6 +211,22 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>cup</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.naviter.seeyou.cup</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/cup.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>SeeYou CUP File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 
 	<key>UTImportedTypeDeclarations</key>
@@ -467,6 +483,27 @@
 				<string>application/geo+json</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.naviter.seeyou.cup</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.naviter.com</string>
+			<key>UTTypeDescription</key>
+			<string>SeeYou CUP File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>cup</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.naviter.seeyou.cup</string>
+			</dict>
+		</dict>
 	</array>
 </dict>
 </plist>

pkg/appdata.xml

@@ -13,7 +13,8 @@
 		<p>Features:</p>
 		<ul>
 			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, OziExplorer (PLT,
-				WPT, RTE), GeoJSON, Garmin CSV and geotagged JPEG files.</li>
+				WPT, RTE), GeoJSON, SeeYou CUP, Garmin CSV and geotagged
+				JPEG files.</li>
 			<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
 				WMS, TMS).</li>
 			<li>Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
@@ -67,5 +68,6 @@
 		<mimetype>application/loc+xml</mimetype>
 		<mimetype>application/slf+xml</mimetype>
 		<mimetype>application/geo+json</mimetype>
+		<mimetype>application/vnd.naviter.seeyou.cup</mimetype>
 	</mimetypes>
 </component>

pkg/gpxsee.desktop

@@ -11,4 +11,4 @@ Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt;
-MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;
+MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;

pkg/gpxsee.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.9"
+!define VERSION "7.13"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -106,18 +106,19 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 5
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 12
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 6
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 7
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 8
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 9
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 10
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 11
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 12
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 13
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   !insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
+  !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP file" 5
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -227,6 +228,7 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "loc"
   !insertmacro FILE_ASSOCIATION_REMOVE "slf"
   !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
+  !insertmacro FILE_ASSOCIATION_REMOVE "cup" 
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -257,4 +259,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!insertmacro MUI_FUNCTION_DESCRIPTION_END

pkg/gpxsee.xml

@@ -84,4 +84,11 @@
 		<generic-icon name="text-plain"/>
 		<glob pattern="*.geojson"/>
 	</mime-type>
+
+	<mime-type type="application/vnd.naviter.seeyou.cup">
+		<comment>SeeYou CUP File</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<glob pattern="*.cup"/>
+	</mime-type>
 </mime-info>

pkg/gpxsee64.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.9"
+!define VERSION "7.13"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -113,18 +113,19 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 5
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 12
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 6
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 7
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 8
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 9
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 10
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 11
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 12
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 13
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   !insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
+  !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP file" 5
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -230,6 +231,7 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "loc"
   !insertmacro FILE_ASSOCIATION_REMOVE "slf"
   !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
+  !insertmacro FILE_ASSOCIATION_REMOVE "cup"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -260,4 +262,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!insertmacro MUI_FUNCTION_DESCRIPTION_END

src/GUI/areaitem.cpp

@@ -153,3 +153,21 @@ void AreaItem::setDigitalZoom(int zoom)
 	_digitalZoom = zoom;
 	_pen.setWidthF(_width * pow(2, -_digitalZoom));
 }
+
+void AreaItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+	Q_UNUSED(event);
+
+	_pen.setWidthF((_width + 1) * pow(2, -_digitalZoom));
+	setZValue(zValue() + 1.0);
+	update();
+}
+
+void AreaItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+	Q_UNUSED(event);
+
+	_pen.setWidthF(_width * pow(2, -_digitalZoom));
+	setZValue(zValue() - 1.0);
+	update();
+}

src/GUI/areaitem.h

@@ -27,6 +27,9 @@ public:
 	void setDigitalZoom(int zoom);
 
 private:
+	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+
 	QPainterPath painterPath(const Polygon &polygon);
 	void updatePainterPath();
 	QString toolTip() const;

src/GUI/axisitem.cpp

@@ -30,7 +30,7 @@ private:
 Ticks::Ticks(double minValue, double maxValue, int maxCount)
 {
 	double range = niceNum(maxValue - minValue, false);
-	_d = niceNum(range / maxCount, true);
+	_d = niceNum(range / maxCount, false);
 	_min = ceil(minValue / _d) * _d;
 	_max = floor(maxValue / _d) * _d;
 }

src/GUI/cadencegraph.cpp

@@ -14,6 +14,11 @@ CadenceGraph::CadenceGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+CadenceGraph::~CadenceGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void CadenceGraph::setInfo()
 {
 	if (_showTracks) {
@@ -36,23 +41,28 @@ QList<GraphItem*> CadenceGraph::loadData(const Data &data)
 		const Graph &graph = track.cadence();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			CadenceGraphItem *gi = new CadenceGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			CadenceGraphItem *gi = new CadenceGraphItem(graph, _graphType,
+			  _width, _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -75,6 +85,9 @@ qreal CadenceGraph::avg() const
 
 void CadenceGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -84,7 +97,13 @@ void CadenceGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/cadencegraph.h

@@ -3,18 +3,20 @@
 
 #include "graphtab.h"
 
+class CadenceGraphItem;
+
 class CadenceGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	CadenceGraph(QWidget *parent = 0);
+	~CadenceGraph();
 
 	QString label() const {return tr("Cadence");}
 	QList<GraphItem*> loadData(const Data &data);
 	void clear();
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;
@@ -24,6 +26,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<CadenceGraphItem *> _tracks;
 };
 
 #endif // CADENCEGRAPH_H

src/GUI/cadencegraphitem.cpp

@@ -4,7 +4,8 @@
 
 
 CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	setToolTip(toolTip());
 }

src/GUI/cadencegraphitem.h

@@ -8,8 +8,8 @@ class CadenceGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	CadenceGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	CadenceGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 private:
 	QString toolTip() const;

src/GUI/elevationgraph.cpp

@@ -8,26 +8,18 @@
 
 static qreal nMin(qreal a, qreal b)
 {
-	if (!std::isnan(a) && !std::isnan(b))
-		return qMin(a, b);
-	else if (!std::isnan(a))
-		return a;
-	else if (!std::isnan(b))
-		return b;
+	if (std::isnan(a))
+		return std::isnan(b) ? NAN : b;
 	else
-		return NAN;
+		return std::isnan(b) ? a : qMin(a, b);
 }
 
 static qreal nMax(qreal a, qreal b)
 {
-	if (!std::isnan(a) && !std::isnan(b))
-		return qMax(a, b);
-	else if (!std::isnan(a))
-		return a;
-	else if (!std::isnan(b))
-		return b;
+	if (std::isnan(a))
+		return std::isnan(b) ? NAN : b;
 	else
-		return NAN;
+		return std::isnan(b) ? a : qMax(a, b);
 }
 
 ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
@@ -49,6 +41,12 @@ ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
 	setMinYRange(50.0);
 }
 
+ElevationGraph::~ElevationGraph()
+{
+	qDeleteAll(_tracks);
+	qDeleteAll(_routes);
+}
+
 void ElevationGraph::setInfo()
 {
 	if (std::isnan(max()) || std::isnan(min()))
@@ -70,19 +68,28 @@ void ElevationGraph::setInfo()
 GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
 {
 	if (!graph.isValid()) {
-		skipColor();
+		_palette.nextColor();
 		return 0;
 	}
 
-	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType);
-	GraphView::addGraph(gi, type);
+	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType, _width,
+	  _palette.nextColor());
+	gi->setUnits(_units);
 
 	if (type == Track) {
+		_tracks.append(gi);
+		if (_showTracks)
+			addGraph(gi);
+
 		_trackAscent += gi->ascent();
 		_trackDescent += gi->descent();
 		_trackMax = nMax(_trackMax, gi->max());
 		_trackMin = nMin(_trackMin, gi->min());
 	} else {
+		_routes.append(gi);
+		if (_showRoutes)
+			addGraph(gi);
+
 		_routeAscent += gi->ascent();
 		_routeDescent += gi->descent();
 		_routeMax = nMax(_routeMax, gi->max());
@@ -101,7 +108,7 @@ QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 	for (int i = 0; i < data.routes().count(); i++)
 		graphs.append(loadGraph(data.routes().at(i).elevation(), Route));
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -111,6 +118,11 @@ QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 
 void ElevationGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+	qDeleteAll(_routes);
+	_routes.clear();
+
 	_trackAscent = 0;
 	_routeAscent = 0;
 	_trackDescent = 0;
@@ -142,12 +154,23 @@ void ElevationGraph::setUnits(Units units)
 	GraphView::setUnits(units);
 }
 
+void ElevationGraph::showItems(const QList<ElevationGraphItem *> &list,
+  bool show)
+{
+	for (int i = 0; i < list.size(); i++) {
+		if (show)
+			addGraph(list.at(i));
+		else
+			removeGraph(list.at(i));
+	}
+}
+
 void ElevationGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
+	showItems(_tracks, show);
 	setInfo();
-	showGraph(show, Track);
 
 	redraw();
 }
@@ -156,7 +179,7 @@ void ElevationGraph::showRoutes(bool show)
 {
 	_showRoutes = show;
 
-	showGraph(show, Route);
+	showItems(_routes, show);
 	setInfo();
 
 	redraw();

src/GUI/elevationgraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class ElevationGraphItem;
+
 class ElevationGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	ElevationGraph(QWidget *parent = 0);
+	~ElevationGraph();
 
 	QString label() const {return tr("Elevation");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -29,6 +32,7 @@ private:
 	void setInfo();
 
 	GraphItem *loadGraph(const Graph &graph, Type type);
+	void showItems(const QList<ElevationGraphItem *> &list, bool show);
 
 	qreal _trackAscent, _trackDescent;
 	qreal _routeAscent, _routeDescent;
@@ -36,6 +40,7 @@ private:
 	qreal _trackMin, _routeMin;
 
 	bool _showTracks, _showRoutes;
+	QList<ElevationGraphItem *> _tracks, _routes;
 };
 
 #endif // ELEVATIONGRAPH_H

src/GUI/elevationgraphitem.cpp

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

src/GUI/elevationgraphitem.h

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

src/GUI/gearratiograph.cpp

@@ -14,6 +14,11 @@ GearRatioGraph::GearRatioGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(2);
 }
 
+GearRatioGraph::~GearRatioGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void GearRatioGraph::setInfo()
 {
 	if (_showTracks) {
@@ -37,11 +42,15 @@ QList<GraphItem*> GearRatioGraph::loadData(const Data &data)
 		const Graph &graph = data.tracks().at(i).ratio();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			GearRatioGraphItem *gi = new GearRatioGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			GearRatioGraphItem *gi = new GearRatioGraphItem(graph, _graphType,
+			  _width, _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
 
 			for (QMap<qreal, qreal>::const_iterator it = gi->map().constBegin();
 			  it != gi->map().constEnd(); ++it)
@@ -51,12 +60,12 @@ QList<GraphItem*> GearRatioGraph::loadData(const Data &data)
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -70,10 +79,7 @@ qreal GearRatioGraph::top() const
 
 	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
 	  it != _map.constEnd(); ++it) {
-		if (it == _map.constBegin()) {
-			val = it.value();
-			key = it.key();
-		} else if (it.value() > val) {
+		if (std::isnan(val) || it.value() > val) {
 			val = it.value();
 			key = it.key();
 		}
@@ -84,6 +90,9 @@ qreal GearRatioGraph::top() const
 
 void GearRatioGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_map.clear();
 
 	GraphTab::clear();
@@ -93,7 +102,13 @@ void GearRatioGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/gearratiograph.h

@@ -4,12 +4,15 @@
 #include <QMap>
 #include "graphtab.h"
 
+class GearRatioGraphItem;
+
 class GearRatioGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	GearRatioGraph(QWidget *parent = 0);
+	~GearRatioGraph();
 
 	QString label() const {return tr("Gear ratio");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -25,6 +28,7 @@ private:
 	QMap<qreal, qreal> _map;
 
 	bool _showTracks;
+	QList<GearRatioGraphItem*> _tracks;
 };
 
 #endif // GEARRATIOGRAPH_H

src/GUI/gearratiographitem.cpp

@@ -5,21 +5,27 @@
 
 
 GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent), _top(NAN)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
-	qreal val = NAN;
-
-	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
-	  it != _map.constEnd(); ++it) {
-		if (it == _map.constBegin()) {
-			val = it.value();
-			_top = it.key();
-		} else if (it.value() > val) {
-			val = it.value();
-			_top = it.key();
+	for (int i = 0; i < graph.size(); i++) {
+		const GraphSegment &segment = graph.at(i);
+		for (int j = 1; j < segment.size(); j++) {
+			qreal dx = segment.at(j).s() - segment.at(j-1).s();
+			_map.insert(segment.at(j).y(), _map.value(segment.at(j).y()) + dx);
 		}
 	}
 
+	qreal key = NAN, val = NAN;
+	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
+	  it != _map.constEnd(); ++it) {
+		if (std::isnan(val) || it.value() > val) {
+			val = it.value();
+			key = it.key();
+		}
+	}
+	_top = key;
+
 	setToolTip(toolTip());
 }
 

src/GUI/gearratiographitem.h

@@ -9,8 +9,8 @@ class GearRatioGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	GearRatioGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	GearRatioGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 	qreal top() const {return _top;}
 

src/GUI/graphitem.cpp

@@ -2,30 +2,25 @@
 #include "graphitem.h"
 
 
-GraphItem::GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent)
+GraphItem::GraphItem(const Graph &graph, GraphType type, int width,
+  const QColor &color, QGraphicsItem *parent)
   : QGraphicsObject(parent), _graph(graph), _type(type)
 {
 	Q_ASSERT(_graph.isValid());
 
-	_id = 0;
-	_width = 1;
-	_pen = QPen(Qt::black, _width);
-	_sx = 1.0; _sy = 1.0;
+	_pen = QPen(color, width);
+	_sx = 0; _sy = 0;
 	_time = _graph.hasTime();
-
 	setZValue(2.0);
-
-	updatePath();
-	updateShape();
-	updateBounds();
-
 	setAcceptHoverEvents(true);
+
+	updateBounds();
 }
 
 void GraphItem::updateShape()
 {
 	QPainterPathStroker s;
-	s.setWidth(_width + 1);
+	s.setWidth(_pen.width() + 1);
 	_shape = s.createStroke(_path);
 }
 
@@ -54,7 +49,6 @@ void GraphItem::setGraphType(GraphType type)
 
 	_type = type;
 	updatePath();
-	updateShape();
 	updateBounds();
 }
 
@@ -69,12 +63,11 @@ void GraphItem::setColor(const QColor &color)
 
 void GraphItem::setWidth(int width)
 {
-	if (width == _width)
+	if (width == _pen.width())
 		return;
 
 	prepareGeometryChange();
 
-	_width = width;
 	_pen.setWidth(width);
 
 	updateShape();
@@ -170,10 +163,10 @@ void GraphItem::emitSliderPositionChanged(qreal pos)
 void GraphItem::hover(bool hover)
 {
 	if (hover) {
-		_pen.setWidth(_width + 1);
+		_pen.setWidth(_pen.width() + 1);
 		setZValue(zValue() + 1.0);
 	} else {
-		_pen.setWidth(_width);
+		_pen.setWidth(_pen.width() - 1);
 		setZValue(zValue() - 1.0);
 	}
 
@@ -189,23 +182,30 @@ void GraphItem::setScale(qreal sx, qreal sy)
 
 	_sx = sx; _sy = sy;
 	updatePath();
-	updateShape();
 }
 
 void GraphItem::updatePath()
 {
-	_path = QPainterPath();
-
-	if (_type == Time && !_time)
+	if (_sx == 0 && _sy == 0)
 		return;
 
-	for (int i = 0; i < _graph.size(); i++) {
-		const GraphSegment &segment = _graph.at(i);
+	prepareGeometryChange();
 
-		_path.moveTo(segment.first().x(_type) * _sx, -segment.first().y() * _sy);
-		for (int i = 1; i < segment.size(); i++)
-			_path.lineTo(segment.at(i).x(_type) * _sx, -segment.at(i).y() * _sy);
+	_path = QPainterPath();
+
+	if (!(_type == Time && !_time)) {
+		for (int i = 0; i < _graph.size(); i++) {
+			const GraphSegment &segment = _graph.at(i);
+
+			_path.moveTo(segment.first().x(_type) * _sx, -segment.first().y()
+			  * _sy);
+			for (int i = 1; i < segment.size(); i++)
+				_path.lineTo(segment.at(i).x(_type) * _sx, -segment.at(i).y()
+				  * _sy);
+		}
 	}
+
+	updateShape();
 }
 
 void GraphItem::updateBounds()
@@ -286,7 +286,7 @@ void GraphItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF(_width + 1);
+	_pen.setWidth(_pen.width() + 1);
 	setZValue(zValue() + 1.0);
 	update();
 
@@ -297,7 +297,7 @@ void GraphItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF(_width);
+	_pen.setWidth(_pen.width() - 1);
 	setZValue(zValue() - 1.0);
 	update();
 

src/GUI/graphitem.h

@@ -11,7 +11,8 @@ class GraphItem : public QGraphicsObject
 	Q_OBJECT
 
 public:
-	GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent = 0);
+	GraphItem(const Graph &graph, GraphType type, int width, const QColor &color,
+	  QGraphicsItem *parent = 0);
 	virtual ~GraphItem() {}
 
 	QPainterPath shape() const {return _shape;}
@@ -27,8 +28,6 @@ public:
 
 	void setScale(qreal sx, qreal sy);
 	void setGraphType(GraphType type);
-	int id() const {return _id;}
-	void setId(int id) {_id = id;}
 	void setColor(const QColor &color);
 	void setWidth(int width);
 	virtual void setUnits(Units units) {Q_UNUSED(units);}
@@ -55,17 +54,13 @@ private:
 	void updateShape();
 	void updateBounds();
 
-	int _id;
-	QPen _pen;
-	int _width;
-
 	Graph _graph;
 	GraphType _type;
-
 	QPainterPath _path;
 	QPainterPath _shape;
 	QRectF _bounds;
 	qreal _sx, _sy;
+	QPen _pen;
 
 	bool _time;
 };

src/GUI/graphview.cpp

@@ -1,8 +1,7 @@
 #include <QGraphicsScene>
 #include <QEvent>
 #include <QMouseEvent>
-#include <QPaintEngine>
-#include <QPaintDevice>
+#include <QScrollBar>
 #include <QGraphicsSimpleTextItem>
 #include <QPalette>
 #include <QLocale>
@@ -64,6 +63,8 @@ GraphView::GraphView(QWidget *parent)
 	_units = Metric;
 	_graphType = Distance;
 	_xLabel = tr("Distance");
+
+	_zoom = 1.0;
 }
 
 GraphView::~GraphView()
@@ -74,9 +75,6 @@ GraphView::~GraphView()
 	delete _info;
 	delete _grid;
 	delete _message;
-
-	for (int i = 0; i < _graphs.count(); i++)
-		delete _graphs[i];
 }
 
 void GraphView::createXLabel()
@@ -167,14 +165,7 @@ void GraphView::setGraphType(GraphType type)
 	for (int i = 0; i < _graphs.count(); i++) {
 		GraphItem *gi = _graphs.at(i);
 		gi->setGraphType(type);
-		if (!_hide.contains(gi->id())) {
-			if (gi->bounds().width() > 0)
-				addItem(gi);
-			else
-				removeItem(gi);
-		}
-		if (gi->scene() == _scene)
-			_bounds |= gi->bounds();
+		_bounds |= gi->bounds();
 	}
 
 	if (type == Distance)
@@ -196,29 +187,31 @@ void GraphView::showSliderInfo(bool show)
 	_sliderInfo->setVisible(show);
 }
 
-void GraphView::addGraph(GraphItem *graph, int id)
+void GraphView::addGraph(GraphItem *graph)
 {
-	QColor color(_palette.nextColor());
-	color.setAlpha(255);
-
-	graph->setUnits(_units);
-	graph->setId(id);
-	graph->setColor(color);
-	graph->setWidth(_width);
-
 	connect(this, SIGNAL(sliderPositionChanged(qreal)), graph,
 	  SLOT(emitSliderPositionChanged(qreal)));
 
 	_graphs.append(graph);
+	_scene->addItem(graph);
+	_bounds |= graph->bounds();
 
-	if (!_hide.contains(id)) {
-		_visible.append(graph);
-		if (graph->bounds().width() > 0) {
-			_scene->addItem(graph);
-			_bounds |= graph->bounds();
-		}
-		setXUnits();
-	}
+	setXUnits();
+}
+
+void GraphView::removeGraph(GraphItem *graph)
+{
+	disconnect(this, SIGNAL(sliderPositionChanged(qreal)), graph,
+	  SLOT(emitSliderPositionChanged(qreal)));
+
+	_graphs.removeOne(graph);
+	_scene->removeItem(graph);
+
+	_bounds = QRectF();
+	for (int i = 0; i < _graphs.count(); i++)
+		_bounds |= _graphs.at(i)->bounds();
+
+	setXUnits();
 }
 
 void GraphView::removeItem(QGraphicsItem *item)
@@ -233,29 +226,6 @@ void GraphView::addItem(QGraphicsItem *item)
 		_scene->addItem(item);
 }
 
-void GraphView::showGraph(bool show, int id)
-{
-	if (show)
-		_hide.remove(id);
-	else
-		_hide.insert(id);
-
-	_visible.clear();
-	_bounds = QRectF();
-	for (int i = 0; i < _graphs.count(); i++) {
-		GraphItem *gi = _graphs.at(i);
-		if (_hide.contains(gi->id()))
-			removeItem(gi);
-		else {
-			_visible.append(gi);
-			if (gi->bounds().width() > 0) {
-				addItem(gi);
-				_bounds |= gi->bounds();
-			}
-		}
-	}
-}
-
 QRectF GraphView::bounds() const
 {
 	QRectF br(_bounds);
@@ -314,9 +284,10 @@ void GraphView::redraw(const QSizeF &size)
 	sx = (size.width() - (my.width() + mx.width())) / r.width();
 	sy = (size.height() - (mx.height() + my.height())
 	  - _info->boundingRect().height()) / r.height();
+	sx *= _zoom;
 
-	for (int i = 0; i < _visible.size(); i++)
-		_visible.at(i)->setScale(sx, sy);
+	for (int i = 0; i < _graphs.size(); i++)
+		_graphs.at(i)->setScale(sx, sy);
 
 	QPointF p(r.left() * sx, r.top() * sy);
 	QSizeF s(r.width() * sx, r.height() * sy);
@@ -361,6 +332,40 @@ void GraphView::mousePressEvent(QMouseEvent *e)
 	QGraphicsView::mousePressEvent(e);
 }
 
+void GraphView::wheelEvent(QWheelEvent *e)
+{
+	static int deg = 0;
+
+	deg += e->delta() / 8;
+	if (qAbs(deg) < 15)
+		return;
+	deg = 0;
+
+	QPointF pos = mapToScene(e->pos());
+	QRectF gr(_grid->boundingRect());
+	QPointF r(pos.x() / gr.width(), pos.y() / gr.height());
+
+	_zoom = (e->delta() > 0) ? _zoom * 1.25 : qMax(_zoom / 1.25, 1.0);
+	redraw();
+
+	QRectF ngr(_grid->boundingRect());
+	QPointF npos(mapFromScene(QPointF(r.x() * ngr.width(),
+	  r.y() * ngr.height())));
+	QScrollBar *sb = horizontalScrollBar();
+	sb->setSliderPosition(sb->sliderPosition() + npos.x() - e->pos().x());
+
+	QGraphicsView::wheelEvent(e);
+}
+
+void GraphView::paintEvent(QPaintEvent *event)
+{
+	QRectF viewRect(mapToScene(rect()).boundingRect());
+	_info->setPos(QPointF(viewRect.left() + (viewRect.width()
+	  - _info->boundingRect().width())/2.0, _info->pos().y()));
+
+	QGraphicsView::paintEvent(event);
+}
+
 void GraphView::plot(QPainter *painter, const QRectF &target, qreal scale)
 {
 	QSizeF canvas = QSizeF(target.width() / scale, target.height() / scale);
@@ -377,56 +382,45 @@ void GraphView::plot(QPainter *painter, const QRectF &target, qreal scale)
 
 void GraphView::clear()
 {
+	_graphs.clear();
+
 	_slider->clear();
 	_info->clear();
 
-	for (int i = 0; i < _graphs.count(); i++)
-		delete _graphs[i];
-
-	_graphs.clear();
-	_visible.clear();
 	_palette.reset();
 
 	_bounds = QRectF();
 	_sliderPos = 0;
+	_zoom = 1.0;
 
 	_scene->setSceneRect(0, 0, 0, 0);
 }
 
 void GraphView::updateSliderPosition()
 {
-	if (bounds().width() <= 0)
-		return;
-
 	if (_sliderPos <= bounds().right() && _sliderPos >= bounds().left()) {
 		_slider->setPos((_sliderPos / bounds().width())
 		  * _slider->area().width(), _slider->area().bottom());
-		_slider->setVisible(!_visible.isEmpty());
+		_slider->setVisible(true);
+		updateSliderInfo();
 	} else {
 		_slider->setPos(_slider->area().left(), _slider->area().bottom());
 		_slider->setVisible(false);
 	}
-
-	if (_slider->isVisible())
-		updateSliderInfo();
 }
 
 void GraphView::updateSliderInfo()
 {
 	QLocale l(QLocale::system());
-	qreal r, y;
+	qreal r = 0, y = 0;
 
-
-	if (_visible.count() > 1) {
-		r = 0;
-		y = 0;
-	} else {
-		QRectF br(_visible.first()->bounds());
+	if (_graphs.count() == 1) {
+		QRectF br(_graphs.first()->bounds());
 		if (br.height() < _minYRange)
 			br.adjust(0, -(_minYRange/2 - br.height()/2), 0,
 			  _minYRange/2 - br.height()/2);
 
-		y = _visible.first()->yAtX(_sliderPos);
+		y = _graphs.first()->yAtX(_sliderPos);
 		r = (y - br.bottom()) / br.height();
 	}
 
@@ -438,7 +432,7 @@ void GraphView::updateSliderInfo()
 	_sliderInfo->setPos(QPointF(0, _slider->boundingRect().height() * r));
 	_sliderInfo->setText(_graphType == Time ? Format::timeSpan(_sliderPos,
 	  bounds().width() > 3600) : l.toString(_sliderPos * _xScale, 'f', 1)
-	  + UNIT_SPACE + _xUnits, (_visible.count() > 1) ? QString()
+	  + UNIT_SPACE + _xUnits, (_graphs.count() > 1) ? QString()
 	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
 	  + _yUnits);
 }
@@ -458,7 +452,7 @@ void GraphView::emitSliderPositionChanged(const QPointF &pos)
 
 void GraphView::setSliderPosition(qreal pos)
 {
-	if (_visible.isEmpty())
+	if (_graphs.isEmpty())
 		return;
 
 	_sliderPos = pos;
@@ -486,11 +480,8 @@ void GraphView::setPalette(const Palette &palette)
 	_palette = palette;
 	_palette.reset();
 
-	for (int i = 0; i < _graphs.count(); i++) {
-		QColor color(_palette.nextColor());
-		color.setAlpha(255);
-		_graphs.at(i)->setColor(color);
-	}
+	for (int i = 0; i < _graphs.count(); i++)
+		_graphs.at(i)->setColor(_palette.nextColor());
 }
 
 void GraphView::setGraphWidth(int width)

src/GUI/graphview.h

@@ -27,7 +27,7 @@ public:
 	~GraphView();
 
 	bool isEmpty() const {return _graphs.isEmpty();}
-	const QList<KV> &info() const {return _info->info();}
+	const QList<KV<QString, QString> > &info() const {return _info->info();}
 	void clear();
 
 	void plot(QPainter *painter, const QRectF &target, qreal scale);
@@ -46,9 +46,9 @@ signals:
 	void sliderPositionChanged(qreal);
 
 protected:
-	void addGraph(GraphItem *graph, int id = 0);
+	void addGraph(GraphItem *graph);
+	void removeGraph(GraphItem *graph);
 
-	void showGraph(bool show, int id = 0);
 	void setGraphType(GraphType type);
 	void setUnits(Units units);
 
@@ -68,12 +68,11 @@ protected:
 	void redraw();
 	void addInfo(const QString &key, const QString &value);
 	void clearInfo();
-	void skipColor() {_palette.nextColor();}
 
-	void changeEvent(QEvent *e);
-
-	QList<GraphItem*> _graphs;
 	GraphType _graphType;
+	Units _units;
+	Palette _palette;
+	int _width;
 
 private slots:
 	void emitSliderPositionChanged(const QPointF &pos);
@@ -91,15 +90,9 @@ private:
 
 	void resizeEvent(QResizeEvent *e);
 	void mousePressEvent(QMouseEvent *e);
-
-	Units _units;
-	qreal _xScale, _yScale;
-	qreal _yOffset;
-	QString _xUnits, _yUnits;
-	QString _xLabel, _yLabel;
-	int _precision;
-	qreal _minYRange;
-	qreal _sliderPos;
+	void wheelEvent(QWheelEvent *e);
+	void changeEvent(QEvent *e);
+	void paintEvent(QPaintEvent *event);
 
 	QGraphicsScene *_scene;
 
@@ -109,12 +102,19 @@ private:
 	InfoItem *_info;
 	GridItem *_grid;
 	QGraphicsSimpleTextItem *_message;
+	QList<GraphItem*> _graphs;
 
-	QList<GraphItem*> _visible;
-	QSet<int> _hide;
 	QRectF _bounds;
-	Palette _palette;
-	int _width;
+	qreal _sliderPos;
+
+	qreal _xScale, _yScale;
+	qreal _yOffset;
+	QString _xUnits, _yUnits;
+	QString _xLabel, _yLabel;
+	int _precision;
+	qreal _minYRange;
+
+	qreal _zoom;
 };
 
 #endif // GRAPHVIEW_H

src/GUI/gui.cpp

@@ -885,8 +885,7 @@ void GUI::closePOIFiles()
 {
 	_poiFilesMenu->clear();
 
-	for (int i = 0; i < _poiFilesActions.count(); i++)
-		delete _poiFilesActions[i];
+	qDeleteAll(_poiFilesActions);
 	_poiFilesActions.clear();
 
 	_poi->clear();
@@ -1067,7 +1066,7 @@ void GUI::statistics()
 
 		text.append("<tr><th colspan=\"2\">" + tab->label() + "</th></tr>");
 		for (int j = 0; j < tab->info().size(); j++) {
-			const KV &kv = tab->info().at(j);
+			const KV<QString, QString> &kv = tab->info().at(j);
 			text.append("<tr><td>" + kv.key() + ":</td><td>" + kv.value()
 			  + "</td></tr>");
 		}

src/GUI/heartrategraph.cpp

@@ -14,6 +14,11 @@ HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(0);
 }
 
+HeartRateGraph::~HeartRateGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void HeartRateGraph::setInfo()
 {
 	if (_showTracks) {
@@ -36,23 +41,28 @@ QList<GraphItem*> HeartRateGraph::loadData(const Data &data)
 		const Graph &graph = track.heartRate();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			HeartRateGraphItem *gi = new HeartRateGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			HeartRateGraphItem *gi = new HeartRateGraphItem(graph, _graphType,
+			  _width, _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -75,6 +85,9 @@ qreal HeartRateGraph::avg() const
 
 void HeartRateGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -84,7 +97,13 @@ void HeartRateGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/heartrategraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class HeartRateGraphItem;
+
 class HeartRateGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	HeartRateGraph(QWidget *parent = 0);
+	~HeartRateGraph();
 
 	QString label() const {return tr("Heart rate");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -23,6 +26,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<HeartRateGraphItem*> _tracks;
 };
 
 #endif // HEARTRATEGRAPH_H

src/GUI/heartrategraphitem.cpp

@@ -4,7 +4,8 @@
 
 
 HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	setToolTip(toolTip());
 }

src/GUI/heartrategraphitem.h

@@ -8,8 +8,8 @@ class HeartRateGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	HeartRateGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	HeartRateGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 private:
 	QString toolTip() const;

src/GUI/infoitem.cpp

@@ -16,7 +16,7 @@ void InfoItem::updateBoundingRect()
 	QFontMetrics fm(_font);
 	qreal width = 0;
 
-	for (QList<KV>::const_iterator i = _list.constBegin();
+	for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
 	  i != _list.constEnd(); i++) {
 		width += fm.width(i->key() + ": ");
 		width += fm.width(i->value()) + ((i == _list.constEnd() - 1)
@@ -37,7 +37,7 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	painter->setFont(_font);
 	painter->setRenderHint(QPainter::Antialiasing, false);
 
-	for (QList<KV>::const_iterator i = _list.constBegin();
+	for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
 	  i != _list.constEnd(); i++) {
 		painter->drawText(width, fm.height() - fm.descent(), i->key() + ": ");
 		width += fm.width(i->key() + ": ");
@@ -61,7 +61,7 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 
 void InfoItem::insert(const QString &key, const QString &value)
 {
-	KV kv(key, value);
+	KV<QString, QString> kv(key, value);
 	int i;
 
 	prepareGeometryChange();

src/GUI/infoitem.h

@@ -14,7 +14,7 @@ public:
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
-	const QList<KV> &info() const {return _list;}
+	const QList<KV<QString, QString> > &info() const {return _list;}
 
 	void insert(const QString &key, const QString &value);
 	void clear();
@@ -23,7 +23,7 @@ public:
 private:
 	void updateBoundingRect();
 
-	QList<KV> _list;
+	QList<KV<QString, QString> > _list;
 	QRectF _boundingRect;
 	QFont _font;
 };

src/GUI/mapview.cpp

@@ -255,17 +255,18 @@ QPointF MapView::contentCenter() const
 
 void MapView::updatePOIVisibility()
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it, jt;
-
 	if (!_showPOI)
 		return;
 
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->show();
 
 	if (!_overlapPOIs) {
-		for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
-			for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
+		for (POIHash::const_iterator it = _pois.constBegin();
+		  it != _pois.constEnd(); it++) {
+			for (POIHash::const_iterator jt = _pois.constBegin();
+			  jt != _pois.constEnd(); jt++) {
 				if (it.value()->isVisible() && jt.value()->isVisible()
 				  && it != jt && it.value()->collidesWithItem(jt.value()))
 					jt.value()->hide();
@@ -288,8 +289,8 @@ void MapView::rescale()
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setMap(_map);
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setMap(_map);
 
 	updatePOIVisibility();
@@ -339,8 +340,8 @@ void MapView::setMap(Map *map)
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setMap(map);
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setMap(_map);
 	updatePOIVisibility();
 
@@ -364,12 +365,10 @@ void MapView::setPOI(POI *poi)
 
 void MapView::updatePOI()
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		_scene->removeItem(it.value());
-		delete it.value();
-	}
+	qDeleteAll(_pois);
 	_pois.clear();
 
 	if (_showTracks)
@@ -426,8 +425,8 @@ void MapView::setUnits(Units units)
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setToolTipFormat(_units, _coordinatesFormat);
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setToolTipFormat(_units, _coordinatesFormat);
 }
 
@@ -445,8 +444,8 @@ void MapView::setCoordinatesFormat(CoordinatesFormat format)
 	for (int i = 0; i < _routes.count(); i++)
 		_routes[i]->setCoordinatesFormat(_coordinatesFormat);
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setToolTipFormat(_units, _coordinatesFormat);
 }
 
@@ -461,8 +460,6 @@ void MapView::clearMapCache()
 
 void MapView::digitalZoom(int zoom)
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
 	if (zoom) {
 		_digitalZoom += zoom;
 		scale(pow(2, zoom), pow(2, zoom));
@@ -479,7 +476,8 @@ void MapView::digitalZoom(int zoom)
 		_areas.at(i)->setDigitalZoom(_digitalZoom);
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setDigitalZoom(_digitalZoom);
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setDigitalZoom(_digitalZoom);
 
 	_mapScale->setDigitalZoom(_digitalZoom);
@@ -747,8 +745,8 @@ void MapView::showPOI(bool show)
 {
 	_showPOI = show;
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setVisible(show);
 
 	updatePOIVisibility();
@@ -758,8 +756,8 @@ void MapView::showPOILabels(bool show)
 {
 	_showPOILabels = show;
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->showLabel(show);
 
 	updatePOIVisibility();
@@ -852,21 +850,19 @@ void MapView::setWaypointColor(const QColor &color)
 
 void MapView::setPOISize(int size)
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
 	_poiSize = size;
 
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setSize(size);
 }
 
 void MapView::setPOIColor(const QColor &color)
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
 	_poiColor = color;
 
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setColor(color);
 }
 
@@ -1003,8 +999,8 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setMap(_map);
 
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setMap(_map);
 	updatePOIVisibility();
 
@@ -1021,13 +1017,17 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 
 void MapView::setProjection(int id)
 {
-	Projection projection(PCS::pcs(id));
-	if (!projection.isValid())
-		return;
-
-	_projection = projection;
-
+	const PCS *pcs;
+	const GCS *gcs;
 	Coordinates center = _map->xy2ll(mapToScene(viewport()->rect().center()));
+
+	if ((pcs = PCS::pcs(id)))
+		_projection = Projection(pcs);
+	else if ((gcs = GCS::gcs(id)))
+		_projection = Projection(gcs);
+	else
+		qWarning("%d: Unknown PCS/GCS id", id);
+
 	_map->setProjection(_projection);
 	rescale();
 	centerOn(_map->ll2xy(center));

src/GUI/mapview.h

@@ -92,6 +92,8 @@ private slots:
 	void reloadMap();
 
 private:
+	typedef QHash<SearchPointer<Waypoint>, WaypointItem*> POIHash;
+
 	PathItem *addTrack(const Track &track);
 	PathItem *addRoute(const Route &route);
 	void addArea(const Area &area);
@@ -125,7 +127,7 @@ private:
 	QList<RouteItem*> _routes;
 	QList<WaypointItem*> _waypoints;
 	QList<AreaItem*> _areas;
-	QHash<SearchPointer<Waypoint>, WaypointItem*> _pois;
+	POIHash _pois;
 
 	RectC _tr, _rr, _wr, _ar;
 	qreal _res;

src/GUI/optionsdialog.cpp

@@ -36,15 +36,18 @@ static QFrame *line()
 }
 #endif // Q_OS_MAC
 
+
 QWidget *OptionsDialog::createMapPage()
 {
 	_projection = new LimitedComboBox(200);
-	QList<PCS::Info> projections(PCS::pcsList());
+
+	QList<KV<int, QString> > projections(GCS::list() + PCS::list());
 	qSort(projections);
+
 	for (int i = 0; i < projections.size(); i++) {
-		QString text = QString::number(projections.at(i).id()) + " - "
-		  + projections.at(i).name();
-		_projection->addItem(text, QVariant(projections.at(i).id()));
+		QString text = QString::number(projections.at(i).key()) + " - "
+		  + projections.at(i).value();
+		_projection->addItem(text, QVariant(projections.at(i).key()));
 	}
 	_projection->setCurrentIndex(_projection->findData(_options->projection));
 

src/GUI/pathitem.cpp

@@ -141,6 +141,10 @@ void PathItem::setColor(const QColor &color)
 		return;
 
 	_pen.setColor(color);
+
+	for (int i = 0; i < _ticks.size(); i++)
+		_ticks[i]->setColor(color);
+
 	update();
 }
 
@@ -317,8 +321,7 @@ unsigned PathItem::tickSize() const
 
 void PathItem::updateTicks()
 {
-	for (int i = 0; i < _ticks.size(); i++)
-		delete _ticks[i];
+	qDeleteAll(_ticks);
 	_ticks.clear();
 
 	if (!_showTicks)

src/GUI/percentslider.cpp

@@ -24,7 +24,7 @@ PercentSlider::PercentSlider(QWidget *parent) : QWidget(parent)
 	_label->setAlignment(Qt::AlignRight);
 	_label->setText(format(_slider->value()));
 
-	connect(_slider, SIGNAL(sliderMoved(int)), this, SLOT(updateLabel(int)));
+	connect(_slider, SIGNAL(valueChanged(int)), this, SLOT(updateLabel(int)));
 
 	QHBoxLayout *layout = new QHBoxLayout();
 	layout->addWidget(_slider);

src/GUI/powergraph.cpp

@@ -14,6 +14,11 @@ PowerGraph::PowerGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+PowerGraph::~PowerGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void PowerGraph::setInfo()
 {
 	if (_showTracks) {
@@ -36,23 +41,27 @@ QList<GraphItem*> PowerGraph::loadData(const Data &data)
 		const Graph &graph = track.power();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			PowerGraphItem *gi = new PowerGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			PowerGraphItem *gi = new PowerGraphItem(graph, _graphType, _width,
+			  _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -75,6 +84,9 @@ qreal PowerGraph::avg() const
 
 void PowerGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -84,7 +96,13 @@ void PowerGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/powergraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class PowerGraphItem;
+
 class PowerGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	PowerGraph(QWidget *parent = 0);
+	~PowerGraph();
 
 	QString label() const {return tr("Power");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -23,6 +26,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<PowerGraphItem*> _tracks;
 };
 
 #endif // POWERGRAPH_H

src/GUI/powergraphitem.cpp

@@ -3,8 +3,9 @@
 #include "powergraphitem.h"
 
 
-PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type, int width,
+  const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	setToolTip(toolTip());
 }

src/GUI/powergraphitem.h

@@ -8,8 +8,8 @@ class PowerGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	PowerGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	PowerGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 private:
 	QString toolTip() const;

src/GUI/routeitem.cpp

@@ -24,7 +24,7 @@ QString RouteItem::toolTip(Units units) const
 RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)
   : PathItem(route.path(), map, parent)
 {
-	const QVector<Waypoint> &waypoints = route.waypoints();
+	const RouteData &waypoints = route.data();
 
 	_waypoints.resize(waypoints.size());
 	for (int i = 0; i < waypoints.size(); i++)

src/GUI/speedgraph.cpp

@@ -18,6 +18,11 @@ SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+SpeedGraph::~SpeedGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void SpeedGraph::setInfo()
 {
 	if (_showTracks) {
@@ -44,13 +49,18 @@ QList<GraphItem*> SpeedGraph::loadData(const Data &data)
 		const Graph &graph = track.speed();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType,
-			  track.movingTime());
+			SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType, _width,
+			  _palette.nextColor(), track.movingTime());
 			gi->setTimeType(_timeType);
-			GraphView::addGraph(gi);
+			gi->setUnits(_units);
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			_mavg.append(QPointF(track.distance(), gi->mavg()));
 			graphs.append(gi);
@@ -58,12 +68,12 @@ QList<GraphItem*> SpeedGraph::loadData(const Data &data)
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -87,6 +97,9 @@ qreal SpeedGraph::avg() const
 
 void SpeedGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 	_mavg.clear();
 
@@ -121,8 +134,8 @@ void SpeedGraph::setTimeType(enum TimeType type)
 {
 	_timeType = type;
 
-	for (int i = 0; i < _graphs.size(); i++)
-		static_cast<SpeedGraphItem*>(_graphs.at(i))->setTimeType(type);
+	for (int i = 0; i < _tracks.size(); i++)
+		_tracks.at(i)->setTimeType(type);
 
 	setInfo();
 	redraw();
@@ -132,7 +145,13 @@ void SpeedGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/speedgraph.h

@@ -4,12 +4,15 @@
 #include <QList>
 #include "graphtab.h"
 
+class SpeedGraphItem;
+
 class SpeedGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	SpeedGraph(QWidget *parent = 0);
+	~SpeedGraph();
 
 	QString label() const {return tr("Speed");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -29,7 +32,9 @@ private:
 
 	Units _units;
 	TimeType _timeType;
+
 	bool _showTracks;
+	QList<SpeedGraphItem *> _tracks;
 };
 
 #endif // SPEEDGRAPH_H

src/GUI/speedgraphitem.cpp

@@ -4,8 +4,9 @@
 #include "speedgraphitem.h"
 
 
-SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type,
-  qreal movingTime, QGraphicsItem *parent) : GraphItem(graph, type, parent)
+SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type, int width,
+  const QColor &color, qreal movingTime, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	_units = Metric;
 	_timeType = Total;

src/GUI/speedgraphitem.h

@@ -9,8 +9,8 @@ class SpeedGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	SpeedGraphItem(const Graph &graph, GraphType type, qreal movingTime,
-	  QGraphicsItem *parent = 0);
+	SpeedGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, qreal movingTime, QGraphicsItem *parent = 0);
 
 	qreal avg() const {return _avg;}
 	qreal mavg() const {return _mavg;}
@@ -23,9 +23,8 @@ private:
 	QString toolTip() const;
 
 	qreal _avg, _mavg, _max;
-
-	Units _units;
 	TimeType _timeType;
+	Units _units;
 };
 
 #endif // SPEEDGRAPHITEM_H

src/GUI/temperaturegraph.cpp

@@ -14,6 +14,11 @@ TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+TemperatureGraph::~TemperatureGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void TemperatureGraph::setInfo()
 {
 	if (_showTracks) {
@@ -38,24 +43,29 @@ QList<GraphItem*> TemperatureGraph::loadData(const Data &data)
 		const Graph &graph = track.temperature();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
 			TemperatureGraphItem *gi = new TemperatureGraphItem(graph,
-			  _graphType);
-			GraphView::addGraph(gi);
+			  _graphType, _width, _palette.nextColor());
+			gi->setUnits(_units);
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -78,6 +88,9 @@ qreal TemperatureGraph::avg() const
 
 void TemperatureGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -108,7 +121,13 @@ void TemperatureGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/temperaturegraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class TemperatureGraphItem;
+
 class TemperatureGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	TemperatureGraph(QWidget *parent = 0);
+	~TemperatureGraph();
 
 	QString label() const {return tr("Temperature");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -26,6 +29,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<TemperatureGraphItem *> _tracks;
 };
 
 #endif // TEMPERATUREGRAPH_H

src/GUI/temperaturegraphitem.cpp

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

src/GUI/temperaturegraphitem.h

@@ -8,8 +8,8 @@ class TemperatureGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	TemperatureGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	TemperatureGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 	qreal max() const {return _max;}
 	qreal min() const {return _min;}

src/GUI/tooltip.cpp

@@ -6,7 +6,7 @@
 
 void ToolTip::insert(const QString &key, const QString &value)
 {
-	_list.append(KV(key, value));
+	_list.append(KV<QString, QString>(key, value));
 }
 
 QString ToolTip::toString() const

src/GUI/tooltip.h

@@ -14,7 +14,7 @@ public:
 	QString toString() const;
 
 private:
-	QList<KV> _list;
+	QList<KV<QString, QString> > _list;
 	ImageInfo _img;
 };
 

src/common/kv.h

@@ -1,21 +1,20 @@
 #ifndef KV_H
 #define KV_H
 
-#include <QString>
-
+template <class KEY, class VALUE>
 class KV {
 public:
-	KV(const QString &key, const QString &value) : _key(key), _value(value) {}
+	KV(const KEY &key, const VALUE &value) : _key(key), _value(value) {}
 
-	const QString &key() const {return _key;}
-	const QString &value() const {return _value;}
+	const KEY &key() const {return _key;}
+	const VALUE &value() const {return _value;}
 
-	bool operator==(const KV &other) const
-	  {return this->key() == other.key();}
+	bool operator==(const KV &other) const {return _key == other._key;}
+	bool operator<(const KV &other) const {return _key < other._key;}
 
 private:
-	QString _key;
-	QString _value;
+	KEY _key;
+	VALUE _value;
 };
 
 #endif // KV_H

src/common/tifffile.h

@@ -17,6 +17,7 @@ public:
 	TIFFFile(QIODevice *device);
 
 	bool isValid() const {return _ifd != 0;}
+	bool isBE() const {return _be;}
 	quint32 ifd() const {return _ifd;}
 
 	bool seek(qint64 pos) {return _device->seek(_offset + pos);}

src/data/csv.cpp

@@ -0,0 +1,67 @@
+#include <QStringList>
+#include "csv.h"
+
+/*
+RFC 4180 parser with the following enchancements:
+ - allows an arbitrary delimiter
+ - allows LF line ends in addition to CRLF line ends
+*/
+
+bool CSV::readEntry(QStringList &list)
+{
+	int state = 0;
+	char c;
+	QByteArray field;
+
+	while (_device->getChar(&c)) {
+		switch (state) {
+			case 0:
+				if (c == '\r')
+					state = 3;
+				else if (c == '\n') {
+					list.append(field);
+					_line++;
+					return true;
+				} else if (c == _delimiter) {
+					list.append(field);
+					field.clear();
+				} else if (c == '"') {
+					if (!field.isEmpty())
+						return false;
+					state = 1;
+				} else
+					field.append(c);
+				break;
+			case 1:
+				if (c == '"')
+					state = 2;
+				else {
+					field.append(c);
+					if (c == '\n')
+						_line++;
+				}
+				break;
+			case 2:
+				if (c == '"') {
+					field.append('"');
+					state = 1;
+				} else if (c == _delimiter || c == '\r' || c == '\n') {
+					_device->ungetChar(c);
+					state = 0;
+				} else
+					return false;
+				break;
+			case 3:
+				if (c == '\n') {
+					_device->ungetChar(c);
+					state = 0;
+				} else
+					return false;
+				break;
+		}
+	}
+
+	list.append(field);
+
+	return (state == 0);
+}

src/data/csv.h

@@ -0,0 +1,22 @@
+#ifndef CSV_H
+#define CSV_H
+
+#include <QIODevice>
+
+class CSV
+{
+public:
+	CSV(QIODevice *device, char delimiter = ',')
+	  : _device(device), _delimiter(delimiter), _line(1) {}
+
+	bool readEntry(QStringList &list);
+	bool atEnd() const {return _device->atEnd();}
+	int line() const {return _line;}
+
+private:
+	QIODevice *_device;
+	char _delimiter;
+	int _line;
+};
+
+#endif // CSV_H

src/data/csvparser.cpp

@@ -1,3 +1,5 @@
+#include <QStringList>
+#include "csv.h"
 #include "csvparser.h"
 
 bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
@@ -7,42 +9,38 @@ bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
 	Q_UNUSED(tracks);
 	Q_UNUSED(routes);
 	Q_UNUSED(polygons);
-	bool res;
+	CSV csv(file);
+	QStringList entry;
+	bool ok;
 
-	_errorLine = 1;
-	_errorString.clear();
 
-	while (!file->atEnd()) {
-		QByteArray line = file->readLine();
-		QList<QByteArray> list = line.split(',');
-		if (list.size() < 3) {
+	while (!csv.atEnd()) {
+		if (!csv.readEntry(entry) || entry.size() < 3) {
 			_errorString = "Parse error";
+			_errorLine = csv.line();
 			return false;
 		}
 
-		qreal lon = list[0].trimmed().toDouble(&res);
-		if (!res || (lon < -180.0 || lon > 180.0)) {
+		double lon = entry.at(0).trimmed().toDouble(&ok);
+		if (!ok || (lon < -180.0 || lon > 180.0)) {
 			_errorString = "Invalid longitude";
+			_errorLine = csv.line();
 			return false;
 		}
-		qreal lat = list[1].trimmed().toDouble(&res);
-		if (!res || (lat < -90.0 || lat > 90.0)) {
+		double lat = entry.at(1).trimmed().toDouble(&ok);
+		if (!ok || (lat < -90.0 || lat > 90.0)) {
 			_errorString = "Invalid latitude";
+			_errorLine = csv.line();
 			return false;
 		}
 		Waypoint wp(Coordinates(lon, lat));
-
-		QByteArray ba = list[2].trimmed();
-		QString name = QString::fromUtf8(ba.data(), ba.size());
-		wp.setName(name);
-
-		if (list.size() > 3) {
-			ba = list[3].trimmed();
-			wp.setDescription(QString::fromUtf8(ba.data(), ba.size()));
-		}
+		wp.setName(entry.at(2).trimmed());
+		if (entry.size() > 3)
+			wp.setDescription(entry.at(3).trimmed());
 
 		waypoints.append(wp);
-		_errorLine++;
+
+		entry.clear();
 	}
 
 	return true;

src/data/cupparser.cpp

@@ -0,0 +1,167 @@
+#include <cmath>
+#include <QStringList>
+#include "csv.h"
+#include "cupparser.h"
+
+
+enum SegmentType {
+	Header, Waypoints, Tasks
+};
+
+static double latitude(const QString &str)
+{
+	bool ok;
+
+	if (str.length() != 9)
+		return NAN;
+	int deg = str.left(2).toInt(&ok);
+	if (!ok || deg > 90)
+		return NAN;
+	double min = str.mid(2, 6).toDouble(&ok);
+	if (!ok || min > 60)
+		return NAN;
+
+	double dd = deg + min/60.0;
+	return (str.right(1) == "S") ? -dd : dd;
+}
+
+static double longitude(const QString &str)
+{
+	bool ok;
+
+	if (str.length() != 10)
+		return NAN;
+	int deg = str.left(3).toInt(&ok);
+	if (!ok || deg > 180)
+		return NAN;
+	double min = str.mid(3, 6).toDouble(&ok);
+	if (!ok || min > 60)
+		return NAN;
+
+	double dd = deg + min/60.0;
+	return (str.right(1) == "W") ? -dd : dd;
+}
+
+static double elevation(const QString &str)
+{
+	bool ok;
+	double ele;
+
+	if (str.right(2) == "ft")
+		ele = str.left(str.length() - 2).toDouble(&ok) * 0.3048;
+	else if (str.right(1) == "m")
+		ele = str.left(str.length() - 1).toDouble(&ok);
+	else
+		return NAN;
+
+	return ok ? ele : NAN;
+}
+
+
+bool CUPParser::waypoint(const QStringList &entry, QVector<Waypoint> &waypoints)
+{
+	if (entry.size() < 11) {
+		_errorString = "Invalid number of fields";
+		return false;
+	}
+
+	double lon = longitude(entry.at(4));
+	if (std::isnan(lon)) {
+		_errorString = "Invalid longitude";
+		return false;
+	}
+	double lat = latitude(entry.at(3));
+	if (std::isnan(lat)) {
+		_errorString = "Invalid latitude";
+		return false;
+	}
+
+	Waypoint wp(Coordinates(lon, lat));
+	wp.setName(entry.at(0));
+	wp.setDescription(entry.at(10));
+	wp.setElevation(elevation(entry.at(5)));
+	waypoints.append(wp);
+
+	return true;
+}
+
+bool CUPParser::task(const QStringList &entry,
+  const QVector<Waypoint> &waypoints, QList<RouteData> &routes)
+{
+	if (entry.size() < 3) {
+		_errorString = "Invalid number of fields";
+		return false;
+	}
+
+	RouteData r;
+	r.setName(entry.at(0));
+	for (int i = 1; i < entry.size(); i++) {
+		if (entry.at(i) == "???")
+			continue;
+
+		Waypoint w;
+		for (int j = 0; j < waypoints.size(); j++) {
+			if (waypoints.at(j).name() == entry.at(i)) {
+				w = waypoints.at(j);
+				break;
+			}
+		}
+		if (w.coordinates().isNull()) {
+			_errorString = entry.at(i) + ": unknown turnpoint";
+			return false;
+		}
+		r.append(w);
+	}
+
+	routes.append(r);
+
+	return true;
+}
+
+bool CUPParser::parse(QFile *file, QList<TrackData> &tracks,
+  QList<RouteData> &routes, QList<Area> &polygons,
+  QVector<Waypoint> &waypoints)
+{
+	Q_UNUSED(tracks);
+	Q_UNUSED(polygons);
+	CSV csv(file);
+	QStringList entry;
+	SegmentType segment = Header;
+
+
+	while (!csv.atEnd()) {
+		if (!csv.readEntry(entry)) {
+			_errorString = "CSV parse error";
+			_errorLine = csv.line();
+			return false;
+		}
+
+		if (segment == Header) {
+			segment = Waypoints;
+			if (entry.size() >= 11 && entry.at(3) == "lat"
+			  && entry.at(4) == "lon") {
+				entry.clear();
+				continue;
+			}
+		} else if (segment == Waypoints && entry.size() == 1
+		  && entry.at(0) == "-----Related Tasks-----") {
+			segment = Tasks;
+			entry.clear();
+			continue;
+		}
+
+		if (segment == Waypoints) {
+			if (!waypoint(entry, waypoints))
+				return false;
+		} else if (segment == Tasks) {
+			if (entry.at(0) != "Options" && !entry.at(0).startsWith("ObsZone=")
+			  && !task(entry, waypoints, routes))
+				return false;
+		}
+
+		entry.clear();
+		_errorLine = csv.line();
+	}
+
+	return true;
+}

src/data/cupparser.h

@@ -0,0 +1,25 @@
+#ifndef CUPPARSER_H
+#define CUPPARSER_H
+
+#include "parser.h"
+
+class CUPParser : public Parser
+{
+public:
+	CUPParser() : _errorLine(0) {}
+
+	bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
+	  QList<Area> &polygons, QVector<Waypoint> &waypoints);
+	QString errorString() const {return _errorString;}
+	int errorLine() const {return _errorLine;}
+
+private:
+	bool waypoint(const QStringList &entry, QVector<Waypoint> &waypoints);
+	bool task(const QStringList &entry, const QVector<Waypoint> &waypoints,
+	  QList<RouteData> &routes);
+
+	QString _errorString;
+	int _errorLine;
+};
+
+#endif // CUPPARSER_H

src/data/data.cpp

@@ -17,6 +17,7 @@
 #include "geojsonparser.h"
 #endif // ENABLE_GEOJSON
 #include "exifparser.h"
+#include "cupparser.h"
 #include "dem.h"
 #include "data.h"
 
@@ -37,6 +38,7 @@ static SLFParser slf;
 static GeoJSONParser geojson;
 #endif // ENABLE_GEOJSON
 static EXIFParser exif;
+static CUPParser cup;
 
 static QHash<QString, Parser*> parsers()
 {
@@ -60,6 +62,7 @@ static QHash<QString, Parser*> parsers()
 #endif // ENABLE_GEOJSON
 	hash.insert("jpeg", &exif);
 	hash.insert("jpg", &exif);
+	hash.insert("cup", &cup);
 
 	return hash;
 }
@@ -68,13 +71,35 @@ static QHash<QString, Parser*> parsers()
 QHash<QString, Parser*> Data::_parsers = parsers();
 bool Data::_useDEM = false;
 
-void Data::processData(const QList<TrackData> &trackData,
-  const QList<RouteData> &routeData)
+void Data::processData(QList<TrackData> &trackData, QList<RouteData> &routeData)
 {
-	for (int i = 0; i < trackData.count(); i++)
+	for (int i = 0; i < trackData.count(); i++) {
+		TrackData &track = trackData[i];
+		for (int j = 0; j < track.size(); j++) {
+			SegmentData &segment = track[j];
+			for (int k = 0; k < segment.size(); k++) {
+				Trackpoint &t = segment[k];
+				if (!t.hasElevation() || _useDEM) {
+					qreal elevation = DEM::elevation(t.coordinates());
+					if (!std::isnan(elevation))
+						t.setElevation(elevation);
+				}
+			}
+		}
 		_tracks.append(Track(trackData.at(i)));
-	for (int i = 0; i < routeData.count(); i++)
+	}
+	for (int i = 0; i < routeData.count(); i++) {
+		RouteData &route = routeData[i];
+		for (int j = 0; j < route.size(); j++) {
+			Waypoint &w = route[j];
+			if (!w.hasElevation() || _useDEM) {
+				qreal elevation = DEM::elevation(w.coordinates());
+				if (!std::isnan(elevation))
+					w.setElevation(elevation);
+			}
+		}
 		_routes.append(Route(routeData.at(i)));
+	}
 	for (int i = 0; i < _waypoints.size(); i++) {
 		if (!_waypoints.at(i).hasElevation() || _useDEM) {
 			qreal elevation = DEM::elevation(_waypoints.at(i).coordinates());
@@ -147,6 +172,7 @@ QString Data::formats()
 	return
 	  qApp->translate("Data", "Supported files") + " (" + supported + ");;"
 	  + qApp->translate("Data", "CSV files") + " (*.csv);;"
+	  + qApp->translate("Data", "CUP files") + " (*.cup);;"
 	  + qApp->translate("Data", "FIT files") + " (*.fit);;"
 #ifdef ENABLE_GEOJSON
 	  + qApp->translate("Data", "GeoJSON files") + " (*.geojson *.json);;"
@@ -177,6 +203,4 @@ QStringList Data::filter()
 void Data::useDEM(bool use)
 {
 	_useDEM = use;
-	Route::useDEM(use);
-	Track::useDEM(use);
 }

src/data/data.h

@@ -31,8 +31,7 @@ public:
 	static void useDEM(bool use);
 
 private:
-	void processData(const QList<TrackData> &trackData,
-	  const QList<RouteData> &routeData);
+	void processData(QList<TrackData> &trackData, QList<RouteData> &routeData);
 
 	bool _valid;
 	QString _errorString;

src/data/exifparser.cpp

@@ -113,9 +113,12 @@ Coordinates EXIFParser::coordinates(TIFFFile &file, const IFDEntry &lon,
 	if (!c.isValid())
 		return Coordinates();
 
-	if (lonRef.offset == 'W')
+	char ew = file.isBE() ? lonRef.offset >> 24 : lonRef.offset;
+	char ns = file.isBE() ? latRef.offset >> 24 : latRef.offset;
+
+	if (ew == 'W')
 		c.rlon() = -c.lon();
-	if (latRef.offset == 'S')
+	if (ns == 'S')
 		c.rlat() = -c.lat();
 
 	return c;

src/data/fitparser.cpp

@@ -87,13 +87,10 @@ template<class T> bool FITParser::readValue(CTX &ctx, T &val)
 
 	ctx.len -= sizeof(T);
 
-	if (sizeof(T) > 1) {
-		if (ctx.endian)
-			val = qFromBigEndian(data);
-		else
-			val = qFromLittleEndian(data);
-	} else
-		val = data;
+	if (ctx.endian)
+		val = qFromBigEndian(data);
+	else
+		val = qFromLittleEndian(data);
 
 	return true;
 }

src/data/igcparser.cpp

@@ -130,6 +130,8 @@ bool IGCParser::readBRecord(SegmentData &segment, const char *line,
 
 	if (len < 35)
 		return false;
+	if (line[24] != 'A')
+		return true;
 
 	if (!readTimestamp(line + 1, time)) {
 		_errorString = "Invalid timestamp";

src/data/route.cpp

@@ -2,8 +2,6 @@
 #include "route.h"
 
 
-bool Route::_useDEM = false;
-
 Route::Route(const RouteData &data) : _data(data)
 {
 	qreal dist = 0;
@@ -34,19 +32,8 @@ Graph Route::elevation() const
 	graph.append(GraphSegment());
 	GraphSegment &gs = graph.last();
 
-	for (int i = 0; i < _data.size(); i++) {
-		if (_data.at(i).hasElevation() && !_useDEM)
-			gs.append(GraphPoint(_distance.at(i), NAN,
-			  _data.at(i).elevation()));
-		else {
-			qreal elevation = DEM::elevation(_data.at(i).coordinates());
-			if (!std::isnan(elevation))
-				gs.append(GraphPoint(_distance.at(i), NAN, elevation));
-			else if (_data.at(i).hasElevation())
-				gs.append(GraphPoint(_distance.at(i), NAN,
-				  _data.at(i).elevation()));
-		}
-	}
+	for (int i = 0; i < _data.size(); i++)
+		gs.append(GraphPoint(_distance.at(i), NAN, _data.at(i).elevation()));
 
 	return graph;
 }

src/data/route.h

@@ -13,7 +13,7 @@ public:
 
 	Path path() const;
 
-	const QVector<Waypoint> &waypoints() const {return _data;}
+	const RouteData &data() const {return _data;}
 
 	Graph elevation() const;
 
@@ -24,13 +24,9 @@ public:
 
 	bool isValid() const {return _data.size() >= 2;}
 
-	static void useDEM(bool use) {_useDEM = use;}
-
 private:
 	RouteData _data;
 	QVector<qreal> _distance;
-
-	static bool _useDEM;
 };
 
 #endif // ROUTE_H

src/data/track.cpp

@@ -13,7 +13,6 @@ int Track::_pauseInterval = 10;
 
 bool Track::_outlierEliminate = true;
 bool Track::_useReportedSpeed = false;
-bool Track::_useDEM = false;
 
 
 static qreal median(QVector<qreal> &v)
@@ -99,8 +98,11 @@ Track::Track(const TrackData &data) : _data(data), _pause(0)
 			if (sd.at(j).timestamp() >= sd.at(j-1).timestamp())
 				dt = sd.at(j-1).timestamp().msecsTo(
 				  sd.at(j).timestamp()) / 1000.0;
-			else
-				dt = NAN;
+			else {
+				qWarning("%s: %s: time skew detected", qPrintable(_data.name()),
+				  qPrintable(sd.at(j).timestamp().toString(Qt::ISODate)));
+				dt = 0;
+			}
 			seg.time.append(seg.time.last() + dt);
 
 			if (dt < 1e-3) {
@@ -177,19 +179,8 @@ Graph Track::elevation() const
 		for (int j = 0; j < sd.size(); j++) {
 			if (seg.outliers.contains(j))
 				continue;
-
-			if (sd.at(j).hasElevation() && !_useDEM)
-				gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
-				  sd.at(j).elevation()));
-			else {
-				qreal elevation = DEM::elevation(sd.at(j).coordinates());
-				if (!std::isnan(elevation))
-					gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
-					  elevation));
-				else if (sd.at(j).hasElevation())
-					gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
-					  sd.at(j).elevation()));
-			}
+			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
+			  sd.at(j).elevation()));
 		}
 
 		ret.append(filter(gs, _elevationWindow));

src/data/track.h

@@ -45,7 +45,6 @@ public:
 	static void setOutlierElimination(bool eliminate)
 	  {_outlierEliminate = eliminate;}
 	static void useReportedSpeed(bool use) {_useReportedSpeed = use;}
-	static void useDEM(bool use) {_useDEM = use;}
 
 private:
 	struct Segment {
@@ -71,7 +70,6 @@ private:
 	static qreal _pauseSpeed;
 	static int _pauseInterval;
 	static bool _useReportedSpeed;
-	static bool _useDEM;
 };
 
 #endif // TRACK_H

src/map/IMG/img.cpp

@@ -5,6 +5,8 @@
 #include "img.h"
 
 
+#define CACHE_SIZE 8388608 /* 8MB */
+
 #define CHECK(condition) \
 	if (!(condition)) { \
 		_errorString = "Invalid/corrupted IMG file"; \
@@ -25,19 +27,8 @@ struct CTX
 	QList<IMG::Point> *points;
 };
 
-#ifndef QT_NO_DEBUG
-static QDebug operator<<(QDebug dbg, const QMap<QString, VectorTile*> &map)
-{
-	dbg.nospace() << "TileMap(";
-	for (QMap<QString, VectorTile*>::const_iterator it = map.constBegin();
-	  it != map.constEnd(); ++it)
-		dbg << "(" << it.key() << ", " << *(*it) << ")";
-	dbg << ")";
-	return dbg.space();
-}
-#endif // QT_NO_DEBUG
-
-IMG::IMG(const QString &fileName) : _file(fileName), _valid(false)
+IMG::IMG(const QString &fileName)
+  : _file(fileName), _typ(0), _style(0), _valid(false)
 {
 	if (!_file.open(QFile::ReadOnly)) {
 		_errorString = _file.errorString();
@@ -62,6 +53,7 @@ IMG::IMG(const QString &fileName) : _file(fileName), _valid(false)
 	QByteArray nba(QByteArray(d1, sizeof(d1)) + QByteArray(d2, sizeof(d2)));
 	_name = QString(nba).trimmed();
 	_blockSize = 1 << (e1 + e2);
+	_blockCache.setMaxCost(CACHE_SIZE / _blockSize);
 
 	// Read the FAT table
 	quint8 flag;
@@ -84,7 +76,7 @@ IMG::IMG(const QString &fileName) : _file(fileName), _valid(false)
 
 
 	QMap<QString, VectorTile*> tileMap;
-	QMap<QString, SubFile*> TYPMap;
+	QString typFile;
 
 	// Read FAT blocks describing the IMG sub-files
 	for (int i = 0; i < cnt; i++) {
@@ -99,7 +91,7 @@ IMG::IMG(const QString &fileName) : _file(fileName), _valid(false)
 		}
 
 		QString fn(QByteArray(name, sizeof(name)));
-		if (VectorTile::isTileFile(tt)) {
+		if (SubFile::isTileFile(tt)) {
 			VectorTile *tile;
 			QMap<QString, VectorTile*>::iterator it = tileMap.find(fn);
 			if (it == tileMap.end()) {
@@ -120,20 +112,22 @@ IMG::IMG(const QString &fileName) : _file(fileName), _valid(false)
 				file->addBlock(block);
 			}
 		} else if (tt == SubFile::TYP) {
-			SubFile *typ;
-			QMap<QString, SubFile*>::iterator it = TYPMap.find(fn);
-			if (it == TYPMap.end()) {
-				typ = new SubFile(this, size);
-				TYPMap.insert(fn, typ);
-			} else
-				typ = *it;
+			SubFile *typ = 0;
+			if (typFile.isNull()) {
+				_typ = new SubFile(this, size);
+				typ = _typ;
+				typFile = fn;
+			} else if (fn == typFile)
+				typ = _typ;
 
-			_file.seek(offset + 0x20);
-			for (int i = 0; i < 240; i++) {
-				CHECK(readValue(block));
-				if (block == 0xFFFF)
-					break;
-				typ->addBlock(block);
+			if (typ) {
+				_file.seek(offset + 0x20);
+				for (int i = 0; i < 240; i++) {
+					CHECK(readValue(block));
+					if (block == 0xFFFF)
+						break;
+					typ->addBlock(block);
+				}
 			}
 		}
 
@@ -141,7 +135,6 @@ IMG::IMG(const QString &fileName) : _file(fileName), _valid(false)
 	}
 
 	// Create tile tree
-	QSet<int> bits;
 	for (QMap<QString, VectorTile*>::iterator it = tileMap.begin();
 	  it != tileMap.end(); ++it) {
 		CHECK((*it)->init());
@@ -154,27 +147,6 @@ IMG::IMG(const QString &fileName) : _file(fileName), _valid(false)
 		_tileTree.Insert(min, max, *it);
 
 		_bounds |= (*it)->bounds();
-
-		for (int i = 0; i < (*it)->bits().count(); i++)
-			bits.insert((*it)->bits().at(i));
-	}
-	_bits = bits.toList();
-	qSort(_bits);
-
-	// Read TYP file if any
-	if (!TYPMap.isEmpty()) {
-		if (TYPMap.size() > 1)
-			qWarning("%s: Multiple TYP files, using %s",
-			  qPrintable(_file.fileName()), qPrintable(TYPMap.keys().first()));
-		SubFile *typ = TYPMap.values().first();
-		_style = Style(typ);
-		qDeleteAll(TYPMap);
-	} else {
-		QFile typFile(ProgramPaths::typFile());
-		if (typFile.exists()) {
-			SubFile typ(&typFile);
-			_style = Style(&typ);
-		}
 	}
 
 	_valid = true;
@@ -185,6 +157,37 @@ IMG::~IMG()
 	TileTree::Iterator it;
 	for (_tileTree.GetFirst(it); !_tileTree.IsNull(it); _tileTree.GetNext(it))
 		delete _tileTree.GetAt(it);
+
+	delete _typ;
+	delete _style;
+}
+
+void IMG::load()
+{
+	Q_ASSERT(!_style);
+
+	if (_typ && _typ->isValid())
+		_style = new Style(_typ);
+	else {
+		QFile typFile(ProgramPaths::typFile());
+		if (typFile.exists()) {
+			SubFile typ(&typFile);
+			_style = new Style(&typ);
+		} else
+			_style = new Style();
+	}
+}
+
+void IMG::clear()
+{
+	TileTree::Iterator it;
+	for (_tileTree.GetFirst(it); !_tileTree.IsNull(it); _tileTree.GetNext(it))
+		_tileTree.GetAt(it)->clear();
+
+	delete _style;
+	_style = 0;
+
+	_blockCache.clear();
 }
 
 static bool cb(VectorTile *tile, void *context)
@@ -195,17 +198,9 @@ static bool cb(VectorTile *tile, void *context)
 }
 
 void IMG::objects(const RectC &rect, int bits, QList<Poly> *polygons,
-  QList<Poly> *lines, QList<Point> *points) const
+  QList<Poly> *lines, QList<Point> *points)
 {
-	int mb = _bits.first();
-	for (int i = 0; i < _bits.size(); i++) {
-		if (_bits.at(i) > bits)
-			break;
-		else
-			mb = _bits.at(i);
-	}
-
-	CTX ctx(rect, mb, polygons, lines, points);
+	CTX ctx(rect, bits, polygons, lines, points);
 	double min[2], max[2];
 
 	min[0] = rect.left();
@@ -232,10 +227,7 @@ template<class T> bool IMG::readValue(T &val)
 	if (read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
 		return false;
 
-	if (sizeof(T) > 1)
-		val = qFromLittleEndian(data);
-	else
-		val = data;
+	val = qFromLittleEndian(data);
 
 	return true;
 }

src/map/IMG/img.h

@@ -10,6 +10,7 @@
 #include "common/rectc.h"
 #include "common/range.h"
 #include "style.h"
+#include "label.h"
 
 class VectorTile;
 class SubFile;
@@ -23,7 +24,7 @@ public:
 		   ll2xy() the points in the IMG class as this can not be done in
 		   parallel. */
 		QVector<QPointF> points;
-		QString label;
+		Label label;
 		quint32 type;
 
 		bool operator<(const Poly &other) const
@@ -34,25 +35,29 @@ public:
 		Point() : id(0) {}
 
 		Coordinates coordinates;
-		QString label;
+		Label label;
 		quint32 type;
 		bool poi;
 		quint64 id;
 
 		bool operator<(const Point &other) const
-		  {return id > other.id;}
+		  {return id < other.id;}
 	};
 
 
 	IMG(const QString &fileName);
 	~IMG();
 
+	void load();
+	void clear();
+
+	QString fileName() const {return _file.fileName();}
 	const QString &name() const {return _name;}
 	const RectC &bounds() const {return _bounds;}
-	Range zooms() const {return Range(_bits.first(), _bits.last());}
+
 	void objects(const RectC &rect, int bits, QList<Poly> *polygons,
-	  QList<Poly> *lines, QList<Point> *points) const;
-	const Style &style() const {return _style;}
+	  QList<Poly> *lines, QList<Point> *points);
+	const Style *style() const {return _style;}
 
 	bool isValid() const {return _valid;}
 	const QString &errorString() const {return _errorString;}
@@ -62,23 +67,22 @@ private:
 
 	typedef RTree<VectorTile*, double, 2> TileTree;
 
-	QString fileName() const {return _file.fileName();}
 	int blockSize() const {return _blockSize;}
 	bool readBlock(int blockNum, QByteArray &data);
 	qint64 read(char *data, qint64 maxSize);
 	template<class T> bool readValue(T &val);
+	bool init();
 
 	QFile _file;
 	quint8 _key;
 	int _blockSize;
 	QCache<int, QByteArray> _blockCache;
 
-	TileTree _tileTree;
-
 	QString _name;
 	RectC _bounds;
-	QList<int> _bits;
-	Style _style;
+	TileTree _tileTree;
+	SubFile *_typ;
+	Style *_style;
 
 	bool _valid;
 	QString _errorString;

src/map/IMG/label.h

@@ -0,0 +1,77 @@
+#ifndef LABEL_H
+#define LABEL_H
+
+#include <QString>
+#include <QDebug>
+
+#define FIRST_SHIELD Label::Shield::USInterstate
+#define LAST_SHIELD  Label::Shield::Oval
+
+class Label {
+public:
+	class Shield
+	{
+	public:
+		enum Type {
+			None,
+			USInterstate,
+			USShield,
+			USRound,
+			Hbox,
+			Box,
+			Oval
+		};
+
+		Shield() : _type(None) {}
+		Shield(Type type, const QString &name) : _type(type), _text(name) {}
+
+		Type type() const {return _type;}
+		const QString &text() const {return _text;}
+		bool isValid() const {return _type > None && !_text.isEmpty();}
+
+		bool operator==(const Shield &other) const
+		  {return _type == other._type && _text == other._text;}
+
+	private:
+		Type _type;
+		QString _text;
+	};
+
+	Label() {}
+	Label(const QString &text, const Shield &shield = Shield())
+	  : _text(text), _shield(shield) {}
+
+	const Shield &shield() const {return _shield;}
+	const QString &text() const {return _text;}
+	bool isValid() const {return _shield.isValid() || !_text.isEmpty();}
+
+	void setText(const QString &text) {_text = text;}
+
+private:
+	QString _text;
+	Shield _shield;
+};
+
+inline uint qHash(const Label::Shield &shield)
+{
+	return qHash(shield.text()) ^ shield.type();
+}
+
+#ifndef QT_NO_DEBUG
+inline QDebug operator<<(QDebug dbg, const Label::Shield &shield)
+{
+	dbg.nospace() << "Shield(" << shield.type() << ", " << shield.text() << ")";
+	return dbg.space();
+}
+
+inline QDebug operator<<(QDebug dbg, const Label &label)
+{
+	dbg.nospace() << "Label(";
+	if (label.shield().isValid())
+		dbg << label.shield() << ", ";
+	dbg << label.text() << ")";
+	return dbg.space();
+}
+#endif // QT_NO_DEBUG
+
+#endif // LABEL_H

src/map/IMG/lblfile.cpp

@@ -7,7 +7,7 @@ static quint8 NORMAL_CHARS[] = {
 	' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
 	'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
 	'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-	'X', 'Y', 'Z',  '~', '~', '~', '~', '~',
+	'X', 'Y', 'Z',  '~', '~', '~', ' ', ' ',
 	'0', '1', '2', '3', '4', '5', '6', '7',
 	'8', '9', '~', '~', '~', '~', '~', '~'
 };
@@ -35,7 +35,8 @@ static QString capitalize(const QString &str)
 	if (str.isEmpty())
 		return str;
 	for (int i = 0; i < str.size(); i++)
-		if (str.at(i).isLetter() && !str.at(i).isUpper())
+		if (str.at(i).isLetter() && !(str.at(i).isUpper()
+		  || str.at(i) == QChar(0x00DF)))
 			return str;
 
 	QString ret(str);
@@ -48,19 +49,23 @@ static QString capitalize(const QString &str)
 	return ret;
 }
 
+
 bool LBLFile::init()
 {
 	Handle hdl;
 	quint16 codepage;
+	quint8 multiplier, poiMultiplier;
 
 	if (!(seek(hdl, 0x15) && readUInt32(hdl, _offset)
-	  && readUInt32(hdl, _size) && readByte(hdl, _multiplier)
+	  && readUInt32(hdl, _size) && readByte(hdl, multiplier)
 	  && readByte(hdl, _encoding) && seek(hdl, 0x57)
 	  && readUInt32(hdl, _poiOffset) && readUInt32(hdl, _poiSize)
-	  && seek(hdl, 0xAA) && readUInt16(hdl, codepage)))
+	  && readByte(hdl, poiMultiplier) && seek(hdl, 0xAA)
+	  && readUInt16(hdl, codepage)))
 		return false;
 
-	_multiplier = 1<<_multiplier;
+	_multiplier = 1<<multiplier;
+	_poiMultiplier = 1<<poiMultiplier;
 
 	if (codepage == 65001)
 		_codec = QTextCodec::codecForName("UTF-8");
@@ -73,45 +78,49 @@ bool LBLFile::init()
 	return true;
 }
 
-QString LBLFile::label6b(Handle &hdl, quint32 offset) const
+Label LBLFile::label6b(Handle &hdl, quint32 offset) const
 {
-	QByteArray result;
+	Label::Shield::Type shieldType = Label::Shield::None;
+	QByteArray label, shieldLabel;
+	QByteArray *bap = &label;
 	Charset curCharSet = Normal;
 	quint8 b1, b2, b3;
 
 	if (!seek(hdl, offset))
-		return QString();
+		return Label();
 
 	while (true) {
 		if (!(readByte(hdl, b1) && readByte(hdl, b2) && readByte(hdl, b3)))
-			return QString();
+			return Label();
 
 		int c[]= {b1>>2, (b1&0x3)<<4|b2>>4, (b2&0xF)<<2|b3>>6, b3&0x3F};
 
 		for (int cpt = 0; cpt < 4; cpt++) {
-			if (c[cpt] > 0x2F)
-				return QString::fromLatin1(result);
+			if (c[cpt] > 0x2f || (curCharSet == Normal && c[cpt] == 0x1d))
+				return Label(capitalize(QString::fromLatin1(label)),
+				  Label::Shield(shieldType, shieldLabel));
 			switch (curCharSet) {
 				case Normal:
 					if (c[cpt] == 0x1c)
 						curCharSet = Symbol;
 					else if (c[cpt] == 0x1b)
 						curCharSet = Special;
-					else if(c[cpt] == 0x1d)
-						result.append('|');
-					else if (c[cpt] == 0x1f)
-						result.append(' ');
-					else if (c[cpt] == 0x1e)
-						result.append(' ');
+					else if (c[cpt] >= 0x2a && c[cpt] <= 0x2f) {
+						shieldType = static_cast<Label::Shield::Type>
+						  (c[cpt] - 0x29);
+						bap = &shieldLabel;
+					} else if (bap == &shieldLabel
+					  && NORMAL_CHARS[c[cpt]] == ' ')
+						bap = &label;
 					else
-						result.append(NORMAL_CHARS[c[cpt]]);
+						bap->append(NORMAL_CHARS[c[cpt]]);
 					break;
 				case Symbol:
-					result.append(SYMBOL_CHARS[c[cpt]]);
+					bap->append(SYMBOL_CHARS[c[cpt]]);
 					curCharSet = Normal;
 					break;
 				case Special:
-					result.append(SPECIAL_CHARS[c[cpt]]);
+					bap->append(SPECIAL_CHARS[c[cpt]]);
 					curCharSet = Normal;
 					break;
 			}
@@ -119,40 +128,52 @@ QString LBLFile::label6b(Handle &hdl, quint32 offset) const
 	}
 }
 
-QString LBLFile::label8b(Handle &hdl, quint32 offset) const
+Label LBLFile::label8b(Handle &hdl, quint32 offset) const
 {
-	QByteArray result;
+	Label::Shield::Type shieldType = Label::Shield::None;
+	QByteArray label, shieldLabel;
+	QByteArray *bap = &label;
 	quint8 c;
 
 	if (!seek(hdl, offset))
-		return QString();
+		return Label();
 
 	while (true) {
 		if (!readByte(hdl, c))
-			return QString();
-		if (!c)
+			return Label();
+		if (!c || c == 0x1d)
 			break;
 
-		if (c >= 0x1B && c <= 0x1F)
-			result.append(' ');
-		else if (c > 0x07)
-			result.append(c);
+		if ((c >= 0x1e && c <= 0x1f)) {
+			if (bap == &shieldLabel)
+				bap = &label;
+			else
+				bap->append(' ');
+		} else if (c <= 0x07) {
+			shieldType = static_cast<Label::Shield::Type>(c);
+			bap = &shieldLabel;
+		} else if (bap == &shieldLabel && QChar(c).isSpace()) {
+			bap = &label;
+		} else
+			bap->append(c);
 	}
 
-	return _codec ? _codec->toUnicode(result) : QString::fromLatin1(result);
+	return Label(capitalize(_codec ? _codec->toUnicode(label)
+	  : QString::fromLatin1(label)), Label::Shield(shieldType, _codec
+	  ? _codec->toUnicode(shieldLabel) : QString::fromLatin1(shieldLabel)));
 }
 
-QString LBLFile::label(Handle &hdl, quint32 offset, bool poi)
+Label LBLFile::label(Handle &hdl, quint32 offset, bool poi)
 {
-	if (!_init) {
-		if (!(_init = init()))
-			return QString();
-	}
+	if (!_multiplier && !init())
+		return QString();
 
 	quint32 labelOffset;
 	if (poi) {
 		quint32 poiOffset;
-		if (!(seek(hdl, _poiOffset + offset) && readUInt24(hdl, poiOffset)))
+		if (!(_poiSize >= offset * _poiMultiplier
+		  && seek(hdl, _poiOffset + offset * _poiMultiplier)
+		  && readUInt24(hdl, poiOffset) && (poiOffset & 0x3FFFFF)))
 			return QString();
 		labelOffset = _offset + (poiOffset & 0x3FFFFF) * _multiplier;
 	} else
@@ -163,11 +184,11 @@ QString LBLFile::label(Handle &hdl, quint32 offset, bool poi)
 
 	switch (_encoding) {
 		case 6:
-			return capitalize(label6b(hdl, labelOffset));
+			return label6b(hdl, labelOffset);
 		case 9:
 		case 10:
-			return capitalize(label8b(hdl, labelOffset));
+			return label8b(hdl, labelOffset);
 		default:
-			return QString();
+			return Label();
 	}
 }

src/map/IMG/lblfile.h

@@ -2,31 +2,33 @@
 #define LBLFILE_H
 
 #include "subfile.h"
+#include "label.h"
 
 class QTextCodec;
 
 class LBLFile : public SubFile
 {
 public:
-	LBLFile(IMG *img, quint32 size) : SubFile(img, size), _init(false) {}
+	LBLFile(IMG *img, quint32 size)
+	  : SubFile(img, size), _codec(0), _offset(0), _size(0), _poiOffset(0),
+	  _poiSize(0), _poiMultiplier(0), _multiplier(0), _encoding(0) {}
 
-	QString label(Handle &hdl, quint32 offset, bool poi = false);
+	Label label(Handle &hdl, quint32 offset, bool poi = false);
 
 private:
 	bool init();
 
-	QString label6b(Handle &hdl, quint32 offset) const;
-	QString label8b(Handle &hdl, quint32 offset) const;
+	Label label6b(Handle &hdl, quint32 offset) const;
+	Label label8b(Handle &hdl, quint32 offset) const;
 
+	QTextCodec *_codec;
 	quint32 _offset;
 	quint32 _size;
 	quint32 _poiOffset;
 	quint32 _poiSize;
+	quint8 _poiMultiplier;
 	quint8 _multiplier;
 	quint8 _encoding;
-	QTextCodec *_codec;
-
-	bool _init;
 };
 
 #endif // LBLFILE_H

src/map/IMG/netfile.cpp

@@ -3,22 +3,21 @@
 bool NETFile::init()
 {
 	Handle hdl;
+	quint8 multiplier;
 
 	if (!(seek(hdl, 0x15) && readUInt32(hdl, _offset)
-	  && readUInt32(hdl, _size) && readByte(hdl, _multiplier)))
+	  && readUInt32(hdl, _size) && readByte(hdl, multiplier)))
 		return false;
 
-	_multiplier = 1<<_multiplier;
+	_multiplier = 1<<multiplier;
 
 	return true;
 }
 
 bool NETFile::lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset)
 {
-	if (!_init) {
-		if (!(_init = init()))
-			return false;
-	}
+	if (!_multiplier && !init())
+		return false;
 
 	if (!(seek(hdl, _offset + netOffset * _multiplier)
 	  && readUInt24(hdl, lblOffset)))

src/map/IMG/netfile.h

@@ -6,7 +6,8 @@
 class NETFile : public SubFile
 {
 public:
-	NETFile(IMG *img, quint32 size) : SubFile(img, size), _init(false) {}
+	NETFile(IMG *img, quint32 size)
+	  : SubFile(img, size), _offset(0), _size(0), _multiplier(0) {}
 
 	bool lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset);
 
@@ -16,8 +17,6 @@ private:
 	quint32 _offset;
 	quint32 _size;
 	quint8 _multiplier;
-
-	bool _init;
 };
 
 #endif // NETFILE_H

src/map/IMG/rgnfile.cpp

@@ -205,7 +205,8 @@ bool RGNFile::polyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
 		if (lbl && (labelPtr & 0x3FFFFF)) {
 			if (labelPtr & 0x800000) {
 				quint32 lblOff;
-				if (net && net->lblOffset(netHdl, labelPtr & 0x3FFFFF, lblOff))
+				if (net && net->lblOffset(netHdl, labelPtr & 0x3FFFFF, lblOff)
+				  && lblOff)
 					poly.label = lbl->label(lblHdl, lblOff);
 			} else
 				poly.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF);
@@ -289,7 +290,7 @@ bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
 		if (subtype & 0x20) {
 			if (!readUInt24(hdl, labelPtr))
 				return false;
-			if (lbl)
+			if (lbl && (labelPtr & 0x3FFFFF))
 				poly.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF);
 		}
 
@@ -403,10 +404,8 @@ void RGNFile::objects(const RectC &rect, const SubDiv *subdiv, LBLFile *lbl,
 {
 	Handle rgnHdl, lblHdl, netHdl;
 
-	if (!_init) {
-		if (!(_init = init()))
-			return;
-	}
+	if (!_size && !init())
+		return;
 
 	QVector<RGNFile::Segment> seg(segments(rgnHdl, subdiv));
 	for (int i = 0; i < seg.size(); i++) {
@@ -437,10 +436,8 @@ void RGNFile::extObjects(const RectC &rect, const SubDiv *subdiv, LBLFile *lbl,
 {
 	Handle rgnHdl, lblHdl;
 
-	if (!_init) {
-		if (!(_init = init()))
-			return;
-	}
+	if (!_size && !init())
+		return;
 
 	if (polygons && subdiv->polygonsOffset() != subdiv->polygonsEnd()) {
 		quint32 start = _polygonsOffset + subdiv->polygonsOffset();
@@ -462,7 +459,7 @@ void RGNFile::extObjects(const RectC &rect, const SubDiv *subdiv, LBLFile *lbl,
 		quint32 start = _pointsOffset + subdiv->pointsOffset();
 		quint32 end = subdiv->pointsEnd()
 		  ? _pointsOffset + subdiv->pointsEnd()
-		  : _pointsOffset + _linesSize;
+		  : _pointsOffset + _pointsSize;
 		extPointObjects(rect, rgnHdl, subdiv, Segment(start, end,
 		  Segment::Point), lbl, lblHdl, points);
 	}

src/map/IMG/rgnfile.h

@@ -11,7 +11,10 @@ class NETFile;
 class RGNFile : public SubFile
 {
 public:
-	RGNFile(IMG *img, quint32 size) : SubFile(img, size), _init(false) {}
+	RGNFile(IMG *img, quint32 size)
+	  : SubFile(img, size), _offset(0), _size(0), _polygonsOffset(0),
+	  _polygonsSize(), _linesOffset(), _linesSize(), _pointsOffset(),
+	  _pointsSize() {}
 
 	void objects(const RectC &rect, const SubDiv *subdiv, LBLFile *lbl,
 	  NETFile *net, QList<IMG::Poly> *polygons, QList<IMG::Poly> *lines,
@@ -96,8 +99,6 @@ private:
 	quint32 _linesSize;
 	quint32 _pointsOffset;
 	quint32 _pointsSize;
-
-	bool _init;
 };
 
 #ifndef QT_NO_DEBUG

src/map/IMG/style.cpp

@@ -148,8 +148,14 @@ void Style::defaultLineStyle()
 	_lines[TYPE(0x29)].setTextFontSize(Style::None);
 }
 
-void Style::defaultPOIStyle()
+void Style::defaultPointStyle()
 {
+	// Cities
+	_points[TYPE(0x01)].setTextFontSize(Style::Large);
+	_points[TYPE(0x02)].setTextFontSize(Style::Large);
+	_points[TYPE(0x03)].setTextFontSize(Style::Large);
+
+	// POI
 	_points[0x2a00] = Point(QImage(":/restaurant-11.png"));
 	_points[0x2a01] = Point(QImage(":/restaurant-11.png"));
 	_points[0x2a02] = Point(QImage(":/restaurant-noodle-11.png"));
@@ -380,6 +386,9 @@ bool Style::itemInfo(SubFile *file, SubFile::Handle &hdl,
 bool Style::parsePolygons(SubFile *file, SubFile::Handle &hdl,
   const Section &section)
 {
+	if (!section.arrayItemSize)
+		return section.arraySize ? false : true;
+
 	for (quint32 i = 0; i < section.arraySize / section.arrayItemSize; i++) {
 		if (!file->seek(hdl, section.arrayOffset + i * section.arrayItemSize))
 			return false;
@@ -493,6 +502,9 @@ bool Style::parsePolygons(SubFile *file, SubFile::Handle &hdl,
 bool Style::parseLines(SubFile *file, SubFile::Handle &hdl,
   const Section &section)
 {
+	if (!section.arrayItemSize)
+		return section.arraySize ? false : true;
+
 	for (quint32 i = 0; i < section.arraySize / section.arrayItemSize; i++) {
 		if (!file->seek(hdl, section.arrayOffset + i * section.arrayItemSize))
 			return false;
@@ -774,6 +786,9 @@ static bool readColorTable(SubFile *file, SubFile::Handle &hdl, QImage& img,
 bool Style::parsePoints(SubFile *file, SubFile::Handle &hdl,
   const Section &section)
 {
+	if (!section.arrayItemSize)
+		return section.arraySize ? false : true;
+
 	for (quint32 i = 0; i < section.arraySize / section.arrayItemSize; i++) {
 		if (!file->seek(hdl, section.arrayOffset + i * section.arrayItemSize))
 			return false;
@@ -849,6 +864,9 @@ bool Style::parseDrawOrder(SubFile *file, SubFile::Handle &hdl,
 {
 	QList<quint32> drawOrder;
 
+	if (!order.arrayItemSize)
+		return order.arraySize ? false : true;
+
 	if (!file->seek(hdl, order.arrayOffset))
 		return false;
 
@@ -922,7 +940,7 @@ Style::Style(SubFile *typ)
 {
 	defaultLineStyle();
 	defaultPolygonStyle();
-	defaultPOIStyle();
+	defaultPointStyle();
 
 	if (typ && typ->isValid())
 		parseTYPFile(typ);
@@ -965,7 +983,12 @@ bool Style::isSpot(quint32 type)
 
 bool Style::isSummit(quint32 type)
 {
-	return  (type == 0x6616);
+	return (type == 0x6616);
+}
+
+bool Style::isMajorRoad(quint32 type)
+{
+	return (type <= TYPE(0x04));
 }
 
 Style::POIClass Style::poiClass(quint32 type)

src/map/IMG/style.h

@@ -106,6 +106,7 @@ public:
 	static bool isContourLine(quint32 type);
 	static bool isSpot(quint32 type);
 	static bool isSummit(quint32 type);
+	static bool isMajorRoad(quint32 type);
 	static POIClass poiClass(quint32 type);
 
 private:
@@ -137,7 +138,7 @@ private:
 	  const Section &section, ItemInfo &info);
 	void defaultPolygonStyle();
 	void defaultLineStyle();
-	void defaultPOIStyle();
+	void defaultPointStyle();
 
 	QMap<quint32, Line> _lines;
 	QMap<quint32, Polygon> _polygons;

src/map/IMG/subfile.cpp

@@ -76,12 +76,12 @@ bool SubFile::readByte(Handle &handle, quint8 &val) const
 
 quint32 SubFile::size() const
 {
-	return _img ? _size : (quint32)_file->size();
+	return _file ? (quint32)_file->size() : _size;
 }
 
 QString SubFile::fileName() const
 {
-	return _img ? _img->fileName() : _file->fileName();
+	return _file ? _file->fileName() : _img->fileName();
 }
 
 #ifndef QT_NO_DEBUG

src/map/IMG/subfile.h

@@ -84,6 +84,8 @@ public:
 	QString fileName() const;
 
 	static Type type(const char str[3]);
+	static bool isTileFile(Type type)
+	  {return (type == TRE || type == LBL || type == RGN || type == NET);}
 
 	friend QDebug operator<<(QDebug dbg, const SubFile &file);
 

src/map/IMG/textpointitem.cpp

@@ -7,29 +7,48 @@
 
 #define FLAGS (Qt::AlignCenter | Qt::TextWordWrap | Qt::TextDontClip)
 #define MAX_TEXT_WIDTH 8
+#define MIN_BOX_WIDTH 2
+
+
+static void expand(QRect &rect, int width)
+{
+	rect.adjust(-(width/2 - rect.width()/2), 0, width/2 - rect.width()/2, 0);
+}
 
 TextPointItem::TextPointItem(const QPoint &point, const QString *text,
-  const QFont *font, const QImage *img, const QColor *color)
-  : _text(text), _font(font), _img(img), _color(color)
+  const QFont *font, const QImage *img, const QColor *color,
+  const QColor *bgColor) : _text(font ? text : 0), _font(font), _img(img),
+  _color(color), _bgColor(bgColor)
 {
+	if (_text) {
+		QFontMetrics fm(*_font);
+		int limit = _font->pixelSize() * MAX_TEXT_WIDTH;
+		_textRect = fm.boundingRect(QRect(0, 0, limit, 0), FLAGS, *_text);
+		_textRect.adjust(0, 0, 1, 1);
+
+		if (_bgColor && _textRect.width() < _font->pixelSize() * MIN_BOX_WIDTH)
+			expand(_textRect, _font->pixelSize() * MIN_BOX_WIDTH);
+	}
+
+	setPos(point);
+}
+
+void TextPointItem::setPos(const QPoint &point)
+{
+	QPainterPath shape;
 	QRect iconRect;
 
-	if (text) {
-		QFontMetrics fm(*font);
-		int limit = font->pixelSize() * MAX_TEXT_WIDTH;
-		_textRect = fm.boundingRect(QRect(0, 0, limit, 0), FLAGS, *text);
-		_textRect.adjust(0, 0, 1, 1);
-	}
-	if (img) {
-		iconRect = QRect(QPoint(point.x() - img->width()/2, point.y()
-		  - img->height()/2), img->size());
-		_textRect.moveTopLeft(QPoint(point.x() + img->width(), point.y()
+	if (_img) {
+		iconRect = QRect(QPoint(point.x() - _img->width()/2, point.y()
+		  - _img->height()/2), _img->size());
+		_textRect.moveTopLeft(QPoint(point.x() + _img->width(), point.y()
 		  - _textRect.height()/2));
 	} else
 		_textRect.moveCenter(point);
 
 	_rect = _textRect | iconRect;
-	_shape.addRect(_rect);
+	shape.addRect(_rect);
+	_shape = shape;
 }
 
 void TextPointItem::paint(QPainter *painter) const
@@ -39,34 +58,44 @@ void TextPointItem::paint(QPainter *painter) const
 		  - _img->height()/2), *_img);
 
 	if (_text) {
-		QImage img(_textRect.size(), QImage::Format_ARGB32_Premultiplied);
-		img.fill(Qt::transparent);
-		QPainter ip(&img);
-		ip.setPen(Qt::white);
-		ip.setFont(*_font);
-		ip.drawText(img.rect(), FLAGS, *_text);
-
-		painter->drawImage(_textRect.x() - 1, _textRect.y() - 1, img);
-		painter->drawImage(_textRect.x() + 1, _textRect.y() + 1, img);
-		painter->drawImage(_textRect.x() - 1, _textRect.y() + 1, img);
-		painter->drawImage(_textRect.x(), _textRect.y() - 1, img);
-		painter->drawImage(_textRect.x(), _textRect.y() + 1, img);
-		painter->drawImage(_textRect.x() - 1, _textRect.y(), img);
-		painter->drawImage(_textRect.x() + 1, _textRect.y(), img);
-
-		if (_color) {
-			painter->setFont(*_font);
+		if (_bgColor) {
 			painter->setPen(*_color);
+			painter->setBrush(*_bgColor);
+			painter->drawRect(_textRect);
+			painter->setBrush(Qt::NoBrush);
+			painter->setFont(*_font);
 			painter->drawText(_textRect, FLAGS, *_text);
 		} else {
+			QImage img(_textRect.size(), QImage::Format_ARGB32_Premultiplied);
+			img.fill(Qt::transparent);
+			QPainter ip(&img);
+			ip.setPen(Qt::white);
+			ip.setFont(*_font);
+			ip.drawText(img.rect(), FLAGS, *_text);
+
+			painter->drawImage(_textRect.x() - 1, _textRect.y() - 1, img);
+			painter->drawImage(_textRect.x() + 1, _textRect.y() + 1, img);
+			painter->drawImage(_textRect.x() - 1, _textRect.y() + 1, img);
+			painter->drawImage(_textRect.x() + 1, _textRect.y() - 1, img);
+			painter->drawImage(_textRect.x(), _textRect.y() - 1, img);
+			painter->drawImage(_textRect.x(), _textRect.y() + 1, img);
+			painter->drawImage(_textRect.x() - 1, _textRect.y(), img);
+			painter->drawImage(_textRect.x() + 1, _textRect.y(), img);
+
+			if (_color) {
+				painter->setFont(*_font);
+				painter->setPen(*_color);
+				painter->drawText(_textRect, FLAGS, *_text);
+			} else {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-			img.invertPixels();
-			painter->drawImage(_textRect, img);
+				img.invertPixels();
+				painter->drawImage(_textRect, img);
 #else // QT >= 5.4
-			QImage iimg(img.convertToFormat(QImage::Format_ARGB32));
-			iimg.invertPixels();
-			painter->drawImage(_textRect, iimg);
+				QImage iimg(img.convertToFormat(QImage::Format_ARGB32));
+				iimg.invertPixels();
+				painter->drawImage(_textRect, iimg);
 #endif // QT >= 5.4
+			}
 		}
 	}
 

src/map/IMG/textpointitem.h

@@ -16,7 +16,7 @@ class TextPointItem : public TextItem
 public:
 	TextPointItem() : _text(0), _font(0), _img(0) {}
 	TextPointItem(const QPoint &point, const QString *text, const QFont *font,
-	  const QImage *img, const QColor *color);
+	  const QImage *img, const QColor *color, const QColor *bgColor = 0);
 
 	bool isValid() const {return !_rect.isEmpty();}
 
@@ -24,11 +24,13 @@ public:
 	QPainterPath shape() const {return _shape;}
 	void paint(QPainter *painter) const;
 
+	void setPos(const QPoint &point);
+
 private:
 	const QString *_text;
 	const QFont *_font;
 	const QImage *_img;
-	const QColor *_color;
+	const QColor *_color, *_bgColor;
 	QRect _rect, _textRect;
 	QPainterPath _shape;
 };

src/map/IMG/trefile.cpp

@@ -3,22 +3,6 @@
 #include "trefile.h"
 
 
-struct MapLevel {
-	quint8 level;
-	quint8 bits;
-	quint16 subdivs;
-};
-
-#ifndef QT_NO_DEBUG
-static QDebug operator<<(QDebug dbg, const MapLevel &ml)
-{
-	bool inherited = ml.level & 0x80 ? true : false;
-	dbg.nospace() << "MapLevel(" << (ml.level & 0x7F) << ", " << inherited
-	  << ", " << ml.bits << ", " << ml.subdivs << ")";
-	return dbg.space();
-}
-#endif // QT_NO_DEBUG
-
 static void unlock(quint8 *dst, const quint8 *src, quint32 size, quint32 key)
 {
 	static const unsigned char shuf[] = {
@@ -50,18 +34,7 @@ static void unlock(quint8 *dst, const quint8 *src, quint32 size, quint32 key)
 
 TREFile::~TREFile()
 {
-	SubDivTree::Iterator jt;
-
-	for (QMap<int, SubDivTree*>::iterator it = _subdivs.begin();
-	  it != _subdivs.end(); ++it) {
-		SubDivTree *tree = *it;
-		for (tree->GetFirst(jt); !tree->IsNull(jt); tree->GetNext(jt))
-			delete tree->GetAt(jt);
-	}
-
-	for (QMap<int, SubDivTree*>::iterator it = _subdivs.begin();
-	  it != _subdivs.end(); ++it)
-		delete *it;
+	clear();
 }
 
 bool TREFile::init()
@@ -70,7 +43,7 @@ bool TREFile::init()
 	quint8 locked;
 	quint16 hdrLen;
 
-	if (!(isValid() && seek(hdl, 0) && readUInt16(hdl, hdrLen)
+	if (!(seek(hdl, 0) && readUInt16(hdl, hdrLen)
 	  && seek(hdl, 0x0D) && readByte(hdl, locked)))
 		return false;
 
@@ -82,16 +55,18 @@ bool TREFile::init()
 	_bounds = RectC(Coordinates(toWGS84(west), toWGS84(north)),
 	  Coordinates(toWGS84(east), toWGS84(south)));
 
-	quint32 levelsOffset, levelsSize, subdivOffset, subdivSize;
-	if (!(readUInt32(hdl, levelsOffset) && readUInt32(hdl, levelsSize)
-	  && readUInt32(hdl, subdivOffset) && readUInt32(hdl, subdivSize)))
+	// Levels & subdivs info
+	quint32 levelsOffset, levelsSize, subdivSize;
+	if (!(seek(hdl, 0x21) && readUInt32(hdl, levelsOffset)
+	  && readUInt32(hdl, levelsSize) && readUInt32(hdl, _subdivOffset)
+	  && readUInt32(hdl, subdivSize)))
 		return false;
 
-	quint32 extOffset, extSize = 0;
-	quint16 extItemSize = 0;
+	// TRE7 info
 	if (hdrLen > 0x9A) {
-		if (!(seek(hdl, 0x7C) && readUInt32(hdl, extOffset)
-		  && readUInt32(hdl, extSize) && readUInt16(hdl, extItemSize)))
+		if (!(seek(hdl, 0x7C) && readUInt32(hdl, _extended.offset)
+		  && readUInt32(hdl, _extended.size)
+		  && readUInt16(hdl, _extended.itemSize)))
 			return false;
 	}
 
@@ -112,94 +87,166 @@ bool TREFile::init()
 	}
 
 	quint32 levelsCount = levelsSize / 4;
-	QVector<MapLevel> ml(levelsCount);
-	QMap<int, int> level2bits;
+	_levels = QVector<MapLevel>(levelsCount);
 
 	for (quint32 i = 0; i < levelsCount; i++) {
 		quint8 *zoom = levels + (i * 4);
-		ml[i].level = *zoom;
-		ml[i].bits = *(zoom + 1);
-		ml[i].subdivs = *(zoom + 2) | (quint16)(*(zoom + 3)) << 8;
-		if ((ml[i].level & 0xF) > 15 || ml[i].bits > 24)
+		_levels[i].level = *zoom;
+		_levels[i].bits = *(zoom + 1);
+		_levels[i].subdivs = *(zoom + 2) | (quint16)(*(zoom + 3)) << 8;
+		if (_levels[i].bits > 24 || !_levels[i].subdivs)
 			return false;
-
-		level2bits.insert(ml[i].level & 0xF, ml[i].bits);
 	}
 
-	// Subdivisions
-	if (!seek(hdl, subdivOffset))
-		return false;
-	SubDiv *s = 0;
-	QList<SubDiv*> sl;
-
-	for (int i = 0; i < ml.size(); i++) {
-		if (!(ml.at(i).level & 0x80))
-			_subdivs.insert(ml.at(i).bits, new SubDivTree());
-
-		for (int j = 0; j < ml.at(i).subdivs; j++) {
-			quint32 offset;
-			qint32 lon, lat;
-			quint8 objects;
-			quint16 width, height, nextLevel;
-
-			if (!(readUInt24(hdl, offset) && readByte(hdl, objects)
-			  && readInt24(hdl, lon) && readInt24(hdl, lat)
-			  && readUInt16(hdl, width) && readUInt16(hdl, height)))
-				return false;
-			if (i != (int)levelsCount - 1)
-				if (!readUInt16(hdl, nextLevel))
-					return false;
-
-			if (s)
-				s->setEnd(offset);
-
-			if (ml.at(i).level & 0x80) {
-				sl.append(0);
-				s = 0;
-				continue;
-			}
-
-			width &= 0x7FFF;
-			width <<= (24 - ml.at(i).bits);
-			height <<= (24 - ml.at(i).bits);
-
-			s = new SubDiv(offset, lon, lat, ml.at(i).bits, objects);
-			sl.append(s);
-
-			double min[2], max[2];
-			RectC bounds(Coordinates(toWGS84(lon - width),
-			  toWGS84(lat + height + 1)), Coordinates(toWGS84(lon + width + 1),
-			  toWGS84(lat - height)));
-
-			min[0] = bounds.left();
-			min[1] = bounds.bottom();
-			max[0] = bounds.right();
-			max[1] = bounds.top();
-			_subdivs[ml.at(i).bits]->Insert(min, max, s);
+	// Get first non-inherited level
+	_firstLevel = -1;
+	for (int i = 0; i < _levels.size(); i++) {
+		if (!(_levels.at(i).level & 0x80)) {
+			_firstLevel = i;
+			break;
 		}
 	}
 
-	// objects with extended types (TRE7)
-	if (extSize && extItemSize >= 12
-	  && (sl.size() - (int)(extSize/extItemSize) + 1 >= 0)) {
-		quint32 polygons, lines, points;
-		if (!seek(hdl, extOffset))
-			return false;
+	return (_firstLevel >= 0);
+}
 
-		for (int i = sl.size() - (extSize/extItemSize) + 1; i < sl.size(); i++) {
+bool TREFile::load(int idx)
+{
+	Handle hdl;
+	QList<SubDiv*> sl;
+	SubDiv *s = 0;
+	SubDivTree *tree = new SubDivTree();
+
+
+	_subdivs.insert(_levels.at(idx).bits, tree);
+
+	quint32 skip = 0;
+	for (int i = 0; i < idx; i++)
+		skip += _levels.at(i).subdivs;
+
+	if (!seek(hdl, _subdivOffset + skip * 16))
+		return false;
+
+	for (int j = 0; j < _levels.at(idx).subdivs; j++) {
+		quint32 offset;
+		qint32 lon, lat;
+		quint8 objects;
+		quint16 width, height, nextLevel;
+
+		if (!(readUInt24(hdl, offset) && readByte(hdl, objects)
+		  && readInt24(hdl, lon) && readInt24(hdl, lat)
+		  && readUInt16(hdl, width) && readUInt16(hdl, height)))
+			goto error;
+		if (idx != _levels.size() - 1)
+			if (!readUInt16(hdl, nextLevel))
+				goto error;
+
+		if (s)
+			s->setEnd(offset);
+
+		width &= 0x7FFF;
+		width <<= (24 - _levels.at(idx).bits);
+		height <<= (24 - _levels.at(idx).bits);
+
+		s = new SubDiv(offset, lon, lat, _levels.at(idx).bits, objects);
+		sl.append(s);
+
+		double min[2], max[2];
+		RectC bounds(Coordinates(toWGS84(lon - width),
+		  toWGS84(lat + height + 1)), Coordinates(toWGS84(lon + width + 1),
+		  toWGS84(lat - height)));
+
+		min[0] = bounds.left();
+		min[1] = bounds.bottom();
+		max[0] = bounds.right();
+		max[1] = bounds.top();
+
+		tree->Insert(min, max, s);
+	}
+
+	if (idx != _levels.size() - 1) {
+		quint32 offset;
+		if (!readUInt24(hdl, offset))
+			goto error;
+		s->setEnd(offset);
+	}
+
+
+	// Objects with extended types (TRE7)
+	if (_extended.size && _extended.itemSize >= 12) {
+		/* Some maps skip entries for the inherited levels, some don't. Our
+		   decision is based on the difference between the extended subdivs
+		   count and the total subdivs count. */
+		quint32 totalSubdivs = 0;
+		for (int i = 0; i < _levels.size(); i++)
+			totalSubdivs += _levels.at(i).subdivs;
+		quint32 extendedSubdivs = _extended.size / _extended.itemSize;
+		quint32 diff = totalSubdivs - extendedSubdivs + 1;
+
+		quint32 polygons, lines, points;
+		if (!seek(hdl, _extended.offset + (skip - diff) * _extended.itemSize))
+			goto error;
+
+		for (int i = 0; i < sl.size(); i++) {
 			if (!(readUInt32(hdl, polygons) && readUInt32(hdl, lines)
 			  && readUInt32(hdl, points)))
-				return false;
-			if (!seek(hdl, hdl.pos + extItemSize - 12))
-				return false;
-			if (i && sl.at(i-1))
+				goto error;
+
+			sl.at(i)->setExtOffsets(polygons, lines, points);
+			if (i)
 				sl.at(i-1)->setExtEnds(polygons, lines, points);
-			if (sl.at(i))
-				sl.at(i)->setExtOffsets(polygons, lines, points);
+
+			if (!seek(hdl, hdl.pos + _extended.itemSize - 12))
+				goto error;
+		}
+
+		if (idx != _levels.size() - 1) {
+			if (!(readUInt32(hdl, polygons) && readUInt32(hdl, lines)
+			  && readUInt32(hdl, points)))
+				goto error;
+			sl.last()->setExtEnds(polygons, lines, points);
 		}
 	}
 
 	return true;
+
+error:
+	qDeleteAll(sl);
+	tree->RemoveAll();
+
+	return false;
+}
+
+void TREFile::clear()
+{
+	SubDivTree::Iterator jt;
+
+	for (QMap<int, SubDivTree*>::iterator it = _subdivs.begin();
+	  it != _subdivs.end(); ++it) {
+		SubDivTree *tree = *it;
+		for (tree->GetFirst(jt); !tree->IsNull(jt); tree->GetNext(jt))
+			delete tree->GetAt(jt);
+	}
+
+	qDeleteAll(_subdivs);
+
+	_subdivs.clear();
+}
+
+int TREFile::level(int bits)
+{
+	int idx = _firstLevel;
+
+	for (int i = idx + 1; i < _levels.size(); i++) {
+		if (_levels.at(i).bits > bits)
+			break;
+		idx++;
+	}
+
+	if (!_subdivs.contains(_levels.at(idx).bits) && !load(idx))
+		return -1;
+
+	return _levels.at(idx).bits;
 }
 
 static bool cb(SubDiv *subdiv, void *context)
@@ -209,9 +256,10 @@ static bool cb(SubDiv *subdiv, void *context)
 	return true;
 }
 
-QList<SubDiv*> TREFile::subdivs(const RectC &rect, int bits) const
+QList<SubDiv*> TREFile::subdivs(const RectC &rect, int bits)
 {
 	QList<SubDiv*> list;
+	SubDivTree *tree = _subdivs.value(level(bits));
 	double min[2], max[2];
 
 	min[0] = rect.left();
@@ -219,7 +267,17 @@ QList<SubDiv*> TREFile::subdivs(const RectC &rect, int bits) const
 	max[0] = rect.right();
 	max[1] = rect.top();
 
-	_subdivs.value(bits)->Search(min, max, cb, &list);
+	if (tree)
+		tree->Search(min, max, cb, &list);
 
 	return list;
 }
+
+#ifndef QT_NO_DEBUG
+QDebug operator<<(QDebug dbg, const TREFile::MapLevel &level)
+{
+	dbg.nospace() << "MapLevel(" << level.level << ", " << level.bits << ", "
+	  << level.subdivs << ")";
+	return dbg.space();
+}
+#endif // QT_NO_DEBUG

src/map/IMG/trefile.h

@@ -17,21 +17,45 @@ public:
 	~TREFile();
 
 	bool init();
+	void clear();
 
 	const RectC &bounds() const {return _bounds;}
-	const QList<int> bits() const {return _subdivs.keys();}
-
-	QList<SubDiv*> subdivs(const RectC &rect, int bits) const;
+	QList<SubDiv*> subdivs(const RectC &rect, int bits);
 
 private:
+	struct MapLevel {
+		quint8 level;
+		quint8 bits;
+		quint16 subdivs;
+	};
+	struct Extended {
+		quint32 offset;
+		quint32 size;
+		quint16 itemSize;
+
+		Extended() : offset(0), size(0), itemSize(0) {}
+	};
 	typedef RTree<SubDiv*, double, 2> SubDivTree;
 
+	bool load(int idx);
+	int level(int bits);
 	bool parsePoly(Handle hdl, quint32 pos, const QMap<int, int> &level2bits,
 	  QMap<quint32, int> &map);
 	bool parsePoints(Handle hdl, quint32 pos, const QMap<int, int> &level2bits);
 
+	friend QDebug operator<<(QDebug dbg, const MapLevel &level);
+
 	RectC _bounds;
+	QVector<MapLevel> _levels;
+	quint32 _subdivOffset;
+	Extended _extended;
+	int _firstLevel;
+
 	QMap<int, SubDivTree*> _subdivs;
 };
 
+#ifndef QT_NO_DEBUG
+QDebug operator<<(QDebug dbg, const TREFile::MapLevel &level);
+#endif // QT_NO_DEBUG
+
 #endif // TREFILE_H

src/map/IMG/vectortile.cpp

@@ -38,7 +38,8 @@ SubFile *VectorTile::addFile(IMG *img, SubFile::Type type, quint32 size)
 
 bool VectorTile::init()
 {
-	if (!(_tre && _tre->init() && _rgn && _rgn->isValid()))
+	if (!(_tre && _tre->isValid() && _tre->init() && _rgn
+	  && _rgn->isValid()))
 		return false;
 	if (_lbl && !_lbl->isValid())
 		return false;

src/map/IMG/vectortile.h

@@ -14,9 +14,9 @@ public:
 	~VectorTile() {delete _tre; delete _rgn; delete _lbl; delete _net;}
 
 	bool init();
+	void clear() {_tre->clear();}
 
 	const RectC &bounds() const {return _tre->bounds();}
-	const QList<int> bits() const {return _tre->bits();}
 
 	SubFile *file(SubFile::Type type);
 	SubFile *addFile(IMG *img, SubFile::Type type, quint32 size);
@@ -26,12 +26,6 @@ public:
 
 	friend QDebug operator<<(QDebug dbg, const VectorTile &tile);
 
-	static bool isTileFile(SubFile::Type type)
-	{
-		return (type == SubFile::TRE || type == SubFile::LBL
-		  || type == SubFile::RGN || type == SubFile::NET);
-	}
-
 private:
 	TREFile *_tre;
 	RGNFile *_rgn;

src/map/gcs.cpp

@@ -229,6 +229,18 @@ Coordinates GCS::fromWGS84(const Coordinates &c) const
 	return Coordinates(_primeMeridian.fromGreenwich(ds.lon()), ds.lat());
 }
 
+QList<KV<int, QString> > GCS::list()
+{
+	QList<KV<int, QString> > list;
+
+	for (int i = 0; i < _gcss.size(); i++)
+		if (_gcss.at(i).id())
+			list.append(KV<int, QString>(_gcss.at(i).id(), _gcss.at(i).name()
+			  + " / Geographic 2D"));
+
+	return list;
+}
+
 #ifndef QT_NO_DEBUG
 QDebug operator<<(QDebug dbg, const GCS &gcs)
 {

src/map/gcs.h

@@ -1,6 +1,7 @@
 #ifndef GCS_H
 #define GCS_H
 
+#include "common/kv.h"
 #include "datum.h"
 #include "angularunits.h"
 #include "primemeridian.h"
@@ -32,6 +33,7 @@ public:
 	static const GCS &WGS84();
 
 	static void loadList(const QString &path);
+	static QList<KV<int, QString> > list();
 
 private:
 	class Entry;

src/map/imgmap.cpp

@@ -19,12 +19,8 @@
 #define TILE_SIZE   256
 #define TEXT_EXTENT 256
 
-#define LARGE_FONT_SIZE   14
-#define NORMAL_FONT_SIZE  12
-#define SMALL_FONT_SIZE   10
-#define POI_FONT_SIZE      9
-
-#define LINE_TEXT_MIN_ZOOM   22
+#define AREA(rect) \
+	(rect.size().width() * rect.size().height())
 
 class RasterTile
 {
@@ -41,13 +37,14 @@ public:
 	QList<IMG::Poly> &lines() {return _lines;}
 	QList<IMG::Point> &points() {return _points;}
 
-	void load()
+	void render()
 	{
 		QList<TextItem*> textItems;
 
 		_map->processPolygons(_polygons);
 		_map->processPoints(_points, textItems);
-		_map->processLines(_lines, _xy, textItems);
+		_map->processLines(_lines, QRect(_xy, QSize(TILE_SIZE, TILE_SIZE)),
+		  textItems);
 
 		_img.fill(Qt::transparent);
 
@@ -59,6 +56,8 @@ public:
 		_map->drawPolygons(&painter, _polygons);
 		_map->drawLines(&painter, _lines);
 		_map->drawTextItems(&painter, textItems);
+		//painter.setPen(Qt::red);
+		//painter.drawRect(QRect(_xy, QSize(TILE_SIZE, TILE_SIZE)));
 
 		qDeleteAll(textItems);
 	}
@@ -74,12 +73,18 @@ private:
 };
 
 
-static void convertUnits(QString &str)
+static const Range zooms(12, 28);
+
+static const QColor shieldColor(Qt::white);
+static const QColor shieldBgColor1("#dd3e3e");
+static const QColor shieldBgColor2("#379947");
+static const QColor shieldBgColor3("#4a7fc1");
+
+static QString convertUnits(const QString &str)
 {
 	bool ok;
 	int number = str.toInt(&ok);
-	if (ok)
-		str = QString::number(qRound(number * 0.3048));
+	return ok ? QString::number(qRound(number * 0.3048)) : str;
 }
 
 static int minPOIZoom(Style::POIClass cl)
@@ -103,28 +108,107 @@ static int minPOIZoom(Style::POIClass cl)
 	}
 }
 
+static QFont pixelSizeFont(int pixelSize)
+{
+	QFont f;
+	f.setPixelSize(pixelSize);
+	return f;
+}
+
+static QFont *font(Style::FontSize size, Style::FontSize defaultSize
+  = Style::Normal)
+{
+	/* The fonts must be initialized on first usage (after the QGuiApplication
+	   instance is created) */
+	static QFont large = pixelSizeFont(16);
+	static QFont normal = pixelSizeFont(14);
+	static QFont small = pixelSizeFont(12);
+
+	switch (size) {
+		case Style::None:
+			return 0;
+		case Style::Large:
+			return &large;
+		case Style::Normal:
+			return &normal;
+		case Style::Small:
+			return &small;
+		default:
+			return font(defaultSize);
+	}
+}
+
+static QFont *poiFont(Style::FontSize size = Style::Normal)
+{
+	static QFont poi = pixelSizeFont(10);
+
+	switch (size) {
+		case Style::None:
+			return 0;
+		default:
+			return &poi;
+	}
+}
+
+static const QColor *shieldBgColor(Label::Shield::Type type)
+{
+	switch (type) {
+		case Label::Shield::USInterstate:
+		case Label::Shield::Hbox:
+			return &shieldBgColor1;
+		case Label::Shield::USShield:
+		case Label::Shield::Box:
+			return &shieldBgColor2;
+		case Label::Shield::USRound:
+		case Label::Shield::Oval:
+			return &shieldBgColor3;
+		default:
+			return 0;
+	}
+}
+
+static int minShieldZoom(Label::Shield::Type type)
+{
+	switch (type) {
+		case Label::Shield::USInterstate:
+		case Label::Shield::Hbox:
+			return 18;
+		case Label::Shield::USShield:
+		case Label::Shield::Box:
+			return 19;
+		case Label::Shield::USRound:
+		case Label::Shield::Oval:
+			return 20;
+		default:
+			return 0;
+	}
+}
+
+
 IMGMap::IMGMap(const QString &fileName, QObject *parent)
-  : Map(parent), _fileName(fileName), _img(fileName),
-  _projection(PCS::pcs(3857)), _valid(false)
+  : Map(parent), _img(fileName), _projection(PCS::pcs(3857)), _valid(false)
 {
 	if (!_img.isValid()) {
 		_errorString = _img.errorString();
 		return;
 	}
 
-	_zooms = Range(_img.zooms().min() - 1, 28);
-	_zoom = _zooms.min();
-
+	_zoom = zooms.min();
 	updateTransform();
 
-	_largeFont.setPixelSize(LARGE_FONT_SIZE);
-	_normalFont.setPixelSize(NORMAL_FONT_SIZE);
-	_smallFont.setPixelSize(SMALL_FONT_SIZE);
-	_poiFont.setPixelSize(POI_FONT_SIZE);
-
 	_valid = true;
 }
 
+void IMGMap::load()
+{
+	_img.load();
+}
+
+void IMGMap::unload()
+{
+	_img.clear();
+}
+
 QRectF IMGMap::bounds()
 {
 	RectD prect(_img.bounds(), _projection);
@@ -137,8 +221,8 @@ int IMGMap::zoomFit(const QSize &size, const RectC &rect)
 	if (rect.isValid()) {
 		RectD pr(rect, _projection, 10);
 
-		_zoom = _zooms.min();
-		for (int i = _zooms.min() + 1; i <= _zooms.max(); i++) {
+		_zoom = zooms.min();
+		for (int i = zooms.min() + 1; i <= zooms.max(); i++) {
 			Transform t(transform(i));
 			QRectF r(t.proj2img(pr.topLeft()), t.proj2img(pr.bottomRight()));
 			if (size.width() < r.width() || size.height() < r.height())
@@ -146,7 +230,7 @@ int IMGMap::zoomFit(const QSize &size, const RectC &rect)
 			_zoom = i;
 		}
 	} else
-		_zoom = _zooms.max();
+		_zoom = zooms.max();
 
 	updateTransform();
 
@@ -155,14 +239,14 @@ int IMGMap::zoomFit(const QSize &size, const RectC &rect)
 
 int IMGMap::zoomIn()
 {
-	_zoom = qMin(_zoom + 1, _zooms.max());
+	_zoom = qMin(_zoom + 1, zooms.max());
 	updateTransform();
 	return _zoom;
 }
 
 int IMGMap::zoomOut()
 {
-	_zoom = qMax(_zoom - 1, _zooms.min());
+	_zoom = qMax(_zoom - 1, zooms.min());
 	updateTransform();
 	return _zoom;
 }
@@ -175,7 +259,8 @@ void IMGMap::setZoom(int zoom)
 
 Transform IMGMap::transform(int zoom) const
 {
-	double scale = (2.0 * M_PI * WGS84_RADIUS) / (1<<zoom);
+	double scale = _projection.isGeographic()
+	  ? 360.0 / (1<<zoom) : (2.0 * M_PI * WGS84_RADIUS) / (1<<zoom);
 	PointD topLeft(_projection.ll2xy(_img.bounds().topLeft()));
 	return Transform(ReferencePoint(PointD(0, 0), topLeft),
 	  PointD(scale, scale));
@@ -199,12 +284,12 @@ Coordinates IMGMap::xy2ll(const QPointF &p)
 
 void IMGMap::drawPolygons(QPainter *painter, const QList<IMG::Poly> &polygons)
 {
-	for (int n = 0; n < _img.style().drawOrder().size(); n++) {
+	for (int n = 0; n < _img.style()->drawOrder().size(); n++) {
 		for (int i = 0; i < polygons.size(); i++) {
 			const IMG::Poly &poly = polygons.at(i);
-			if (poly.type != _img.style().drawOrder().at(n))
+			if (poly.type != _img.style()->drawOrder().at(n))
 				continue;
-			const Style::Polygon &style = _img.style().polygon(poly.type);
+			const Style::Polygon &style = _img.style()->polygon(poly.type);
 
 			painter->setPen(style.pen());
 			painter->setBrush(style.brush());
@@ -219,7 +304,7 @@ void IMGMap::drawLines(QPainter *painter, const QList<IMG::Poly> &lines)
 
 	for (int i = 0; i < lines.size(); i++) {
 		const IMG::Poly &poly = lines.at(i);
-		const Style::Line &style = _img.style().line(poly.type);
+		const Style::Line &style = _img.style()->line(poly.type);
 
 		if (style.background() == Qt::NoPen)
 			continue;
@@ -230,7 +315,7 @@ void IMGMap::drawLines(QPainter *painter, const QList<IMG::Poly> &lines)
 
 	for (int i = 0; i < lines.size(); i++) {
 		const IMG::Poly &poly = lines.at(i);
-		const Style::Line &style = _img.style().line(poly.type);
+		const Style::Line &style = _img.style()->line(poly.type);
 
 		if (!style.img().isNull())
 			BitmapLine::draw(painter, poly.points, style.img());
@@ -259,7 +344,7 @@ void IMGMap::processPolygons(QList<IMG::Poly> &polygons)
 	}
 }
 
-void IMGMap::processLines(QList<IMG::Poly> &lines, const QPoint &tile,
+void IMGMap::processLines(QList<IMG::Poly> &lines, const QRect &tileRect,
   QList<TextItem*> &textItems)
 {
 	qStableSort(lines);
@@ -272,37 +357,33 @@ void IMGMap::processLines(QList<IMG::Poly> &lines, const QPoint &tile,
 		}
 	}
 
-	if (_zoom < LINE_TEXT_MIN_ZOOM)
-		return;
+	if (_zoom >= 22)
+		processStreetNames(lines, tileRect, textItems);
+	processShields(lines, tileRect, textItems);
+}
 
+void IMGMap::processStreetNames(QList<IMG::Poly> &lines, const QRect &tileRect,
+  QList<TextItem*> &textItems)
+{
 	for (int i = 0; i < lines.size(); i++) {
 		IMG::Poly &poly = lines[i];
-		const Style::Line &style = _img.style().line(poly.type);
+		const Style::Line &style = _img.style()->line(poly.type);
 
 		if (style.img().isNull() && style.foreground() == Qt::NoPen)
 			continue;
-		if (poly.label.isEmpty() || style.textFontSize() == Style::None)
+		if (poly.label.text().isEmpty()
+		  || style.textFontSize() == Style::None)
 			continue;
 
 		if (Style::isContourLine(poly.type))
-			convertUnits(poly.label);
+			poly.label.setText(convertUnits(poly.label.text()));
 
-		const QFont *font;
-		switch (style.textFontSize()) {
-			case Style::Large:
-				font = &_largeFont;
-				break;
-			case Style::Small:
-				font = &_smallFont;
-				break;
-			default:
-				font = &_normalFont;
-		}
+		const QFont *fnt = font(style.textFontSize(), Style::Small);
 		const QColor *color = style.textColor().isValid()
 		  ? &style.textColor() : 0;
 
-		TextPathItem *item = new TextPathItem(poly.points, &poly.label,
-		  QRect(tile, QSize(TILE_SIZE, TILE_SIZE)), font, color);
+		TextPathItem *item = new TextPathItem(poly.points,
+		  &poly.label.text(), tileRect, fnt, color);
 		if (item->isValid() && !item->collides(textItems))
 			textItems.append(item);
 		else
@@ -310,6 +391,70 @@ void IMGMap::processLines(QList<IMG::Poly> &lines, const QPoint &tile,
 	}
 }
 
+void IMGMap::processShields(QList<IMG::Poly> &lines, const QRect &tileRect,
+  QList<TextItem*> &textItems)
+{
+	for (int type = FIRST_SHIELD; type <= LAST_SHIELD; type++) {
+		if (minShieldZoom(static_cast<Label::Shield::Type>(type)) > _zoom)
+			continue;
+
+		QHash<Label::Shield, QPolygonF> shields;
+		QHash<Label::Shield, const Label::Shield*> sp;
+
+		for (int i = 0; i < lines.size(); i++) {
+			const IMG::Poly &poly = lines.at(i);
+			const Label::Shield &shield = poly.label.shield();
+			if (!shield.isValid() || shield.type() != type
+			  || !Style::isMajorRoad(poly.type))
+				continue;
+
+			QPolygonF &p = shields[shield];
+			for (int j = 0; j < poly.points.size(); j++)
+				p.append(poly.points.at(j));
+
+			sp.insert(shield, &shield);
+		}
+
+		for (QHash<Label::Shield, QPolygonF>::const_iterator it
+		  = shields.constBegin(); it != shields.constEnd(); ++it) {
+			const QPolygonF &p = it.value();
+			QRectF rect(p.boundingRect() & tileRect);
+			if (qSqrt(AREA(rect)) < 32)
+				continue;
+
+			QMap<qreal, int> map;
+			QPointF center = rect.center();
+			for (int j = 0; j < p.size(); j++) {
+				QLineF l(p.at(j), center);
+				map.insert(l.length(), j);
+			}
+
+			QMap<qreal, int>::const_iterator jt = map.constBegin();
+
+			TextPointItem *item = new TextPointItem(
+			  p.at(jt.value()).toPoint(), &(sp.value(it.key())->text()),
+			  poiFont(), 0, &shieldColor, shieldBgColor(it.key().type()));
+
+			bool valid = false;
+			while (true) {
+				if (!item->collides(textItems)
+				  && tileRect.contains(item->boundingRect().toRect())) {
+					valid = true;
+					break;
+				}
+				if (++jt == map.constEnd())
+					break;
+				item->setPos(p.at(jt.value()).toPoint());
+			}
+
+			if (valid)
+				textItems.append(item);
+			else
+				delete item;
+		}
+	}
+}
+
 void IMGMap::processPoints(QList<IMG::Point> &points,
   QList<TextItem*> &textItems)
 {
@@ -317,51 +462,32 @@ void IMGMap::processPoints(QList<IMG::Point> &points,
 
 	for (int i = 0; i < points.size(); i++) {
 		IMG::Point &point = points[i];
-
-		const Style::Point &style = _img.style().point(point.type);
+		const Style::Point &style = _img.style()->point(point.type);
 
 		if (point.poi && _zoom < minPOIZoom(Style::poiClass(point.type)))
 			continue;
 
-		const QString *label = point.label.isEmpty() ? 0 : &(point.label);
+		const QString *label = point.label.text().isEmpty()
+		  ? 0 : &(point.label.text());
 		const QImage *img = style.img().isNull() ? 0 : &style.img();
-		const QFont *font = 0;
-		if (point.poi) {
-			if (style.textFontSize() == Style::None)
-				label = 0;
-			else
-				font = &_poiFont;
-		} else {
-			switch (style.textFontSize()) {
-				case Style::None:
-					label = 0;
-					break;
-				case Style::Normal:
-					font = &_normalFont;
-					break;
-				case Style::Small:
-					font = &_smallFont;
-					break;
-				default:
-					font = &_largeFont;
-			}
-		}
+		const QFont *fnt = point.poi
+		  ? poiFont(style.textFontSize()) : font(style.textFontSize());
 		const QColor *color = style.textColor().isValid()
 		  ? &style.textColor() : 0;
 
-		if (!label && !img)
+		if ((!label || !fnt) && !img)
 			continue;
 
 		if (Style::isSpot(point.type))
-			convertUnits(point.label);
-		if (Style::isSummit(point.type) && !point.label.isEmpty()) {
-			QStringList list = point.label.split(" ");
-			convertUnits(list.last());
+			point.label.setText(convertUnits(point.label.text()));
+		if (Style::isSummit(point.type) && !point.label.text().isEmpty()) {
+			QStringList list = point.label.text().split(" ");
+			list.last() = convertUnits(list.last());
 			point.label = list.join(" ");
 		}
 
 		TextPointItem *item = new TextPointItem(
-		  ll2xy(point.coordinates).toPoint(), label, font, img, color);
+		  ll2xy(point.coordinates).toPoint(), label, fnt, img, color);
 		if (item->isValid() && !item->collides(textItems))
 			textItems.append(item);
 		else
@@ -371,7 +497,7 @@ void IMGMap::processPoints(QList<IMG::Point> &points,
 
 static void render(RasterTile &tile)
 {
-	tile.load();
+	tile.render();
 }
 
 void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
@@ -390,7 +516,7 @@ void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 		for (int j = 0; j < height; j++) {
 			QPixmap pm;
 			QPoint ttl(tl.x() + i * TILE_SIZE, tl.y() + j * TILE_SIZE);
-			QString key = _fileName + "-" + QString::number(_zoom) + "_"
+			QString key = _img.fileName() + "-" + QString::number(_zoom) + "_"
 			  + QString::number(ttl.x()) + "_" + QString::number(ttl.y());
 			if (QPixmapCache::find(key, pm))
 				painter->drawPixmap(ttl, pm);