Be more tolerant to broken TYP files

Where possible, only skip the point/line/polygon entry, not the whole TYP file.
Explicitly marking the basemaps is not required
2025-07-24 23:44:25 +02:00 · 2022-04-24 17:19:26 +02:00 · 2022-04-24 09:17:28 +02:00 · 2022-04-22 22:26:47 +02:00 · 2022-04-20 19:40:44 +02:00 · 2022-04-19 22:19:44 +02:00
219 changed files with 11057 additions and 8083 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 9.9.{build}
+version: 10.7.{build}

 configuration:
  - Release
@ -8,31 +8,16 @@ image:

 environment:
  NSISDIR: C:\Program Files (x86)\NSIS
+  OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
  matrix:
-  - QTDIR: C:\Qt\5.15\msvc2019
-    NSI: gpxsee.nsi
-    VCVARS: vcvars32.bat
-    OPENSSLDIR: C:\OpenSSL-v111-Win32\bin
-    LIBCRYPTO: libssl-1_1.dll
-    LIBSSL: libcrypto-1_1.dll
  - QTDIR: C:\Qt\5.15\msvc2019_64
-    NSI: gpxsee64.nsi
-    VCVARS: vcvars64.bat
-    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
-    LIBCRYPTO: libssl-1_1-x64.dll
-    LIBSSL: libcrypto-1_1-x64.dll
-  - QTDIR: C:\Qt\6.0\msvc2019_64
-    NSI: gpxsee64.nsi
-    VCVARS: vcvars64.bat
-    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
-    LIBCRYPTO: libssl-1_1-x64.dll
-    LIBSSL: libcrypto-1_1-x64.dll
+  - QTDIR: C:\Qt\6.2\msvc2019_64
    NSISDEF: /DQT6

 install:
 - cmd: |-
    set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
-    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\"%VCVARS%
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat

 build_script:
 - cmd: |-
@ -43,17 +28,16 @@ build_script:
    md installer
    copy release\GPXSee.exe installer
    windeployqt --release installer\GPXSee.exe
-    copy pkg\%NSI% installer
-    copy pkg\macros.nsh installer
+    copy pkg\gpxsee64.nsi installer
    xcopy pkg\csv installer\csv /i
    xcopy pkg\maps installer\maps /i
    xcopy lang\*.qm installer\translations\ /sy
    xcopy icons\symbols installer\symbols /i
    copy licence.txt installer
-    copy %OPENSSLDIR%\%LIBCRYPTO% installer
-    copy %OPENSSLDIR%\%LIBSSL% installer
+    copy %OPENSSLDIR%\libcrypto-1_1-x64.dll installer
+    copy %OPENSSLDIR%\libssl-1_1-x64.dll installer

-    makensis.exe %NSISDEF% installer\%NSI%
+    makensis.exe %NSISDEF% installer\gpxsee64.nsi

 artifacts:
 - path: installer\GPXSee-*.exe
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -0,0 +1,24 @@
+name: Linux
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: GPXSee
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev
+      - name: Create localization
+        run: lrelease gpxsee.pro
+      - name: Configure build
+        run: qmake gpxsee.pro
+      - name: Build project
+        run: make -j2
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@ -0,0 +1,55 @@
+name: OS X
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  qt5:
+    name: GPXSee Qt5 build
+    runs-on: macos-10.15
+    steps:
+      - name: Set environment variables
+        run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: brew install qt5
+      - name: Create localization
+        run: lrelease gpxsee.pro
+      - name: Configure build
+        run: qmake gpxsee.pro
+      - name: Build project
+        run: make -j3
+      - name: Create DMG
+        run: macdeployqt GPXSee.app -dmg
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: GPXSee-qt5.dmg
+          path: GPXSee.dmg
+
+  qt6:
+    name: GPXSee Qt6 build
+    runs-on: macos-latest
+    steps:
+      - name: Set environment variables
+        run: echo "PATH=/usr/local/opt/qt@6/bin:$PATH" >> $GITHUB_ENV
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: brew install qt6
+      - name: Create localization
+        run: lrelease gpxsee.pro
+      - name: Configure build
+        run: qmake gpxsee.pro
+      - name: Build project
+        run: make -j3
+      - name: Create DMG
+        run: macdeployqt GPXSee.app -dmg
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: GPXSee-qt6.dmg
+          path: GPXSee.dmg
--- a/.travis.yml
+++ b/.travis.yml
@ -1,32 +0,0 @@
-language: c++
-
-os:
-  - linux
-  - osx
-
-dist: focal
-osx_image: xcode12.5
-
-cache:
-  directories:
-    - $HOME/Library/Caches/Homebrew
-
-before_cache:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cleanup; fi
-
-addons:
-  homebrew:
-    packages:
-    - qt
-  apt:
-    packages:
-    - qtbase5-dev
-    - qtbase5-private-dev
-    - libqt5opengl5-dev
-    - qttools5-dev-tools
-
-script:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi
-  - lrelease gpxsee.pro
-  - qmake gpxsee.pro
-  - make
--- a/README.md
+++ b/README.md
@ -1,25 +1,35 @@
 # GPXSee
-GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats.
+GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common
+GPS log file formats.

 ## Features
-* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV, TomTom OV2&ITN, ONmove OMD/GHP and geotagged JPEG files.
-* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles).
-* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts, KMZ maps, AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps, Mapsforge vector maps, ESRI World-File georeferenced images).
-* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
+* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON,
+  OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV, TomTom OV2&ITN, ONmove OMD/GHP,
+  TwoNav (TRK, RTE, WPT) and geotagged JPEG files.
+* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS,
+  QuadTiles).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
+  Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts, KMZ maps,
+  AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps, Mapsforge vector maps,
+  QCT maps, ESRI World-File georeferenced images).
+* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts
+  graphs.
 * Support for DEM files (SRTM HGT).
 * Support for multiple tracks in one view.
 * Support for POI files.
 * Print/export to PDF/PNG.
 * Full-screen mode.
 * HiDPI/Retina displays & maps support.
+* Real-time GPS position.
 * Native GUI for Windows, Mac OS X and Linux.

 ![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)

 ## Build
 Build requirements:
-* Qt5 >= 5.11 or Qt 6.x
-* C++11 or newer compiler (tested: msvc2017, gcc 7.5.0, clang/Apple LLVM version 10.0.0)
+* Qt5 >= 5.11 or Qt 6.x*
+* C++11 or newer compiler (tested: msvc2017, gcc 7.5.0, clang/Apple LLVM version
+  10.0.0)

 Build steps:
 ```shell
@ -28,6 +38,9 @@ qmake gpxsee.pro
 make # nmake on windows
 ```

+_* Qt6 builds do not support other encodings than UTF-X and iso8859-1 in XML
+files as support for such files was dropped in Qt6._
+
 ## Download
 * [Windows & OS X builds](http://sourceforge.net/projects/gpxsee)
 * [Linux packages](http://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee)
@ -42,18 +55,22 @@ make # nmake on windows
 [GPXSee maps repository](https://github.com/tumic0/GPXSee-maps)

 ## Translations
-GPXSee uses [Weblate](https://hosted.weblate.org/projects/gpxsee/translations/) for translations.
+GPXSee uses [Weblate](https://hosted.weblate.org/projects/gpxsee/translations/)
+for translations.

 ## License
-GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using different, GPL compatible,
-licenses:
+GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using
+different, GPL compatible, licenses:
+
 * [Oxygen icons](icons/GUI) - LGPLv3
-* [Mapbox Maki icons](icons/IMG) - CC0
+* [Mapbox Maki icons](icons/IMG/POI) - CC0
 * [Map Icons Collection](icons/symbols) - CC BY SA 3.0
 * [RTree implementation](src/common/rtree.h) - Public domain
-* [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp), [LCC](src/map/proj/lambertconic.cpp),
-  [Mercator](src/map/proj/mercator.cpp), [Polar Stereographic](src/map/proj/polarstereographic.cpp),
-  [Polyconic](src/map/proj/polyconic.cpp) and [Transverse Mercator](src/map/proj/transversemercator.cpp)
-  projections - NIMA Source Code Disclaimer
+* [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp),
+  [LCC](src/map/proj/lambertconic.cpp), [Mercator](src/map/proj/mercator.cpp),
+  [Polar Stereographic](src/map/proj/polarstereographic.cpp),
+  [Polyconic](src/map/proj/polyconic.cpp) and
+  [Transverse Mercator](src/map/proj/transversemercator.cpp) projections - NIMA
+  Source Code Disclaimer
 * [Projection parameters CSV files](pkg/csv) - BSD/EPSG/Public domain
 * [Mapsforge render theme](data/default.xml) and its [icons](icons/mapsforge) - LGPLv3
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx {
 } else {
    TARGET = GPXSee
 }
-VERSION = 9.9
+VERSION = 10.7

 QT += core \
    gui \
@ -12,12 +12,19 @@ QT += core \
    sql \
    concurrent \
    widgets \
-    printsupport
-greaterThan(QT_MAJOR_VERSION, 5) {QT += openglwidgets}
+    printsupport \
+    positioning
+greaterThan(QT_MAJOR_VERSION, 5) {
+    QT += openglwidgets \
+          core5compat
+}

 CONFIG += object_parallel_to_source
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
+    src/GUI/crosshairitem.h \
+    src/GUI/motioninfoitem.h \
+    src/GUI/pluginparameters.h \
    src/common/garmin.h \
    src/common/coordinates.h \
    src/common/range.h \
@ -105,6 +112,8 @@ HEADERS += src/common/config.h \
    src/GUI/pngexportdialog.h \
    src/GUI/timezoneinfo.h \
    src/GUI/passwordedit.h \
+    src/data/twonavparser.h \
+    src/map/IMG/section.h \
    src/map/proj/polyconic.h \
    src/map/proj/webmercator.h \
    src/map/proj/transversemercator.h \
@ -143,6 +152,7 @@ HEADERS += src/common/config.h \
    src/map/mapsforge/mapdata.h \
    src/map/mapsforge/rastertile.h \
    src/map/mapsforge/subfile.h \
+    src/map/qctmap.h \
    src/map/textpathitem.h \
    src/map/textpointitem.h \
    src/map/prjfile.h \
@ -234,6 +244,9 @@ HEADERS += src/common/config.h \
    src/data/geojsonparser.h

 SOURCES += src/main.cpp \
+    src/GUI/crosshairitem.cpp \
+    src/GUI/motioninfoitem.cpp \
+    src/GUI/pluginparameters.cpp \
    src/common/coordinates.cpp \
    src/common/rectc.cpp \
    src/common/range.cpp \
@ -301,6 +314,7 @@ SOURCES += src/main.cpp \
    src/GUI/pngexportdialog.cpp \
    src/GUI/projectioncombobox.cpp \
    src/GUI/passwordedit.cpp \
+    src/data/twonavparser.cpp \
    src/map/proj/polyconic.cpp \
    src/map/proj/webmercator.cpp \
    src/map/proj/transversemercator.cpp \
@ -336,6 +350,7 @@ SOURCES += src/main.cpp \
    src/map/mapsforge/subfile.cpp \
    src/map/imgmap.cpp \
    src/map/prjfile.cpp \
+    src/map/qctmap.cpp \
    src/map/textpathitem.cpp \
    src/map/textpointitem.cpp \
    src/map/bsbmap.cpp \
@ -482,7 +497,9 @@ win32 {
        icons/formats/itn.ico \
        icons/formats/wld.ico \
        icons/formats/omd.ico \
-        icons/formats/ghp.ico
+        icons/formats/ghp.ico \
+        icons/formats/qct.ico \
+        icons/formats/trk.ico
    DEFINES += _USE_MATH_DEFINES \
        NOGDI
 }
@ -498,7 +515,7 @@ unix:!macx {
    symbols.path = $$PREFIX/share/gpxsee/symbols
    locale.files = $$files(lang/*.qm)
    locale.path = $$PREFIX/share/gpxsee/translations
-    icon.files = $files(icons/app/hicolor/*)
+    icon.files = $$files(icons/app/hicolor/*)
    icon.path = $$PREFIX/share/icons/hicolor
    desktop.files = pkg/gpxsee.desktop
    desktop.path = $$PREFIX/share/applications
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -49,87 +49,117 @@
 		<file alias="document-decrypt@2x.png">icons/GUI/document-decrypt.png</file>
 		<file alias="document-encrypt.png">icons/GUI/document-encrypt.png</file>
 		<file alias="document-encrypt@2x.png">icons/GUI/document-encrypt.png</file>
+		<file alias="transform-move.png">icons/GUI/transform-move.png</file>
+		<file alias="transform-move@2x.png">icons/GUI/transform-move@2x.png</file>
+		<file alias="transform-move_32.png">icons/GUI/transform-move_32.png</file>
+		<file alias="transform-move_32@2x.png">icons/GUI/transform-move_32@2x.png</file>
 	</qresource>

 	<!-- IMG map style -->
 	<qresource prefix="/IMG">
-		<file alias="airfield-11.png">icons/IMG/airfield-11.png</file>
-		<file alias="airport-11.png">icons/IMG/airport-11.png</file>
-		<file alias="amusement-park-11.png">icons/IMG/amusement-park-11.png</file>
-		<file alias="bakery-11.png">icons/IMG/bakery-11.png</file>
-		<file alias="bank-11.png">icons/IMG/bank-11.png</file>
-		<file alias="bar-11.png">icons/IMG/bar-11.png</file>
-		<file alias="bbq-11.png">icons/IMG/bbq-11.png</file>
-		<file alias="beach-11.png">icons/IMG/beach-11.png</file>
-		<file alias="bowling-alley-11.png">icons/IMG/bowling-alley-11.png</file>
-		<file alias="building-alt1-11.png">icons/IMG/building-alt1-11.png</file>
-		<file alias="bridge-11.png">icons/IMG/bridge-11.png</file>
-		<file alias="bus-11.png">icons/IMG/bus-11.png</file>
-		<file alias="cafe-11.png">icons/IMG/cafe-11.png</file>
-		<file alias="campsite-11.png">icons/IMG/campsite-11.png</file>
-		<file alias="car-11.png">icons/IMG/car-11.png</file>
-		<file alias="car-rental-11.png">icons/IMG/car-rental-11.png</file>
-		<file alias="car-repair-11.png">icons/IMG/car-repair-11.png</file>
-		<file alias="casino-11.png">icons/IMG/casino-11.png</file>
-		<file alias="cemetery-11.png">icons/IMG/cemetery-11.png</file>
-		<file alias="cinema-11.png">icons/IMG/cinema-11.png</file>
-		<file alias="clothing-store-11.png">icons/IMG/clothing-store-11.png</file>
-		<file alias="communications-tower-11.png">icons/IMG/communications-tower-11.png</file>
-		<file alias="convenience-11.png">icons/IMG/convenience-11.png</file>
-		<file alias="dam-11.png">icons/IMG/dam-11.png</file>
-		<file alias="danger-11.png">icons/IMG/danger-11.png</file>
-		<file alias="drinking-water-11.png">icons/IMG/drinking-water-11.png</file>
-		<file alias="fast-food-11.png">icons/IMG/fast-food-11.png</file>
-		<file alias="entrance-alt1-11.png">icons/IMG/entrance-alt1-11.png</file>
-		<file alias="fire-station-11.png">icons/IMG/fire-station-11.png</file>
-		<file alias="fitness-centre-11.png">icons/IMG/fitness-centre-11.png</file>
-		<file alias="fuel-11.png">icons/IMG/fuel-11.png</file>
-		<file alias="furniture-11.png">icons/IMG/furniture-11.png</file>
-		<file alias="garden-11.png">icons/IMG/garden-11.png</file>
-		<file alias="garden-centre-11.png">icons/IMG/garden-centre-11.png</file>
-		<file alias="golf-11.png">icons/IMG/golf-11.png</file>
-		<file alias="grocery-11.png">icons/IMG/grocery-11.png</file>
-		<file alias="hairdresser-11.png">icons/IMG/hairdresser-11.png</file>
-		<file alias="harbor-11.png">icons/IMG/harbor-11.png</file>
-		<file alias="hardware-11.png">icons/IMG/hardware-11.png</file>
-		<file alias="heliport-11.png">icons/IMG/heliport-11.png</file>
-		<file alias="hospital-11.png">icons/IMG/hospital-11.png</file>
-		<file alias="information-11.png">icons/IMG/information-11.png</file>
-		<file alias="landmark-11.png">icons/IMG/landmark-11.png</file>
-		<file alias="library-11.png">icons/IMG/library-11.png</file>
-		<file alias="lodging-11.png">icons/IMG/lodging-11.png</file>
-		<file alias="mountain-11.png">icons/IMG/mountain-11.png</file>
-		<file alias="museum-11.png">icons/IMG/museum-11.png</file>
-		<file alias="park-11.png">icons/IMG/park-11.png</file>
-		<file alias="parking-11.png">icons/IMG/parking-11.png</file>
-		<file alias="pharmacy-11.png">icons/IMG/pharmacy-11.png</file>
-		<file alias="picnic-site-11.png">icons/IMG/picnic-site-11.png</file>
-		<file alias="place-of-worship-11.png">icons/IMG/place-of-worship-11.png</file>
-		<file alias="police-11.png">icons/IMG/police-11.png</file>
-		<file alias="post-11.png">icons/IMG/post-11.png</file>
-		<file alias="religious-christian-11.png">icons/IMG/religious-christian-11.png</file>
-		<file alias="religious-jewish-11.png">icons/IMG/religious-jewish-11.png</file>
-		<file alias="religious-muslim-11.png">icons/IMG/religious-muslim-11.png</file>
-		<file alias="restaurant-11.png">icons/IMG/restaurant-11.png</file>
-		<file alias="restaurant-noodle-11.png">icons/IMG/restaurant-noodle-11.png</file>
-		<file alias="restaurant-pizza-11.png">icons/IMG/restaurant-pizza-11.png</file>
-		<file alias="restaurant-seafood-11.png">icons/IMG/restaurant-seafood-11.png</file>
-		<file alias="roadblock-11.png">icons/IMG/roadblock-11.png</file>
-		<file alias="school-11.png">icons/IMG/school-11.png</file>
-		<file alias="shelter-11.png">icons/IMG/shelter-11.png</file>
-		<file alias="shop-11.png">icons/IMG/shop-11.png</file>
-		<file alias="skiing-11.png">icons/IMG/skiing-11.png</file>
-		<file alias="soccer-11.png">icons/IMG/soccer-11.png</file>
-		<file alias="swimming-11.png">icons/IMG/swimming-11.png</file>
-		<file alias="theatre-11.png">icons/IMG/theatre-11.png</file>
-		<file alias="telephone-11.png">icons/IMG/telephone-11.png</file>
-		<file alias="toilet-11.png">icons/IMG/toilet-11.png</file>
-		<file alias="town-hall-11.png">icons/IMG/town-hall-11.png</file>
-		<file alias="viewpoint-11.png">icons/IMG/viewpoint-11.png</file>
-		<file alias="village-11.png">icons/IMG/village-11.png</file>
-		<file alias="waterfall-11.png">icons/IMG/waterfall-11.png</file>
-		<file alias="wetland-11.png">icons/IMG/wetland-11.png</file>
-		<file alias="zoo-11.png">icons/IMG/zoo-11.png</file>
+		<file alias="airfield-11.png">icons/IMG/POI/airfield-11.png</file>
+		<file alias="airport-11.png">icons/IMG/POI/airport-11.png</file>
+		<file alias="amusement-park-11.png">icons/IMG/POI/amusement-park-11.png</file>
+		<file alias="bakery-11.png">icons/IMG/POI/bakery-11.png</file>
+		<file alias="bank-11.png">icons/IMG/POI/bank-11.png</file>
+		<file alias="bar-11.png">icons/IMG/POI/bar-11.png</file>
+		<file alias="bbq-11.png">icons/IMG/POI/bbq-11.png</file>
+		<file alias="beach-11.png">icons/IMG/POI/beach-11.png</file>
+		<file alias="bowling-alley-11.png">icons/IMG/POI/bowling-alley-11.png</file>
+		<file alias="building-alt1-11.png">icons/IMG/POI/building-alt1-11.png</file>
+		<file alias="bridge-11.png">icons/IMG/POI/bridge-11.png</file>
+		<file alias="bus-11.png">icons/IMG/POI/bus-11.png</file>
+		<file alias="cafe-11.png">icons/IMG/POI/cafe-11.png</file>
+		<file alias="campsite-11.png">icons/IMG/POI/campsite-11.png</file>
+		<file alias="car-11.png">icons/IMG/POI/car-11.png</file>
+		<file alias="car-rental-11.png">icons/IMG/POI/car-rental-11.png</file>
+		<file alias="car-repair-11.png">icons/IMG/POI/car-repair-11.png</file>
+		<file alias="casino-11.png">icons/IMG/POI/casino-11.png</file>
+		<file alias="cemetery-11.png">icons/IMG/POI/cemetery-11.png</file>
+		<file alias="cinema-11.png">icons/IMG/POI/cinema-11.png</file>
+		<file alias="clothing-store-11.png">icons/IMG/POI/clothing-store-11.png</file>
+		<file alias="communications-tower-11.png">icons/IMG/POI/communications-tower-11.png</file>
+		<file alias="convenience-11.png">icons/IMG/POI/convenience-11.png</file>
+		<file alias="dam-11.png">icons/IMG/POI/dam-11.png</file>
+		<file alias="danger-11.png">icons/IMG/POI/danger-11.png</file>
+		<file alias="drinking-water-11.png">icons/IMG/POI/drinking-water-11.png</file>
+		<file alias="fast-food-11.png">icons/IMG/POI/fast-food-11.png</file>
+		<file alias="entrance-alt1-11.png">icons/IMG/POI/entrance-alt1-11.png</file>
+		<file alias="fire-station-11.png">icons/IMG/POI/fire-station-11.png</file>
+		<file alias="fitness-centre-11.png">icons/IMG/POI/fitness-centre-11.png</file>
+		<file alias="fuel-11.png">icons/IMG/POI/fuel-11.png</file>
+		<file alias="furniture-11.png">icons/IMG/POI/furniture-11.png</file>
+		<file alias="garden-11.png">icons/IMG/POI/garden-11.png</file>
+		<file alias="garden-centre-11.png">icons/IMG/POI/garden-centre-11.png</file>
+		<file alias="golf-11.png">icons/IMG/POI/golf-11.png</file>
+		<file alias="grocery-11.png">icons/IMG/POI/grocery-11.png</file>
+		<file alias="hairdresser-11.png">icons/IMG/POI/hairdresser-11.png</file>
+		<file alias="harbor-11.png">icons/IMG/POI/harbor-11.png</file>
+		<file alias="hardware-11.png">icons/IMG/POI/hardware-11.png</file>
+		<file alias="heliport-11.png">icons/IMG/POI/heliport-11.png</file>
+		<file alias="hospital-11.png">icons/IMG/POI/hospital-11.png</file>
+		<file alias="information-11.png">icons/IMG/POI/information-11.png</file>
+		<file alias="landmark-11.png">icons/IMG/POI/landmark-11.png</file>
+		<file alias="library-11.png">icons/IMG/POI/library-11.png</file>
+		<file alias="lodging-11.png">icons/IMG/POI/lodging-11.png</file>
+		<file alias="mountain-11.png">icons/IMG/POI/mountain-11.png</file>
+		<file alias="museum-11.png">icons/IMG/POI/museum-11.png</file>
+		<file alias="park-11.png">icons/IMG/POI/park-11.png</file>
+		<file alias="parking-11.png">icons/IMG/POI/parking-11.png</file>
+		<file alias="pharmacy-11.png">icons/IMG/POI/pharmacy-11.png</file>
+		<file alias="picnic-site-11.png">icons/IMG/POI/picnic-site-11.png</file>
+		<file alias="place-of-worship-11.png">icons/IMG/POI/place-of-worship-11.png</file>
+		<file alias="police-11.png">icons/IMG/POI/police-11.png</file>
+		<file alias="post-11.png">icons/IMG/POI/post-11.png</file>
+		<file alias="religious-christian-11.png">icons/IMG/POI/religious-christian-11.png</file>
+		<file alias="religious-jewish-11.png">icons/IMG/POI/religious-jewish-11.png</file>
+		<file alias="religious-muslim-11.png">icons/IMG/POI/religious-muslim-11.png</file>
+		<file alias="restaurant-11.png">icons/IMG/POI/restaurant-11.png</file>
+		<file alias="restaurant-noodle-11.png">icons/IMG/POI/restaurant-noodle-11.png</file>
+		<file alias="restaurant-pizza-11.png">icons/IMG/POI/restaurant-pizza-11.png</file>
+		<file alias="restaurant-seafood-11.png">icons/IMG/POI/restaurant-seafood-11.png</file>
+		<file alias="roadblock-11.png">icons/IMG/POI/roadblock-11.png</file>
+		<file alias="school-11.png">icons/IMG/POI/school-11.png</file>
+		<file alias="shelter-11.png">icons/IMG/POI/shelter-11.png</file>
+		<file alias="shop-11.png">icons/IMG/POI/shop-11.png</file>
+		<file alias="skiing-11.png">icons/IMG/POI/skiing-11.png</file>
+		<file alias="soccer-11.png">icons/IMG/POI/soccer-11.png</file>
+		<file alias="swimming-11.png">icons/IMG/POI/swimming-11.png</file>
+		<file alias="theatre-11.png">icons/IMG/POI/theatre-11.png</file>
+		<file alias="telephone-11.png">icons/IMG/POI/telephone-11.png</file>
+		<file alias="toilet-11.png">icons/IMG/POI/toilet-11.png</file>
+		<file alias="town-hall-11.png">icons/IMG/POI/town-hall-11.png</file>
+		<file alias="viewpoint-11.png">icons/IMG/POI/viewpoint-11.png</file>
+		<file alias="village-11.png">icons/IMG/POI/village-11.png</file>
+		<file alias="waterfall-11.png">icons/IMG/POI/waterfall-11.png</file>
+		<file alias="wetland-11.png">icons/IMG/POI/wetland-11.png</file>
+		<file alias="zoo-11.png">icons/IMG/POI/zoo-11.png</file>
+
+		<file alias="light-major.png">icons/IMG/marine/light-major.png</file>
+		<file alias="light-platform.png">icons/IMG/marine/light-platform.png</file>
+		<file alias="buoy.png">icons/IMG/marine/buoy.png</file>
+		<file alias="beacon.png">icons/IMG/marine/beacon.png</file>
+		<file alias="rock-exposed.png">icons/IMG/marine/rock-exposed.png</file>
+		<file alias="rock-dangerous.png">icons/IMG/marine/rock-dangerous.png</file>
+		<file alias="wreck.png">icons/IMG/marine/wreck.png</file>
+		<file alias="wreck-exposed.png">icons/IMG/marine/wreck-exposed.png</file>
+		<file alias="obstruction.png">icons/IMG/marine/obstruction.png</file>
+		<file alias="obstruction-covers.png">icons/IMG/marine/obstruction-covers.png</file>
+		<file alias="anchor-line.png">icons/IMG/marine/anchor-line.png</file>
+		<file alias="noanchor-line.png">icons/IMG/marine/noanchor-line.png</file>
+		<file alias="cable-line.png">icons/IMG/marine/cable-line.png</file>
+		<file alias="pipeline.png">icons/IMG/marine/pipeline.png</file>
+		<file alias="cable.png">icons/IMG/marine/cable.png</file>
+		<file alias="anchorage.png">icons/IMG/marine/anchorage.png</file>
+		<file alias="anchoring-prohibited.png">icons/IMG/marine/anchoring-prohibited.png</file>
+		<file alias="church.png">icons/IMG/marine/church.png</file>
+		<file alias="triangulation-point.png">icons/IMG/marine/triangulation-point.png</file>
+		<file alias="yacht-harbor.png">icons/IMG/marine/yacht-harbor.png</file>
+		<file alias="pile.png">icons/IMG/marine/pile.png</file>
+		<file alias="spar-buoy.png">icons/IMG/marine/spar-buoy.png</file>
+		<file alias="mooring-buoy.png">icons/IMG/marine/mooring-buoy.png</file>
+		<file alias="tower.png">icons/IMG/marine/tower.png</file>
+		<file alias="chimney.png">icons/IMG/marine/chimney.png</file>
 	</qresource>

 	<!-- Mapsforge rendertheme -->
--- a/icons/GUI/transform-move.png
+++ b/icons/GUI/transform-move.png
--- a/icons/GUI/transform-move@2x.png
+++ b/icons/GUI/transform-move@2x.png
--- a/icons/GUI/transform-move_32.png
+++ b/icons/GUI/transform-move_32.png
--- a/icons/GUI/transform-move_32@2x.png
+++ b/icons/GUI/transform-move_32@2x.png
--- a/icons/IMG/POI/airfield-11.png
+++ b/icons/IMG/POI/airfield-11.png
--- a/icons/IMG/POI/airport-11.png
+++ b/icons/IMG/POI/airport-11.png
--- a/icons/IMG/POI/amusement-park-11.png
+++ b/icons/IMG/POI/amusement-park-11.png
--- a/icons/IMG/POI/bakery-11.png
+++ b/icons/IMG/POI/bakery-11.png
--- a/icons/IMG/POI/bank-11.png
+++ b/icons/IMG/POI/bank-11.png
--- a/icons/IMG/POI/bar-11.png
+++ b/icons/IMG/POI/bar-11.png
--- a/icons/IMG/POI/bbq-11.png
+++ b/icons/IMG/POI/bbq-11.png
--- a/icons/IMG/POI/beach-11.png
+++ b/icons/IMG/POI/beach-11.png
--- a/icons/IMG/POI/bowling-alley-11.png
+++ b/icons/IMG/POI/bowling-alley-11.png
--- a/icons/IMG/POI/bridge-11.png
+++ b/icons/IMG/POI/bridge-11.png
--- a/icons/IMG/POI/building-alt1-11.png
+++ b/icons/IMG/POI/building-alt1-11.png
--- a/icons/IMG/POI/bus-11.png
+++ b/icons/IMG/POI/bus-11.png
--- a/icons/IMG/POI/cafe-11.png
+++ b/icons/IMG/POI/cafe-11.png
--- a/icons/IMG/POI/campsite-11.png
+++ b/icons/IMG/POI/campsite-11.png
--- a/icons/IMG/POI/car-11.png
+++ b/icons/IMG/POI/car-11.png
--- a/icons/IMG/POI/car-rental-11.png
+++ b/icons/IMG/POI/car-rental-11.png
--- a/icons/IMG/POI/car-repair-11.png
+++ b/icons/IMG/POI/car-repair-11.png
--- a/icons/IMG/POI/casino-11.png
+++ b/icons/IMG/POI/casino-11.png
--- a/icons/IMG/POI/cemetery-11.png
+++ b/icons/IMG/POI/cemetery-11.png
--- a/icons/IMG/POI/cinema-11.png
+++ b/icons/IMG/POI/cinema-11.png
--- a/icons/IMG/POI/clothing-store-11.png
+++ b/icons/IMG/POI/clothing-store-11.png
--- a/icons/IMG/POI/communications-tower-11.png
+++ b/icons/IMG/POI/communications-tower-11.png
--- a/icons/IMG/POI/convenience-11.png
+++ b/icons/IMG/POI/convenience-11.png
--- a/icons/IMG/POI/dam-11.png
+++ b/icons/IMG/POI/dam-11.png
--- a/icons/IMG/POI/danger-11.png
+++ b/icons/IMG/POI/danger-11.png
--- a/icons/IMG/POI/drinking-water-11.png
+++ b/icons/IMG/POI/drinking-water-11.png
--- a/icons/IMG/POI/entrance-alt1-11.png
+++ b/icons/IMG/POI/entrance-alt1-11.png
--- a/icons/IMG/POI/fast-food-11.png
+++ b/icons/IMG/POI/fast-food-11.png
--- a/icons/IMG/POI/fire-station-11.png
+++ b/icons/IMG/POI/fire-station-11.png
--- a/icons/IMG/POI/fitness-centre-11.png
+++ b/icons/IMG/POI/fitness-centre-11.png
--- a/icons/IMG/POI/fuel-11.png
+++ b/icons/IMG/POI/fuel-11.png
--- a/icons/IMG/POI/furniture-11.png
+++ b/icons/IMG/POI/furniture-11.png
--- a/icons/IMG/POI/garden-11.png
+++ b/icons/IMG/POI/garden-11.png
--- a/icons/IMG/POI/garden-centre-11.png
+++ b/icons/IMG/POI/garden-centre-11.png
--- a/icons/IMG/POI/golf-11.png
+++ b/icons/IMG/POI/golf-11.png
--- a/icons/IMG/POI/grocery-11.png
+++ b/icons/IMG/POI/grocery-11.png
--- a/icons/IMG/POI/hairdresser-11.png
+++ b/icons/IMG/POI/hairdresser-11.png
--- a/icons/IMG/POI/harbor-11.png
+++ b/icons/IMG/POI/harbor-11.png
--- a/icons/IMG/POI/hardware-11.png
+++ b/icons/IMG/POI/hardware-11.png
--- a/icons/IMG/POI/heliport-11.png
+++ b/icons/IMG/POI/heliport-11.png
--- a/icons/IMG/POI/hospital-11.png
+++ b/icons/IMG/POI/hospital-11.png
--- a/icons/IMG/POI/information-11.png
+++ b/icons/IMG/POI/information-11.png
--- a/icons/IMG/POI/landmark-11.png
+++ b/icons/IMG/POI/landmark-11.png
--- a/icons/IMG/POI/library-11.png
+++ b/icons/IMG/POI/library-11.png
--- a/icons/IMG/POI/licence.txt
+++ b/icons/IMG/POI/licence.txt
--- a/icons/IMG/POI/lodging-11.png
+++ b/icons/IMG/POI/lodging-11.png
--- a/icons/IMG/POI/mountain-11.png
+++ b/icons/IMG/POI/mountain-11.png
--- a/icons/IMG/POI/museum-11.png
+++ b/icons/IMG/POI/museum-11.png
--- a/icons/IMG/POI/park-11.png
+++ b/icons/IMG/POI/park-11.png
--- a/icons/IMG/POI/parking-11.png
+++ b/icons/IMG/POI/parking-11.png
--- a/icons/IMG/POI/pharmacy-11.png
+++ b/icons/IMG/POI/pharmacy-11.png
--- a/icons/IMG/POI/picnic-site-11.png
+++ b/icons/IMG/POI/picnic-site-11.png
--- a/icons/IMG/POI/place-of-worship-11.png
+++ b/icons/IMG/POI/place-of-worship-11.png
--- a/icons/IMG/POI/police-11.png
+++ b/icons/IMG/POI/police-11.png
--- a/icons/IMG/POI/post-11.png
+++ b/icons/IMG/POI/post-11.png
--- a/icons/IMG/POI/religious-christian-11.png
+++ b/icons/IMG/POI/religious-christian-11.png
--- a/icons/IMG/POI/religious-jewish-11.png
+++ b/icons/IMG/POI/religious-jewish-11.png
--- a/icons/IMG/POI/religious-muslim-11.png
+++ b/icons/IMG/POI/religious-muslim-11.png
--- a/icons/IMG/POI/restaurant-11.png
+++ b/icons/IMG/POI/restaurant-11.png
--- a/icons/IMG/POI/restaurant-noodle-11.png
+++ b/icons/IMG/POI/restaurant-noodle-11.png
--- a/icons/IMG/POI/restaurant-pizza-11.png
+++ b/icons/IMG/POI/restaurant-pizza-11.png
--- a/icons/IMG/POI/restaurant-seafood-11.png
+++ b/icons/IMG/POI/restaurant-seafood-11.png
--- a/icons/IMG/POI/roadblock-11.png
+++ b/icons/IMG/POI/roadblock-11.png
--- a/icons/IMG/POI/school-11.png
+++ b/icons/IMG/POI/school-11.png
--- a/icons/IMG/POI/shelter-11.png
+++ b/icons/IMG/POI/shelter-11.png
--- a/icons/IMG/POI/shop-11.png
+++ b/icons/IMG/POI/shop-11.png
--- a/icons/IMG/POI/skiing-11.png
+++ b/icons/IMG/POI/skiing-11.png
--- a/icons/IMG/POI/soccer-11.png
+++ b/icons/IMG/POI/soccer-11.png
--- a/icons/IMG/POI/swimming-11.png
+++ b/icons/IMG/POI/swimming-11.png
--- a/icons/IMG/POI/telephone-11.png
+++ b/icons/IMG/POI/telephone-11.png
--- a/icons/IMG/POI/theatre-11.png
+++ b/icons/IMG/POI/theatre-11.png
--- a/icons/IMG/POI/toilet-11.png
+++ b/icons/IMG/POI/toilet-11.png
--- a/icons/IMG/POI/town-hall-11.png
+++ b/icons/IMG/POI/town-hall-11.png
--- a/icons/IMG/POI/viewpoint-11.png
+++ b/icons/IMG/POI/viewpoint-11.png
--- a/icons/IMG/POI/village-11.png
+++ b/icons/IMG/POI/village-11.png
--- a/icons/IMG/POI/waterfall-11.png
+++ b/icons/IMG/POI/waterfall-11.png
--- a/icons/IMG/POI/wetland-11.png
+++ b/icons/IMG/POI/wetland-11.png
--- a/icons/IMG/POI/zoo-11.png
+++ b/icons/IMG/POI/zoo-11.png
--- a/icons/IMG/marine/anchor-line.png
+++ b/icons/IMG/marine/anchor-line.png
--- a/icons/IMG/marine/anchorage.png
+++ b/icons/IMG/marine/anchorage.png
--- a/icons/IMG/marine/anchoring-prohibited.png
+++ b/icons/IMG/marine/anchoring-prohibited.png
--- a/icons/IMG/marine/beacon.png
+++ b/icons/IMG/marine/beacon.png
--- a/icons/IMG/marine/buoy.png
+++ b/icons/IMG/marine/buoy.png
--- a/icons/IMG/marine/cable-line.png
+++ b/icons/IMG/marine/cable-line.png
--- a/icons/IMG/marine/cable.png
+++ b/icons/IMG/marine/cable.png
--- a/icons/IMG/marine/chimney.png
+++ b/icons/IMG/marine/chimney.png
--- a/icons/IMG/marine/church.png
+++ b/icons/IMG/marine/church.png
--- a/icons/IMG/marine/light-major.png
+++ b/icons/IMG/marine/light-major.png
--- a/icons/IMG/marine/light-platform.png
+++ b/icons/IMG/marine/light-platform.png
--- a/Show More
+++ b/Show More