Updated Qt6 version to Qt 6.3

+ removed (aparently) unsupported projections

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 10.1.{build}
+version: 11.3.{build}
 
 configuration:
   - Release
@@ -11,7 +11,7 @@ environment:
   OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
   matrix:
   - QTDIR: C:\Qt\5.15\msvc2019_64
-  - QTDIR: C:\Qt\6.2\msvc2019_64
+  - QTDIR: C:\Qt\6.3\msvc2019_64
     NSISDEF: /DQT6
 
 install:

.github/workflows/android.yml

@@ -0,0 +1,53 @@
+name: Android
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: GPXSee
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+      - name: Run sdkmanager update
+        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --update
+      - name: Install android platform, platform-tools, build-tools and ndk
+        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;22.1.7171670"
+      - name: Setup NDK path
+        run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/22.1.7171670/" >> $GITHUB_ENV
+      - name: Install Qt (Desktop)
+        uses: jurplel/install-qt-action@v2
+        with:
+          aqtversion: '==2.1.0'
+          version: '6.3.1'
+      - name: Install Qt (Android)
+        uses: jurplel/install-qt-action@v2
+        with:
+          aqtversion: '==2.1.0'
+          version: '6.3.1'
+          target: 'android'
+          arch: 'android_armv7'
+          modules: qtpositioning qt5compat
+      - name: Install Android OpenSSL
+        run:  git clone https://github.com/KDAB/android_openssl.git
+      - name: Create localization
+        run:  lrelease gpxsee.pro
+      - name: Configure build
+        run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl 
+      - name: Build project
+        run:  make -j2 apk
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: GPXSee-armv7.apk
+          path: android-build/build/outputs/apk/debug/android-build-debug.apk

.github/workflows/linux.yml

@@ -15,7 +15,7 @@ jobs:
       - 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
+          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev
       - name: Create localization
         run: lrelease gpxsee.pro
       - name: Configure build

.github/workflows/osx.yml

@@ -6,9 +6,9 @@ on:
       - master
 
 jobs:
-  build:
-    name: GPXSee
-    runs-on: macos-10.15
+  qt5:
+    name: GPXSee Qt5 build
+    runs-on: macos-latest
     steps:
       - name: Set environment variables
         run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
@@ -27,5 +27,29 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: GPXSee.dmg
+          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

README.md

@@ -11,7 +11,7 @@ GPS log file formats.
 * 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).
+  QCT maps, GEMF maps, Osmdroid SQLite maps, ESRI World-File georeferenced images).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts
   graphs.
 * Support for DEM files (SRTM HGT).
@@ -21,13 +21,13 @@ GPS log file formats.
 * Full-screen mode.
 * HiDPI/Retina displays & maps support.
 * Real-time GPS position.
-* Native GUI for Windows, Mac OS X and Linux.
+* Windows, macOS, Linux and Android builds.
 
 ![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)
 
 ## Build
 Build requirements:
-* Qt5 >= 5.11 or Qt 6.x*
+* Qt5 >= 5.11 or Qt6 >= 6.2 (Android builds require Qt6)
 * C++11 or newer compiler (tested: msvc2017, gcc 7.5.0, clang/Apple LLVM version
   10.0.0)
 
@@ -38,12 +38,12 @@ 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)
+* [Windows & OS X builds](https://sourceforge.net/projects/gpxsee)
+* [Linux packages](https://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee)
+* [Android APKs](https://play.google.com/store/apps/details?id=org.gpxsee.gpxsee)
 
 ## Changelog
 [Changelog](https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes)
@@ -63,7 +63,7 @@ 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),

gpxsee.pro

@@ -1,9 +1,9 @@
-unix:!macx {
+unix:!macx:!android {
     TARGET = gpxsee
 } else {
     TARGET = GPXSee
 }
-VERSION = 10.1
+VERSION = 11.3
 
 QT += core \
     gui \
@@ -13,7 +13,8 @@ QT += core \
     concurrent \
     widgets \
     printsupport \
-    positioning
+    positioning \
+    svg
 greaterThan(QT_MAJOR_VERSION, 5) {
     QT += openglwidgets \
           core5compat
@@ -24,6 +25,7 @@ INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
     src/GUI/crosshairitem.h \
     src/GUI/motioninfoitem.h \
+    src/GUI/navigationwidget.h \
     src/GUI/pluginparameters.h \
     src/common/garmin.h \
     src/common/coordinates.h \
@@ -113,6 +115,10 @@ HEADERS += src/common/config.h \
     src/GUI/timezoneinfo.h \
     src/GUI/passwordedit.h \
     src/data/twonavparser.h \
+    src/map/IMG/section.h \
+    src/map/gemfmap.h \
+    src/map/oruxmap.h \
+    src/map/osmdroidmap.h \
     src/map/proj/polyconic.h \
     src/map/proj/webmercator.h \
     src/map/proj/transversemercator.h \
@@ -245,6 +251,7 @@ HEADERS += src/common/config.h \
 SOURCES += src/main.cpp \
     src/GUI/crosshairitem.cpp \
     src/GUI/motioninfoitem.cpp \
+    src/GUI/navigationwidget.cpp \
     src/GUI/pluginparameters.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
@@ -314,6 +321,9 @@ SOURCES += src/main.cpp \
     src/GUI/projectioncombobox.cpp \
     src/GUI/passwordedit.cpp \
     src/data/twonavparser.cpp \
+    src/map/gemfmap.cpp \
+    src/map/oruxmap.cpp \
+    src/map/osmdroidmap.cpp \
     src/map/proj/polyconic.cpp \
     src/map/proj/webmercator.cpp \
     src/map/proj/transversemercator.cpp \
@@ -498,12 +508,13 @@ win32 {
         icons/formats/omd.ico \
         icons/formats/ghp.ico \
         icons/formats/qct.ico \
-        icons/formats/trk.ico
+        icons/formats/trk.ico \
+        icons/formats/gemf.ico
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }
 
-unix:!macx {
+unix:!macx:!android {
     isEmpty(PREFIX):PREFIX = /usr/local
 
     maps.files = $$files(pkg/maps/*)
@@ -523,3 +534,43 @@ unix:!macx {
     target.path = $$PREFIX/bin
     INSTALLS += target maps csv symbols locale icon desktop mime
 }
+
+android {
+    defineReplace(versionCode) {
+        segments = $$split(1, ".")
+        for (segment, segments): \
+            vCode = "$$first(vCode)$$format_number($$segment, width=3 zeropad)"
+        contains(ANDROID_TARGET_ARCH, armeabi-v7a): \
+            suffix = 0
+        contains(ANDROID_TARGET_ARCH, arm64-v8a): \
+            suffix = 1
+        contains(ANDROID_TARGET_ARCH, x86): \
+            suffix = 2
+        contains(ANDROID_TARGET_ARCH, x86_64): \
+            suffix = 3
+
+        return($$first(vCode)$$first(suffix))
+    }
+
+    !include($$OPENSSL_PATH/openssl.pri) {
+        message("OpenSSL not found, building without HTTPS support!")
+    }
+
+    ANDROID_VERSION_NAME = $$VERSION
+    ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME)
+    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android
+    DISTFILES += \
+        pkg/android/AndroidManifest.xml \
+        pkg/android/build.gradle \
+        pkg/android/res/values/libs.xml
+
+    maps.files = $$files(pkg/maps/*)
+    maps.path = /assets/maps
+    csv.files = $$files(pkg/csv/*)
+    csv.path = /assets/csv
+    symbols.files = $$files(icons/symbols/*.png)
+    symbols.path = /assets/symbols
+    translations.files = $$files(lang/*.qm)
+    translations.path = /assets/translations
+    INSTALLS += maps csv symbols translations
+}

gpxsee.qrc

@@ -57,83 +57,109 @@
 
 	<!-- 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 -->