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.8.{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

README.md

@@ -3,7 +3,7 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G
 
 ## Features
 * Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin CSV and geotagged JPEG files.
-* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS).
+* 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.
 * Support for DEM files (SRTM HGT).

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.8
+VERSION = 7.12
 
 QT += core \
     gui \
@@ -179,7 +179,11 @@ HEADERS += src/common/config.h \
     src/map/IMG/style.h \
     src/map/IMG/netfile.h \
     src/GUI/limitedcombobox.h \
-    src/GUI/pathtickitem.h
+    src/GUI/pathtickitem.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 \
@@ -309,14 +313,18 @@ SOURCES += src/main.cpp \
     src/map/IMG/vectortile.cpp \
     src/map/IMG/style.cpp \
     src/map/IMG/netfile.cpp \
-    src/GUI/pathtickitem.cpp
+    src/GUI/pathtickitem.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
@@ -367,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
 }
 
@@ -384,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
 }

gpxsee.qrc

@@ -1,5 +1,6 @@
 <RCC>
 	<qresource prefix="/">
+		<!-- GUI -->
 		<file alias="gpxsee.png">icons/gpxsee.png</file>
 		<file alias="gpxsee@2x.png">icons/gpxsee@2x.png</file>
 		<file alias="dialog-close.png">icons/GUI/dialog-close.png</file>
@@ -42,5 +43,83 @@
 		<file alias="view-filter@2x.png">icons/GUI/view-filter@2x.png</file>
 		<file alias="applications-internet_32.png">icons/GUI/applications-internet_32.png</file>
 		<file alias="applications-internet_32@2x.png">icons/GUI/applications-internet_32@2x.png</file>
+
+		<!-- POI -->
+		<file alias="airfield-11.png">icons/POI/airfield-11.png</file>
+		<file alias="airport-11.png">icons/POI/airport-11.png</file>
+		<file alias="amusement-park-11.png">icons/POI/amusement-park-11.png</file>
+		<file alias="bakery-11.png">icons/POI/bakery-11.png</file>
+		<file alias="bank-11.png">icons/POI/bank-11.png</file>
+		<file alias="bar-11.png">icons/POI/bar-11.png</file>
+		<file alias="bbq-11.png">icons/POI/bbq-11.png</file>
+		<file alias="beach-11.png">icons/POI/beach-11.png</file>
+		<file alias="bowling-alley-11.png">icons/POI/bowling-alley-11.png</file>
+		<file alias="building-alt1-11.png">icons/POI/building-alt1-11.png</file>
+		<file alias="bridge-11.png">icons/POI/bridge-11.png</file>
+		<file alias="bus-11.png">icons/POI/bus-11.png</file>
+		<file alias="cafe-11.png">icons/POI/cafe-11.png</file>
+		<file alias="campsite-11.png">icons/POI/campsite-11.png</file>
+		<file alias="car-11.png">icons/POI/car-11.png</file>
+		<file alias="car-rental-11.png">icons/POI/car-rental-11.png</file>
+		<file alias="car-repair-11.png">icons/POI/car-repair-11.png</file>
+		<file alias="casino-11.png">icons/POI/casino-11.png</file>
+		<file alias="cemetery-11.png">icons/POI/cemetery-11.png</file>
+		<file alias="cinema-11.png">icons/POI/cinema-11.png</file>
+		<file alias="clothing-store-11.png">icons/POI/clothing-store-11.png</file>
+		<file alias="communications-tower-11.png">icons/POI/communications-tower-11.png</file>
+		<file alias="dam-11.png">icons/POI/dam-11.png</file>
+		<file alias="danger-11.png">icons/POI/danger-11.png</file>
+		<file alias="drinking-water-11.png">icons/POI/drinking-water-11.png</file>
+		<file alias="fast-food-11.png">icons/POI/fast-food-11.png</file>
+		<file alias="fire-station-11.png">icons/POI/fire-station-11.png</file>
+		<file alias="fitness-centre-11.png">icons/POI/fitness-centre-11.png</file>
+		<file alias="fuel-11.png">icons/POI/fuel-11.png</file>
+		<file alias="furniture-11.png">icons/POI/furniture-11.png</file>
+		<file alias="garden-11.png">icons/POI/garden-11.png</file>
+		<file alias="garden-centre-11.png">icons/POI/garden-centre-11.png</file>
+		<file alias="golf-11.png">icons/POI/golf-11.png</file>
+		<file alias="grocery-11.png">icons/POI/grocery-11.png</file>
+		<file alias="hairdresser-11.png">icons/POI/hairdresser-11.png</file>
+		<file alias="harbor-11.png">icons/POI/harbor-11.png</file>
+		<file alias="hardware-11.png">icons/POI/hardware-11.png</file>
+		<file alias="heliport-11.png">icons/POI/heliport-11.png</file>
+		<file alias="hospital-11.png">icons/POI/hospital-11.png</file>
+		<file alias="information-11.png">icons/POI/information-11.png</file>
+		<file alias="landmark-11.png">icons/POI/landmark-11.png</file>
+		<file alias="library-11.png">icons/POI/library-11.png</file>
+		<file alias="lodging-11.png">icons/POI/lodging-11.png</file>
+		<file alias="mountain-11.png">icons/POI/mountain-11.png</file>
+		<file alias="museum-11.png">icons/POI/museum-11.png</file>
+		<file alias="park-11.png">icons/POI/park-11.png</file>
+		<file alias="parking-11.png">icons/POI/parking-11.png</file>
+		<file alias="pharmacy-11.png">icons/POI/pharmacy-11.png</file>
+		<file alias="picnic-site-11.png">icons/POI/picnic-site-11.png</file>
+		<file alias="place-of-worship-11.png">icons/POI/place-of-worship-11.png</file>
+		<file alias="police-11.png">icons/POI/police-11.png</file>
+		<file alias="post-11.png">icons/POI/post-11.png</file>
+		<file alias="prison-11.png">icons/POI/prison-11.png</file>
+		<file alias="religious-christian-11.png">icons/POI/religious-christian-11.png</file>
+		<file alias="religious-jewish-11.png">icons/POI/religious-jewish-11.png</file>
+		<file alias="religious-muslim-11.png">icons/POI/religious-muslim-11.png</file>
+		<file alias="restaurant-11.png">icons/POI/restaurant-11.png</file>
+		<file alias="restaurant-noodle-11.png">icons/POI/restaurant-noodle-11.png</file>
+		<file alias="restaurant-pizza-11.png">icons/POI/restaurant-pizza-11.png</file>
+		<file alias="restaurant-seafood-11.png">icons/POI/restaurant-seafood-11.png</file>
+		<file alias="roadblock-11.png">icons/POI/roadblock-11.png</file>
+		<file alias="school-11.png">icons/POI/school-11.png</file>
+		<file alias="shelter-11.png">icons/POI/shelter-11.png</file>
+		<file alias="shop-11.png">icons/POI/shop-11.png</file>
+		<file alias="skiing-11.png">icons/POI/skiing-11.png</file>
+		<file alias="soccer-11.png">icons/POI/soccer-11.png</file>
+		<file alias="swimming-11.png">icons/POI/swimming-11.png</file>
+		<file alias="theatre-11.png">icons/POI/theatre-11.png</file>
+		<file alias="telephone-11.png">icons/POI/telephone-11.png</file>
+		<file alias="toilet-11.png">icons/POI/toilet-11.png</file>
+		<file alias="town-hall-11.png">icons/POI/town-hall-11.png</file>
+		<file alias="viewpoint-11.png">icons/POI/viewpoint-11.png</file>
+		<file alias="village-11.png">icons/POI/village-11.png</file>
+		<file alias="waterfall-11.png">icons/POI/waterfall-11.png</file>
+		<file alias="wetland-11.png">icons/POI/wetland-11.png</file>
+		<file alias="zoo-11.png">icons/POI/zoo-11.png</file>
 	</qresource>
 </RCC>

icons/POI/licence.txt

@@ -0,0 +1,126 @@
+The POI icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
+licensed under CC0.
+
+-----
+
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

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"/>
@@ -479,7 +479,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>km/mi markers</source>
-        <translation type="unfinished"></translation>
+        <translation>Bornes kilométriques ou milliaires</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="359"/>
@@ -606,7 +606,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="670"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
-        <translation>GPXSee est distribué selon les termes de la licence publique générale GNU (version 3). Pour plus d&apos;information sur GPXSee, visiter le site du projet sur %1.</translation>
+        <translation>GPXSee est distribué selon les termes de la licence publique générale GNU (version 3). Pour plus d&apos;information sur GPXSee, visiter le site du projet %1.</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="697"/>
@@ -666,7 +666,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="733"/>
         <source>Styles directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dossier de styles :</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="1037"/>
@@ -1017,7 +1017,7 @@
     <message>
         <location filename="../src/map/maplist.cpp" line="123"/>
         <source>Garmin IMG maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartes Garmin IMG</translation>
     </message>
     <message>
         <location filename="../src/map/maplist.cpp" line="125"/>
@@ -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"/>
@@ -1349,12 +1349,12 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="72"/>
         <source>Projection:</source>
-        <translation type="unfinished"></translation>
+        <translation>Projection :</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="94"/>
         <source>Vector maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartes vectorielles</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="147"/>

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.8"
+!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 "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.8"
+!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 "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/graphview.cpp

@@ -75,8 +75,7 @@ GraphView::~GraphView()
 	delete _grid;
 	delete _message;
 
-	for (int i = 0; i < _graphs.count(); i++)
-		delete _graphs[i];
+	qDeleteAll(_graphs);
 }
 
 void GraphView::createXLabel()
@@ -380,9 +379,7 @@ void GraphView::clear()
 	_slider->clear();
 	_info->clear();
 
-	for (int i = 0; i < _graphs.count(); i++)
-		delete _graphs[i];
-
+	qDeleteAll(_graphs);
 	_graphs.clear();
 	_visible.clear();
 	_palette.reset();

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

@@ -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>");
 		}
@@ -2216,6 +2215,8 @@ void GUI::show()
 	connect(w, SIGNAL(screenChanged(QScreen*)), this,
 	  SLOT(screenChanged(QScreen*)));
 #endif // ENABLE_HIDPI
+
+	_mapView->fitContentToSize();
 }
 
 void GUI::screenChanged(QScreen *screen)

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

@@ -39,6 +39,7 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	setRenderHint(QPainter::Antialiasing, true);
+	setResizeAnchor(QGraphicsView::AnchorViewCenter);
 	setAcceptDrops(false);
 
 	_mapScale = new ScaleItem();
@@ -254,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();
@@ -287,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();
@@ -338,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();
 
@@ -363,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)
@@ -425,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);
 }
 
@@ -444,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);
 }
 
@@ -460,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));
@@ -478,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);
@@ -746,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();
@@ -757,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();
@@ -851,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);
 }
 
@@ -901,17 +898,6 @@ void MapView::drawBackground(QPainter *painter, const QRectF &rect)
 	}
 }
 
-void MapView::resizeEvent(QResizeEvent *event)
-{
-	QGraphicsView::resizeEvent(event);
-
-	int zoom = _map->zoom();
-	if (fitMapZoom() != zoom)
-		rescale();
-
-	centerOn(contentCenter());
-}
-
 void MapView::paintEvent(QPaintEvent *event)
 {
 	QPointF scaleScenePos = mapToScene(rect().bottomRight() + QPoint(
@@ -1013,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();
 
@@ -1031,14 +1017,27 @@ 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));
 }
+
+void MapView::fitContentToSize()
+{
+	int zoom = _map->zoom();
+	if (fitMapZoom() != zoom)
+		rescale();
+
+	centerOn(contentCenter());
+}