Translated using Weblate (Spanish)

Currently translated at 98.5% (337 of 342 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/es/

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.10.{build}
+version: 7.12.{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

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.10
+VERSION = 7.12
 
 QT += core \
     gui \
@@ -181,7 +181,9 @@ HEADERS += src/common/config.h \
     src/GUI/limitedcombobox.h \
     src/GUI/pathtickitem.h \
     src/map/IMG/textitem.h \
-    src/map/IMG/label.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 \
@@ -312,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
@@ -370,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
 }
 
@@ -387,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"/>

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.10"
+!define VERSION "7.12"
 
 ; 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 "gpx" "GPS Exchange Format" 6
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 7
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 8
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 9
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 10
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 11
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 12
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route 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.10"
+!define VERSION "7.12"
 
 ; 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 "gpx" "GPS Exchange Format" 6
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 7
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 8
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 9
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 10
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 11
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 12
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route 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/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);

src/GUI/gui.cpp

@@ -1066,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/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 (POIHash::const_iterator it = _pois.constBegin();
-			for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
+		  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 (POIHash::const_iterator it = _pois.constBegin();
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	  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 (POIHash::const_iterator it = _pois.constBegin();
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	  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 (POIHash::const_iterator it = _pois.constBegin();
-
+	  it != _pois.constEnd(); it++)
-	for (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 (POIHash::const_iterator it = _pois.constBegin();
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	  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 (POIHash::const_iterator it = _pois.constBegin();
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	  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 (POIHash::const_iterator it = _pois.constBegin();
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	  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 (POIHash::const_iterator it = _pois.constBegin();
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	  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 (POIHash::const_iterator it = _pois.constBegin();
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	  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));
+	const PCS *pcs;
-	if (!projection.isValid())
+	const GCS *gcs;
-		return;
-
-	_projection = projection;
-
 	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()) + " - "
+		QString text = QString::number(projections.at(i).key()) + " - "
-		  + projections.at(i).name();
+		  + projections.at(i).value();
-		_projection->addItem(text, QVariant(projections.at(i).id()));
+		_projection->addItem(text, QVariant(projections.at(i).key()));
 	}
 	_projection->setCurrentIndex(_projection->findData(_options->projection));
 

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 KEY &key() const {return _key;}
-	const QString &value() const {return _value;}
+	const VALUE &value() const {return _value;}
 
-	bool operator==(const KV &other) const
+	bool operator==(const KV &other) const {return _key == other._key;}
-	  {return this->key() == other.key();}
+	bool operator<(const KV &other) const {return _key < other._key;}
 
 private:
-	QString _key;
+	KEY _key;
-	QString _value;
+	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()) {
+	while (!csv.atEnd()) {
-		QByteArray line = file->readLine();
+		if (!csv.readEntry(entry) || entry.size() < 3) {
-		QList<QByteArray> list = line.split(',');
-		if (list.size() < 3) {
 			_errorString = "Parse error";
+			_errorLine = csv.line();
 			return false;
 		}
 
-		qreal lon = list[0].trimmed().toDouble(&res);
+		double lon = entry.at(0).trimmed().toDouble(&ok);
-		if (!res || (lon < -180.0 || lon > 180.0)) {
+		if (!ok || (lon < -180.0 || lon > 180.0)) {
 			_errorString = "Invalid longitude";
+			_errorLine = csv.line();
 			return false;
 		}
-		qreal lat = list[1].trimmed().toDouble(&res);
+		double lat = entry.at(1).trimmed().toDouble(&ok);
-		if (!res || (lat < -90.0 || lat > 90.0)) {
+		if (!ok || (lat < -90.0 || lat > 90.0)) {
 			_errorString = "Invalid latitude";
+			_errorLine = csv.line();
 			return false;
 		}
 		Waypoint wp(Coordinates(lon, lat));
-
+		wp.setName(entry.at(2).trimmed());
-		QByteArray ba = list[2].trimmed();
+		if (entry.size() > 3)
-		QString name = QString::fromUtf8(ba.data(), ba.size());
+			wp.setDescription(entry.at(3).trimmed());
-		wp.setName(name);
-
-		if (list.size() > 3) {
-			ba = list[3].trimmed();
-			wp.setDescription(QString::fromUtf8(ba.data(), ba.size()));
-		}
 
 		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;
 }
@@ -147,6 +150,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);;"

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)
-		if (ctx.endian)
+		val = qFromBigEndian(data);
-			val = qFromBigEndian(data);
+	else
-		else
+		val = qFromLittleEndian(data);
-			val = qFromLittleEndian(data);
-	} else
-		val = data;
 
 	return true;
 }

src/map/IMG/img.cpp

@@ -91,7 +91,7 @@ IMG::IMG(const QString &fileName)
 		}
 
 		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()) {
@@ -227,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);
-		val = qFromLittleEndian(data);
-	else
-		val = data;
 
 	return true;
 }

src/map/IMG/label.h

@@ -4,6 +4,9 @@
 #include <QString>
 #include <QDebug>
 
+#define FIRST_SHIELD Label::Shield::USInterstate
+#define LAST_SHIELD  Label::Shield::Oval
+
 class Label {
 public:
 	class Shield

src/map/IMG/lblfile.cpp

@@ -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);
@@ -53,15 +54,18 @@ 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");
@@ -102,7 +106,8 @@ Label LBLFile::label6b(Handle &hdl, quint32 offset) const
 					else if (c[cpt] == 0x1b)
 						curCharSet = Special;
 					else if (c[cpt] >= 0x2a && c[cpt] <= 0x2f) {
-						shieldType = (Label::Shield::Type)(c[cpt] - 0x29);
+						shieldType = static_cast<Label::Shield::Type>
+						  (c[cpt] - 0x29);
 						bap = &shieldLabel;
 					} else if (bap == &shieldLabel
 					  && NORMAL_CHARS[c[cpt]] == ' ')
@@ -145,7 +150,7 @@ Label LBLFile::label8b(Handle &hdl, quint32 offset) const
 			else
 				bap->append(' ');
 		} else if (c <= 0x07) {
-			shieldType = (Label::Shield::Type)c;
+			shieldType = static_cast<Label::Shield::Type>(c);
 			bap = &shieldLabel;
 		} else if (bap == &shieldLabel && QChar(c).isSpace()) {
 			bap = &label;
@@ -160,14 +165,15 @@ Label LBLFile::label8b(Handle &hdl, quint32 offset) const
 
 Label LBLFile::label(Handle &hdl, quint32 offset, bool poi)
 {
-	if (!_size && !init())
+	if (!_multiplier && !init())
 		return QString();
 
 	quint32 labelOffset;
 	if (poi) {
 		quint32 poiOffset;
-		if (!(seek(hdl, _poiOffset + offset) && readUInt24(hdl, poiOffset)
+		if (!(_poiSize >= offset * _poiMultiplier
-		  && (poiOffset & 0x3FFFFF)))
+		  && seek(hdl, _poiOffset + offset * _poiMultiplier)
+		  && readUInt24(hdl, poiOffset) && (poiOffset & 0x3FFFFF)))
 			return QString();
 		labelOffset = _offset + (poiOffset & 0x3FFFFF) * _multiplier;
 	} else

src/map/IMG/lblfile.h

@@ -10,8 +10,8 @@ class LBLFile : public SubFile
 {
 public:
 	LBLFile(IMG *img, quint32 size)
-	  : SubFile(img, size), _offset(0), _size(0), _poiOffset(0), _poiSize(0),
+	  : SubFile(img, size), _codec(0), _offset(0), _size(0), _poiOffset(0),
-	  _multiplier(0), _encoding(0), _codec(0) {}
+	  _poiSize(0), _poiMultiplier(0), _multiplier(0), _encoding(0) {}
 
 	Label label(Handle &hdl, quint32 offset, bool poi = false);
 
@@ -21,13 +21,14 @@ private:
 	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;
 };
 
 #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 (!_multiplier && !init())
-		if (!(_init = init()))
+		return false;
-			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

@@ -459,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/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

@@ -17,18 +17,18 @@ static void expand(QRect &rect, int width)
 
 TextPointItem::TextPointItem(const QPoint &point, const QString *text,
   const QFont *font, const QImage *img, const QColor *color,
-  const QColor *bgColor) : _text(text), _font(font), _img(img), _color(color),
+  const QColor *bgColor) : _text(font ? text : 0), _font(font), _img(img),
-  _bgColor(bgColor)
+  _color(color), _bgColor(bgColor)
 {
-	if (text) {
+	if (_text) {
-		QFontMetrics fm(*font);
+		QFontMetrics fm(*_font);
-		int limit = font->pixelSize() * MAX_TEXT_WIDTH;
+		int limit = _font->pixelSize() * MAX_TEXT_WIDTH;
-		_textRect = fm.boundingRect(QRect(0, 0, limit, 0), FLAGS, *text);
+		_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)
+		if (_bgColor && _textRect.width() < _font->pixelSize() * MIN_BOX_WIDTH)
-		expand(_textRect, font->pixelSize() * MIN_BOX_WIDTH);
+			expand(_textRect, _font->pixelSize() * MIN_BOX_WIDTH);
+	}
 
 	setPos(point);
 }
@@ -58,41 +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 (_bgColor) {
 			painter->setPen(*_color);
 			painter->setBrush(*_bgColor);
 			painter->drawRect(_textRect);
 			painter->setBrush(Qt::NoBrush);
-		}
-		if (_color) {
 			painter->setFont(*_font);
-			painter->setPen(*_color);
 			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();
+				img.invertPixels();
-			painter->drawImage(_textRect, img);
+				painter->drawImage(_textRect, img);
 #else // QT >= 5.4
-			QImage iimg(img.convertToFormat(QImage::Format_ARGB32));
+				QImage iimg(img.convertToFormat(QImage::Format_ARGB32));
-			iimg.invertPixels();
+				iimg.invertPixels();
-			painter->drawImage(_textRect, iimg);
+				painter->drawImage(_textRect, iimg);
 #endif // QT >= 5.4
+			}
 		}
 	}
 

src/map/IMG/trefile.cpp

@@ -3,12 +3,6 @@
 #include "trefile.h"
 
 
-struct MapLevel {
-	quint8 level;
-	quint8 bits;
-	quint16 subdivs;
-};
-
 static void unlock(quint8 *dst, const quint8 *src, quint32 size, quint32 key)
 {
 	static const unsigned char shuf[] = {
@@ -46,6 +40,12 @@ TREFile::~TREFile()
 bool TREFile::init()
 {
 	Handle hdl;
+	quint8 locked;
+	quint16 hdrLen;
+
+	if (!(seek(hdl, 0) && readUInt16(hdl, hdrLen)
+	  && seek(hdl, 0x0D) && readByte(hdl, locked)))
+		return false;
 
 	// Tile bounds
 	qint32 north, east, south, west;
@@ -55,30 +55,18 @@ bool TREFile::init()
 	_bounds = RectC(Coordinates(toWGS84(west), toWGS84(north)),
 	  Coordinates(toWGS84(east), toWGS84(south)));
 
-	return true;
+	// Levels & subdivs info
-}
+	quint32 levelsOffset, levelsSize, subdivSize;
-
-bool TREFile::load()
-{
-	Handle hdl;
-	quint8 locked;
-	quint16 hdrLen;
-
-	if (!(seek(hdl, 0) && readUInt16(hdl, hdrLen)
-	  && seek(hdl, 0x0D) && readByte(hdl, locked)))
-		return false;
-
-	quint32 levelsOffset, levelsSize, subdivOffset, subdivSize;
 	if (!(seek(hdl, 0x21) && readUInt32(hdl, levelsOffset)
-	  && readUInt32(hdl, levelsSize) && readUInt32(hdl, subdivOffset)
+	  && readUInt32(hdl, levelsSize) && readUInt32(hdl, _subdivOffset)
 	  && readUInt32(hdl, subdivSize)))
 		return false;
 
-	quint32 extOffset, extSize = 0;
+	// TRE7 info
-	quint16 extItemSize = 0;
 	if (hdrLen > 0x9A) {
-		if (!(seek(hdl, 0x7C) && readUInt32(hdl, extOffset)
+		if (!(seek(hdl, 0x7C) && readUInt32(hdl, _extended.offset)
-		  && readUInt32(hdl, extSize) && readUInt16(hdl, extItemSize)))
+		  && readUInt32(hdl, _extended.size)
+		  && readUInt16(hdl, _extended.itemSize)))
 			return false;
 	}
 
@@ -99,96 +87,134 @@ bool TREFile::load()
 	}
 
 	quint32 levelsCount = levelsSize / 4;
-	QVector<MapLevel> ml(levelsCount);
+	_levels = QVector<MapLevel>(levelsCount);
-	QMap<int, int> level2bits;
 
 	for (quint32 i = 0; i < levelsCount; i++) {
 		quint8 *zoom = levels + (i * 4);
-		ml[i].level = *zoom;
+		_levels[i].level = *zoom;
-		ml[i].bits = *(zoom + 1);
+		_levels[i].bits = *(zoom + 1);
-		ml[i].subdivs = *(zoom + 2) | (quint16)(*(zoom + 3)) << 8;
+		_levels[i].subdivs = *(zoom + 2) | (quint16)(*(zoom + 3)) << 8;
-		if ((ml[i].level & 0xF) > 15 || ml[i].bits > 24)
+		if (_levels[i].bits > 24 || !_levels[i].subdivs)
 			return false;
-
-		level2bits.insert(ml[i].level & 0xF, ml[i].bits);
 	}
 
-	// Subdivisions
+	// Get first non-inherited level
-	if (!seek(hdl, subdivOffset))
+	_firstLevel = -1;
-		return false;
+	for (int i = 0; i < _levels.size(); i++) {
-	SubDiv *s = 0;
+		if (!(_levels.at(i).level & 0x80)) {
-	QList<SubDiv*> sl;
+			_firstLevel = i;
-
+			break;
-	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);
 		}
 	}
 
-	// objects with extended types (TRE7)
+	return (_firstLevel >= 0);
-	if (extSize && extItemSize >= 12
+}
-	  && (sl.size() - (int)(extSize/extItemSize) + 1 >= 0)) {
-		quint32 polygons, lines, points;
-		if (!seek(hdl, extOffset))
-			return false;
 
-		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;
+				goto error;
-			if (!seek(hdl, hdl.pos + extItemSize - 12))
+
-				return false;
+			sl.at(i)->setExtOffsets(polygons, lines, points);
-			if (i && sl.at(i-1))
+			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);
 		}
 	}
 
-	_levels = _subdivs.keys();
-
 	return true;
+
+error:
+	qDeleteAll(sl);
+	tree->RemoveAll();
+
+	return false;
 }
 
 void TREFile::clear()
@@ -205,23 +231,22 @@ void TREFile::clear()
 	qDeleteAll(_subdivs);
 
 	_subdivs.clear();
-	_levels.clear();
 }
 
 int TREFile::level(int bits)
 {
-	if (_levels.isEmpty() && !load())
+	int idx = _firstLevel;
-		return -1;
 
-	int l = _levels.first();
+	for (int i = idx + 1; i < _levels.size(); i++) {
-	for (int i = 0; i < _levels.size(); i++) {
+		if (_levels.at(i).bits > bits)
-		if (_levels.at(i) > bits)
 			break;
-		else
+		idx++;
-			l = _levels.at(i);
 	}
 
-	return l;
+	if (!_subdivs.contains(_levels.at(idx).bits) && !load(idx))
+		return -1;
+
+	return _levels.at(idx).bits;
 }
 
 static bool cb(SubDiv *subdiv, void *context)
@@ -247,3 +272,12 @@ QList<SubDiv*> TREFile::subdivs(const RectC &rect, int bits)
 
 	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

@@ -23,17 +23,39 @@ public:
 	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();
+	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;
-	QList<int> _levels;
+	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.h

@@ -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

@@ -18,7 +18,9 @@
 
 #define TILE_SIZE   256
 #define TEXT_EXTENT 256
-#define LINE_TEXT_MIN_ZOOM   22
+
+#define AREA(rect) \
+	(rect.size().width() * rect.size().height())
 
 class RasterTile
 {
@@ -35,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);
 
@@ -53,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);
 	}
@@ -68,11 +73,12 @@ private:
 };
 
 
-static QColor shieldColor(Qt::white);
+static const Range zooms(12, 28);
-static QColor shieldBgColor1("#dd3e3e");
-static QColor shieldBgColor2("#379947");
-static QColor shieldBgColor3("#4a7fc1");
 
+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)
 {
@@ -102,26 +108,47 @@ static int minPOIZoom(Style::POIClass cl)
 	}
 }
 
-static QFont font(int pixelSize)
+static QFont pixelSizeFont(int pixelSize)
 {
 	QFont f;
 	f.setPixelSize(pixelSize);
 	return f;
 }
 
-/* The fonts must be initialized on first usage (after the QGuiApplication
+static QFont *font(Style::FontSize size, Style::FontSize defaultSize
-   instance is created) */
+  = Style::Normal)
-#define FONT(name, size) \
+{
-static const QFont *name() \
+	/* The fonts must be initialized on first usage (after the QGuiApplication
-{ \
+	   instance is created) */
-	static QFont f = font(size); \
+	static QFont large = pixelSizeFont(16);
-	return &f; \
+	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);
+	}
 }
 
-FONT(largeFont, 16)
+static QFont *poiFont(Style::FontSize size = Style::Normal)
-FONT(normalFont, 14)
+{
-FONT(smallFont, 12)
+	static QFont poi = pixelSizeFont(10);
-FONT(poiFont, 10)
+
+	switch (size) {
+		case Style::None:
+			return 0;
+		default:
+			return &poi;
+	}
+}
 
 static const QColor *shieldBgColor(Label::Shield::Type type)
 {
@@ -153,7 +180,7 @@ static int minShieldZoom(Label::Shield::Type type)
 		case Label::Shield::Oval:
 			return 20;
 		default:
-			return INT_MAX;
+			return 0;
 	}
 }
 
@@ -166,9 +193,7 @@ IMGMap::IMGMap(const QString &fileName, QObject *parent)
 		return;
 	}
 
-	_zooms = Range(12, 28);
+	_zoom = zooms.min();
-	_zoom = _zooms.min();
-
 	updateTransform();
 
 	_valid = true;
@@ -196,8 +221,8 @@ int IMGMap::zoomFit(const QSize &size, const RectC &rect)
 	if (rect.isValid()) {
 		RectD pr(rect, _projection, 10);
 
-		_zoom = _zooms.min();
+		_zoom = zooms.min();
-		for (int i = _zooms.min() + 1; i <= _zooms.max(); i++) {
+		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())
@@ -205,7 +230,7 @@ int IMGMap::zoomFit(const QSize &size, const RectC &rect)
 			_zoom = i;
 		}
 	} else
-		_zoom = _zooms.max();
+		_zoom = zooms.max();
 
 	updateTransform();
 
@@ -214,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;
 }
@@ -234,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));
@@ -318,11 +344,9 @@ 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)
 {
-	QRect tileRect(tile, QSize(TILE_SIZE, TILE_SIZE));
-
 	qStableSort(lines);
 
 	for (int i = 0; i < lines.size(); i++) {
@@ -333,86 +357,100 @@ void IMGMap::processLines(QList<IMG::Poly> &lines, const QPoint &tile,
 		}
 	}
 
-	if (_zoom >= LINE_TEXT_MIN_ZOOM) {
+	if (_zoom >= 22)
-		for (int i = 0; i < lines.size(); i++) {
+		processStreetNames(lines, tileRect, textItems);
-			IMG::Poly &poly = lines[i];
+	processShields(lines, tileRect, textItems);
-			const Style::Line &style = _img.style()->line(poly.type);
+}
 
-			if (style.img().isNull() && style.foreground() == Qt::NoPen)
+void IMGMap::processStreetNames(QList<IMG::Poly> &lines, const QRect &tileRect,
-				continue;
+  QList<TextItem*> &textItems)
-			if (poly.label.text().isEmpty()
+{
-			  || style.textFontSize() == Style::None)
+	for (int i = 0; i < lines.size(); i++) {
-				continue;
+		IMG::Poly &poly = lines[i];
+		const Style::Line &style = _img.style()->line(poly.type);
 
-			if (Style::isContourLine(poly.type))
+		if (style.img().isNull() && style.foreground() == Qt::NoPen)
-				poly.label.setText(convertUnits(poly.label.text()));
+			continue;
-
+		if (poly.label.text().isEmpty()
-			const QFont *font;
+		  || style.textFontSize() == Style::None)
-			switch (style.textFontSize()) {
-				case Style::Large:
-					font = largeFont();
-					break;
-				case Style::Normal:
-					font = normalFont();
-					break;
-				default:
-					font = smallFont();
-			}
-			const QColor *color = style.textColor().isValid()
-			  ? &style.textColor() : 0;
-
-			TextPathItem *item = new TextPathItem(poly.points,
-			  &poly.label.text(), tileRect, font, color);
-			if (item->isValid() && !item->collides(textItems))
-				textItems.append(item);
-			else
-				delete item;
-		}
-	}
-
-
-	for (int type = 1; type < 7; type++) {
-		if (minShieldZoom((Label::Shield::Type)type) > _zoom)
 			continue;
 
-		QSet<Label::Shield> shields;
+		if (Style::isContourLine(poly.type))
+			poly.label.setText(convertUnits(poly.label.text()));
+
+		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.text(), tileRect, fnt, color);
+		if (item->isValid() && !item->collides(textItems))
+			textItems.append(item);
+		else
+			delete item;
+	}
+}
+
+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.type() != type || !Style::isMajorRoad(poly.type))
+			if (!shield.isValid() || shield.type() != type
+			  || !Style::isMajorRoad(poly.type))
 				continue;
 
-			if (poly.label.shield().isValid() && !shields.contains(shield)) {
+			QPolygonF &p = shields[shield];
-				bool valid = false;
+			for (int j = 0; j < poly.points.size(); j++)
-				int idx = poly.points.size()/2, inc = 0, sign = 1;
+				p.append(poly.points.at(j));
 
-				TextPointItem *item = new TextPointItem(
+			sp.insert(shield, &shield);
-				  poly.points.at(idx).toPoint(), &shield.text(), poiFont(),
+		}
-				  0, &shieldColor, shieldBgColor(shield.type()));
 
-				while (1) {
+		for (QHash<Label::Shield, QPolygonF>::const_iterator it
-					if (!item->collides(textItems)
+		  = shields.constBegin(); it != shields.constEnd(); ++it) {
-					  && tileRect.contains(item->boundingRect().toRect())) {
+			const QPolygonF &p = it.value();
-						valid = true;
+			QRectF rect(p.boundingRect() & tileRect);
-						break;
+			if (qSqrt(AREA(rect)) < 32)
-					}
+				continue;
-					inc++;
-					sign = (sign < 0) ? 1 : -1;
-					idx += inc * sign;
 
-					if (!(idx >= 0 && idx < poly.points.size()))
+			QMap<qreal, int> map;
-						break;
+			QPointF center = rect.center();
-
+			for (int j = 0; j < p.size(); j++) {
-					item->setPos(poly.points.at(idx).toPoint());
+				QLineF l(p.at(j), center);
-				}
+				map.insert(l.length(), j);
-
-				if (valid) {
-					textItems.append(item);
-					shields.insert(shield);
-				} else
-					delete item;
 			}
+
+			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;
 		}
 	}
 }
@@ -424,7 +462,6 @@ 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);
 
 		if (point.poi && _zoom < minPOIZoom(Style::poiClass(point.type)))
@@ -433,31 +470,12 @@ void IMGMap::processPoints(QList<IMG::Point> &points,
 		const QString *label = point.label.text().isEmpty()
 		  ? 0 : &(point.label.text());
 		const QImage *img = style.img().isNull() ? 0 : &style.img();
-		const QFont *font = 0;
+		const QFont *fnt = point.poi
-		if (point.poi) {
+		  ? poiFont(style.textFontSize()) : font(style.textFontSize());
-			if (style.textFontSize() == Style::None)
-				label = 0;
-			else
-				font = poiFont();
-		} else {
-			switch (style.textFontSize()) {
-				case Style::None:
-					label = 0;
-					break;
-				case Style::Small:
-					font = smallFont();
-					break;
-				case Style::Large:
-					font = largeFont();
-					break;
-				default:
-					font = normalFont();
-			}
-		}
 		const QColor *color = style.textColor().isValid()
 		  ? &style.textColor() : 0;
 
-		if (!label && !img)
+		if ((!label || !fnt) && !img)
 			continue;
 
 		if (Style::isSpot(point.type))
@@ -469,7 +487,7 @@ void IMGMap::processPoints(QList<IMG::Point> &points,
 		}
 
 		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
@@ -479,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)

src/map/imgmap.h

@@ -50,13 +50,16 @@ private:
 	void drawTextItems(QPainter *painter, const QList<TextItem*> &textItems);
 
 	void processPolygons(QList<IMG::Poly> &polygons);
-	void processLines(QList<IMG::Poly> &lines, const QPoint &tile,
+	void processLines(QList<IMG::Poly> &lines, const QRect &tileRect,
 	  QList<TextItem*> &textItems);
 	void processPoints(QList<IMG::Point> &points, QList<TextItem*> &textItems);
+	void processShields(QList<IMG::Poly> &lines, const QRect &tileRect,
+	  QList<TextItem*> &textItems);
+	void processStreetNames(QList<IMG::Poly> &lines, const QRect &tileRect,
+	  QList<TextItem*> &textItems);
 
 	IMG _img;
 	int _zoom;
-	Range _zooms;
 	Projection _projection;
 	Transform _transform;
 

src/map/jnxmap.cpp

@@ -34,10 +34,7 @@ template<class T> bool JNXMap::readValue(T &val)
 	if (_file.read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
 		return false;
 
-	if (sizeof(T) > 1)
+	val = qFromLittleEndian(data);
-		val = qFromLittleEndian(data);
-	else
-		val = data;
 
 	return true;
 }

src/map/mapsource.cpp

@@ -196,8 +196,8 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
 			if (!attr.hasAttribute("id"))
 				reader.raiseError("Missing dimension id");
 			else
-				config.dimensions.append(KV(attr.value("id").toString(),
+				config.dimensions.append(KV<QString, QString>
-				  reader.readElementText()));
+				  (attr.value("id").toString(), reader.readElementText()));
 		} else if (reader.name() == "crs") {
 			config.coordinateSystem = coordinateSystem(reader);
 			config.crs = reader.readElementText();

src/map/mapsource.h

@@ -38,7 +38,7 @@ private:
 		QString crs;
 		CoordinateSystem coordinateSystem;
 		bool rest;
-		QList<KV> dimensions;
+		QList<KV<QString, QString> > dimensions;
 		Authorization authorization;
 		qreal tileRatio;
 		int tileSize;

src/map/matrix.cpp

@@ -37,21 +37,23 @@ Matrix::Matrix(const Matrix& M)
 
 Matrix &Matrix::operator=(const Matrix &M)
 {
-	if (_h != M._h || _w != M._w) {
+	if (this != &M) {
-		if (!isNull())
+		if (_h != M._h || _w != M._w) {
-			delete[] _m;
+			if (!isNull())
+				delete[] _m;
 
-		_h = M._h; _w = M._w;
+			_h = M._h; _w = M._w;
-		if (isNull())
+			if (isNull())
-			_m = 0;
+				_m = 0;
-		else
+			else
-			_m = new double[_h * _w];
+				_m = new double[_h * _w];
+		}
+
+		for (size_t i = 0; i < _h; i++)
+			for (size_t j = 0; j < _w; j++)
+				m(i,j) = M.m(i,j);
 	}
 
-	for (size_t i = 0; i < _h; i++)
-		for (size_t j = 0; j < _w; j++)
-			m(i,j) = M.m(i,j);
-
 	return *this;
 }
 

src/map/ozf.cpp

@@ -32,10 +32,7 @@ template<class T> bool OZF::readValue(T &val)
 	if (_decrypt)
 		decrypt(&data, sizeof(T), _key);
 
-	if (sizeof(T) > 1)
+	val = qFromLittleEndian(data);
-		val = qFromLittleEndian(data);
-	else
-		val = data;
 
 	return true;
 }

src/map/pcs.cpp

@@ -223,12 +223,12 @@ void PCS::loadList(const QString &path)
 	}
 }
 
-QList<PCS::Info> PCS::pcsList()
+QList<KV<int, QString> > PCS::list()
 {
-	QList<Info> list;
+	QList<KV<int, QString> > list;
 
 	for (int i = 0; i < _pcss.size(); i++)
-		list.append(Info(_pcss.at(i).id(), _pcss.at(i).name()));
+		list.append(KV<int, QString>(_pcss.at(i).id(), _pcss.at(i).name()));
 
 	return list;
 }

src/map/pcs.h

@@ -3,6 +3,7 @@
 
 #include <QDebug>
 #include <QList>
+#include "common/kv.h"
 #include "gcs.h"
 #include "linearunits.h"
 #include "coordinatesystem.h"
@@ -11,20 +12,6 @@
 class PCS
 {
 public:
-	class Info {
-	public:
-		Info(int id, const QString &name) : _id(id), _name(name) {}
-
-		int id() const {return _id;}
-		const QString &name() const {return _name;}
-
-		bool operator<(const Info &other) const {return _id < other._id;}
-
-	private:
-		int _id;
-		QString _name;
-	};
-
 	PCS() : _gcs(0) {}
 	PCS(const GCS *gcs, const Projection::Method &method,
 	  const Projection::Setup &setup, const LinearUnits &units,
@@ -48,7 +35,7 @@ public:
 	static void loadList(const QString &path);
 	static const PCS *pcs(int id);
 	static const PCS *pcs(const GCS *gcs, int proj);
-	static QList<Info> pcsList();
+	static QList<KV<int, QString> > list();
 
 private:
 	class Entry;

src/map/projection.cpp

@@ -128,13 +128,15 @@ Projection::~Projection()
 
 Projection &Projection::operator=(const Projection &p)
 {
-	delete _ct;
+	if (this != &p) {
+		delete _ct;
 
-	_gcs = p._gcs;
+		_gcs = p._gcs;
-	_units = p._units;
+		_units = p._units;
-	_ct = p._ct ? p._ct->clone() : 0;
+		_ct = p._ct ? p._ct->clone() : 0;
-	_geographic = p._geographic;
+		_geographic = p._geographic;
-	_cs = p._cs;
+		_cs = p._cs;
+	}
 
 	return *this;
 }

src/map/wms.h

@@ -20,7 +20,7 @@ public:
 	public:
 		Setup(const QString &url, const QString &layer, const QString &style,
 		  const QString &format, const QString &crs, const CoordinateSystem &cs,
-		  const QList<KV> &dimensions,
+		  const QList<KV<QString, QString> > &dimensions,
 		  const Authorization &authorization = Authorization())
 			: _url(url), _layer(layer), _style(style), _format(format),
 			  _crs(crs), _cs(cs), _dimensions(dimensions),
@@ -33,7 +33,8 @@ public:
 		const QString &format() const {return _format;}
 		const QString &crs() const {return _crs;}
 		const CoordinateSystem &coordinateSystem() const {return _cs;}
-		const QList<KV> &dimensions() const {return _dimensions;}
+		const QList<KV<QString, QString> > &dimensions() const
+		  {return _dimensions;}
 
 	private:
 		QString _url;
@@ -42,7 +43,7 @@ public:
 		QString _format;
 		QString _crs;
 		CoordinateSystem _cs;
-		QList<KV> _dimensions;
+		QList<KV<QString, QString> > _dimensions;
 		Authorization _authorization;
 	};
 

src/map/wmsmap.cpp

@@ -34,7 +34,7 @@ QString WMSMap::tileUrl(const QString &version) const
 		url.append(QString("&SRS=%1").arg(_setup.crs()));
 
 	for (int i = 0; i < _setup.dimensions().size(); i++) {
-		const KV &dim = _setup.dimensions().at(i);
+		const KV<QString, QString> &dim = _setup.dimensions().at(i);
 		url.append(QString("&%1=%2").arg(dim.key(), dim.value()));
 	}
 

src/map/wmts.cpp

@@ -335,7 +335,7 @@ WMTS::WMTS(const QString &file, const WMTS::Setup &setup) : _valid(false)
 		  setup.url().contains('?') ? "&" : "?" , setup.format(),
 		  setup.layer(), style, setup.set());
 		for (int i = 0; i < setup.dimensions().size(); i++) {
-			const KV &dim = setup.dimensions().at(i);
+			const KV<QString, QString> &dim = setup.dimensions().at(i);
 			_tileUrl.append(QString("&%1=%2").arg(dim.key(), dim.value()));
 		}
 	} else {
@@ -345,7 +345,7 @@ WMTS::WMTS(const QString &file, const WMTS::Setup &setup) : _valid(false)
 		_tileUrl.replace("{TileRow}", "$y", Qt::CaseInsensitive);
 		_tileUrl.replace("{TileCol}", "$x", Qt::CaseInsensitive);
 		for (int i = 0; i < setup.dimensions().size(); i++) {
-			const KV &dim = setup.dimensions().at(i);
+			const KV<QString, QString> &dim = setup.dimensions().at(i);
 			_tileUrl.replace(QString("{%1}").arg(dim.key()), dim.value(),
 			  Qt::CaseInsensitive);
 		}

src/map/wmts.h

@@ -22,7 +22,8 @@ public:
 	public:
 		Setup(const QString &url, const QString &layer, const QString &set,
 		  const QString &style, const QString &format, bool rest,
-		  const CoordinateSystem &cs, const QList<KV> &dimensions,
+		  const CoordinateSystem &cs,
+		  const QList<KV<QString, QString> > &dimensions,
 		  const Authorization &authorization = Authorization())
 			: _url(url), _layer(layer), _set(set), _style(style),
 			  _format(format), _rest(rest), _cs(cs), _dimensions(dimensions),
@@ -36,7 +37,8 @@ public:
 		const QString &format() const {return _format;}
 		bool rest() const {return _rest;}
 		const CoordinateSystem &coordinateSystem() const {return _cs;}
-		const QList<KV> &dimensions() const {return _dimensions;}
+		const QList<KV<QString, QString> > &dimensions() const
+		  {return _dimensions;}
 
 	private:
 		QString _url;
@@ -46,7 +48,7 @@ public:
 		QString _format;
 		bool _rest;
 		CoordinateSystem _cs;
-		QList<KV> _dimensions;
+		QList<KV<QString, QString> > _dimensions;
 		Authorization _authorization;
 	};