Some more micro-optimizations & code cleanup

Some (marine) maps have different points with the same type on the same
position.

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 9.6.{build}
+version: 13.3.{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.4\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,16 +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
-    xcopy pkg\csv installer\csv /i
-    xcopy pkg\maps installer\maps /i
+    copy pkg\windows\gpxsee64.nsi installer
+    xcopy data\CRS installer\CRS /i
+    xcopy data\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

.github/workflows/android.yml

@@ -0,0 +1,51 @@
+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;23.1.7779620"
+      - name: Setup NDK path
+        run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
+      - name: Install Qt (Desktop)
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '6.4.0'
+      - name: Install Qt (Android)
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '6.4.0'
+          target: 'android'
+          arch: 'android_armv7'
+          modules: qtpositioning qt5compat qtserialport
+      - 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@v3
+        with:
+          name: GPXSee-armv7.apk
+          path: android-build/build/outputs/apk/debug/android-build-debug.apk

.github/workflows/codeql.yml

@@ -0,0 +1,45 @@
+name: "CodeQL"
+
+on: [workflow_dispatch]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - 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 libqt5svg5-dev libqt5serialport5-dev
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.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@v3
+      - 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 libqt5svg5-dev libqt5serialport5-dev
+      - name: Create localization
+        run: lrelease gpxsee.pro
+      - name: Configure build
+        run: qmake gpxsee.pro
+      - name: Build project
+        run: make -j2

.github/workflows/osx.yml

@@ -0,0 +1,56 @@
+name: OS X
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  qt5:
+    name: GPXSee Qt5 build
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '5.15.2'
+      - 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 -appstore-compliant
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: GPXSee-qt5.dmg
+          path: GPXSee.dmg
+
+  qt6:
+    name: GPXSee Qt6 build
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '6.4.3'
+          modules: qtpositioning qt5compat qtserialport
+      - 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 -appstore-compliant
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: GPXSee-qt6.dmg
+          path: GPXSee.dmg

.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

README.md

@@ -1,25 +1,36 @@
 # 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,
+  ENC charts, KMZ maps, AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps,
+  Mapsforge vector maps, QCT maps, GEMF maps, Osmdroid SQLite maps, Orux 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.
-* Native GUI for Windows, Mac OS X and Linux.
+* Real-time GPS position.
+* 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
-* C++11 or newer compiler (tested: msvc2017, gcc 7.5.0, clang/Apple LLVM version 10.0.0)
+* Qt5 >= 5.11 or Qt6 >= 6.2 (Android builds require Qt6)
+* C++11 or newer compiler (tested: msvc2019, gcc 7.5.0, clang/Apple LLVM version
+  10.0.0)
 
 Build steps:
 ```shell
@@ -28,9 +39,12 @@ qmake gpxsee.pro
 make # nmake on windows
 ```
 
+
+
 ## 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)
@@ -42,17 +56,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/POI) - CC0
+* [Mapbox Maki icons](icons/map/POI) - CC0
+* [Map Icons Collection](icons/symbols) - CC BY SA 3.0
 * [RTree implementation](src/common/rtree.h) - Public domain
-* [Albers](src/map/albersequal.cpp), [Geocentric](src/map/geocentric.cpp), [LCC](src/map/lambertconic.cpp),
-  [Mercator](src/map/mercator.cpp), [Polar Stereographic](src/map/polarstereographic.cpp),
-  [Polyconic](src/map/polyconic.cpp) and [Transverse Mercator](src/map/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
+* [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](data/CRS) - BSD/EPSG/Public domain
+* [Mapsforge render theme](data/mapsforge/default.xml) and its [icons](icons/map/mapsforge) - LGPLv3

data/CRS/gcs.csv

@@ -345,6 +345,7 @@ FEH2010,5593,1078,9122,7019,8901,9603,0,0,0,,,,
 CIGD11,6135,1100,9122,7019,8901,9603,0,0,0,,,,
 Nepal 1981,6207,1111,9122,7015,8901,9603,293.17,726.18,245.36,,,,
 CGRS93,6311,1112,9122,7030,8901,9607,8.846,-4.394,-1.122,0.00237,0.146528,-0.130428,0.783926
+NAD83(2011),6318,1116,9122,7019,8901,9603,0,0,0,,,,
 Mexico ITRF2008,6365,1120,9122,7019,8901,9603,0,0,0,,,,
 RDN2008,6706,1132,9122,7019,8901,9603,0,0,0,,,,
 Aden 1925,6881,1135,9122,7012,8901,9603,-24,-203,268,,,,

data/maps/USGS-imagery.xml

@@ -2,7 +2,7 @@
 <map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Imagery</name>
 	<url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url>
-	<zoom min="2" max="15"/>
+	<zoom min="2" max="16"/>
 	<bounds bottom="0" top="74"/>
 	<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
 </map>

data/maps/USGS-topo.xml

@@ -2,6 +2,6 @@
 <map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Topo</name>
 	<url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url>
-	<zoom min="2" max="15"/>
+	<zoom min="2" max="16"/>
 	<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
 </map>

data/mapsforge/default.xml

@@ -1144,7 +1144,7 @@
         <rule e="any" k="amenity" v="fuel" zoom-min="13">
             <symbol id="fuel" src=":/mapsforge/symbols/transport/fuel.svg" />
             <rule e="any" k="*" v="*" zoom-min="18">
-                <caption fill="#0092DA" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
+                <caption fill="#AC39AC" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
                     stroke-width="2.0" symbol-id="fuel" />
             </rule>
         </rule>

gpxsee.pro

@@ -1,9 +1,9 @@
-unix:!macx {
+unix:!macx:!android {
     TARGET = gpxsee
 } else {
     TARGET = GPXSee
 }
-VERSION = 9.6
+VERSION = 13.3
 
 QT += core \
     gui \
@@ -12,12 +12,40 @@ QT += core \
     sql \
     concurrent \
     widgets \
-    printsupport
-greaterThan(QT_MAJOR_VERSION, 5) {QT += openglwidgets}
+    printsupport \
+    positioning \
+    svg \
+    serialport
+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/hash.h \
+    src/common/linec.h \
+    src/common/range.h \
+    src/common/rectc.h \
+    src/common/textcodec.h \
+    src/common/treenode.h \
+    src/common/wgs84.h \
+    src/common/util.h \
+    src/common/rtree.h \
+    src/common/kv.h \
+    src/common/greatcircle.h \
+    src/common/programpaths.h \
+    src/common/tifffile.h \
+    src/common/downloader.h \
+    src/common/polygon.h \
+    src/common/color.h \
+    src/common/csv.h \
     src/GUI/authenticationwidget.h \
     src/GUI/axislabelitem.h \
     src/GUI/dirselectwidget.h \
@@ -32,20 +60,6 @@ HEADERS += src/common/config.h \
     src/GUI/poiaction.h \
     src/GUI/popup.h \
     src/GUI/thumbnail.h \
-    src/common/garmin.h \
-    src/common/coordinates.h \
-    src/common/range.h \
-    src/common/rectc.h \
-    src/common/textcodec.h \
-    src/common/treenode.h \
-    src/common/wgs84.h \
-    src/common/util.h \
-    src/common/rtree.h \
-    src/common/kv.h \
-    src/common/greatcircle.h \
-    src/common/programpaths.h \
-    src/common/tifffile.h \
-    src/common/downloader.h \
     src/GUI/app.h \
     src/GUI/icons.h \
     src/GUI/gui.h \
@@ -96,11 +110,40 @@ HEADERS += src/common/config.h \
     src/GUI/mapview.h \
     src/GUI/font.h \
     src/GUI/areaitem.h \
-    src/data/itnparser.h \
-    src/data/link.h \
-    src/data/onmoveparsers.h \
-    src/data/ov2parser.h \
-    src/map/IMG/bitmapline.h \
+    src/GUI/coordinatesitem.h \
+    src/GUI/projectioncombobox.h \
+    src/GUI/pathtickitem.h \
+    src/GUI/pdfexportdialog.h \
+    src/GUI/pngexportdialog.h \
+    src/GUI/timezoneinfo.h \
+    src/GUI/passwordedit.h \
+    src/data/style.h \
+    src/data/twonavparser.h \
+    src/map/ENC/attributes.h \
+    src/map/ENC/mapdata.h \
+    src/map/ENC/objects.h \
+    src/map/ENC/rastertile.h \
+    src/map/ENC/style.h \
+    src/map/IMG/section.h \
+    src/map/IMG/zoom.h \
+    src/map/conversion.h \
+    src/map/encmap.h \
+    src/map/ENC/iso8211.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 \
+    src/map/proj/latlon.h \
+    src/map/proj/lambertconic.h \
+    src/map/proj/lambertazimuthal.h \
+    src/map/proj/albersequal.h \
+    src/map/proj/mercator.h \
+    src/map/proj/krovak.h \
+    src/map/proj/polarstereographic.h \
+    src/map/proj/obliquestereographic.h \
+    src/map/bitmapline.h \
     src/map/IMG/bitstream.h \
     src/map/IMG/deltastream.h \
     src/map/IMG/gmapdata.h \
@@ -113,28 +156,32 @@ HEADERS += src/common/config.h \
     src/map/IMG/raster.h \
     src/map/IMG/rastertile.h \
     src/map/IMG/shield.h \
+    src/map/IMG/imgdata.h \
+    src/map/IMG/subfile.h \
+    src/map/IMG/trefile.h \
+    src/map/IMG/rgnfile.h \
+    src/map/IMG/lblfile.h \
+    src/map/IMG/vectortile.h \
+    src/map/IMG/subdiv.h \
+    src/map/IMG/style.h \
+    src/map/IMG/netfile.h \
+    src/map/IMG/label.h \
     src/map/mapsforge/style.h \
-    src/map/prjfile.h \
-    src/map/textpathitem.h \
-    src/map/textpointitem.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 \
     src/map/bsbmap.h \
     src/map/invalidmap.h \
     src/map/kmzmap.h \
-    src/map/polyconic.h \
     src/map/projection.h \
     src/map/ellipsoid.h \
     src/map/datum.h \
     src/map/sqlitemap.h \
-    src/map/webmercator.h \
-    src/map/transversemercator.h \
-    src/map/latlon.h \
     src/map/utm.h \
-    src/map/lambertconic.h \
-    src/map/lambertazimuthal.h \
-    src/map/albersequal.h \
     src/map/map.h \
     src/map/maplist.h \
     src/map/onlinemap.h \
@@ -166,14 +213,22 @@ HEADERS += src/common/config.h \
     src/map/pointd.h \
     src/map/rectd.h \
     src/map/geocentric.h \
-    src/map/mercator.h \
     src/map/jnxmap.h \
-    src/map/krovak.h \
     src/map/geotiffmap.h \
     src/map/image.h \
     src/map/mbtilesmap.h \
     src/map/osm.h \
-    src/map/polarstereographic.h \
+    src/map/rmap.h \
+    src/map/calibrationpoint.h \
+    src/map/textitem.h \
+    src/map/aqmmap.h \
+    src/map/mapsforgemap.h \
+    src/map/worldfilemap.h \
+    src/map/imgmap.h \
+    src/data/itnparser.h \
+    src/data/link.h \
+    src/data/onmoveparsers.h \
+    src/data/ov2parser.h \
     src/data/graph.h \
     src/data/poi.h \
     src/data/waypoint.h \
@@ -197,43 +252,29 @@ HEADERS += src/common/config.h \
     src/data/slfparser.h \
     src/data/dem.h \
     src/data/demloader.h \
-    src/common/polygon.h \
     src/data/area.h \
-    src/map/obliquestereographic.h \
-    src/GUI/coordinatesitem.h \
-    src/map/rmap.h \
-    src/map/calibrationpoint.h \
-    src/map/color.h \
     src/data/exifparser.h \
-    src/data/imageinfo.h \
-    src/map/imgmap.h \
-    src/map/IMG/imgdata.h \
-    src/map/IMG/subfile.h \
-    src/map/IMG/trefile.h \
-    src/map/IMG/rgnfile.h \
-    src/map/IMG/lblfile.h \
-    src/map/IMG/vectortile.h \
-    src/map/IMG/subdiv.h \
-    src/map/IMG/style.h \
-    src/map/IMG/netfile.h \
-    src/GUI/projectioncombobox.h \
-    src/GUI/pathtickitem.h \
-    src/map/textitem.h \
-    src/map/IMG/label.h \
-    src/data/csv.h \
     src/data/cupparser.h \
     src/data/gpiparser.h \
     src/data/address.h \
     src/data/smlparser.h \
-    src/GUI/pdfexportdialog.h \
-    src/GUI/pngexportdialog.h \
-    src/data/geojsonparser.h \
-    src/GUI/timezoneinfo.h \
-    src/map/aqmmap.h \
-    src/map/mapsforgemap.h \
-    src/map/worldfilemap.h
+    src/data/geojsonparser.h
 
 SOURCES += src/main.cpp \
+    src/GUI/crosshairitem.cpp \
+    src/GUI/motioninfoitem.cpp \
+    src/GUI/pluginparameters.cpp \
+    src/GUI/settings.cpp \
+    src/common/coordinates.cpp \
+    src/common/rectc.cpp \
+    src/common/range.cpp \
+    src/common/textcodec.cpp \
+    src/common/util.cpp \
+    src/common/greatcircle.cpp \
+    src/common/programpaths.cpp \
+    src/common/tifffile.cpp \
+    src/common/downloader.cpp \
+    src/common/csv.cpp \
     src/GUI/authenticationwidget.cpp \
     src/GUI/axislabelitem.cpp \
     src/GUI/dirselectwidget.cpp \
@@ -244,15 +285,6 @@ SOURCES += src/main.cpp \
     src/GUI/markerinfoitem.cpp \
     src/GUI/popup.cpp \
     src/GUI/thumbnail.cpp \
-    src/common/coordinates.cpp \
-    src/common/rectc.cpp \
-    src/common/range.cpp \
-    src/common/textcodec.cpp \
-    src/common/util.cpp \
-    src/common/greatcircle.cpp \
-    src/common/programpaths.cpp \
-    src/common/tifffile.cpp \
-    src/common/downloader.cpp \
     src/GUI/app.cpp \
     src/GUI/gui.cpp \
     src/GUI/axisitem.cpp \
@@ -294,12 +326,34 @@ SOURCES += src/main.cpp \
     src/GUI/gearratiographitem.cpp \
     src/GUI/mapview.cpp \
     src/GUI/areaitem.cpp \
-    src/data/address.cpp \
-    src/data/itnparser.cpp \
-    src/data/onmoveparsers.cpp \
-    src/data/ov2parser.cpp \
-    src/data/waypoint.cpp \
-    src/map/IMG/bitmapline.cpp \
+    src/GUI/coordinatesitem.cpp \
+    src/GUI/pathtickitem.cpp \
+    src/GUI/graphicsscene.cpp \
+    src/GUI/pdfexportdialog.cpp \
+    src/GUI/pngexportdialog.cpp \
+    src/GUI/projectioncombobox.cpp \
+    src/GUI/passwordedit.cpp \
+    src/data/twonavparser.cpp \
+    src/map/ENC/mapdata.cpp \
+    src/map/ENC/rastertile.cpp \
+    src/map/ENC/style.cpp \
+    src/map/conversion.cpp \
+    src/map/encmap.cpp \
+    src/map/ENC/iso8211.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 \
+    src/map/proj/lambertconic.cpp \
+    src/map/proj/albersequal.cpp \
+    src/map/proj/lambertazimuthal.cpp \
+    src/map/proj/mercator.cpp \
+    src/map/proj/krovak.cpp \
+    src/map/proj/polarstereographic.cpp \
+    src/map/proj/obliquestereographic.cpp \
+    src/map/bitmapline.cpp \
     src/map/IMG/bitstream.cpp \
     src/map/IMG/deltastream.cpp \
     src/map/IMG/gmapdata.cpp \
@@ -310,20 +364,29 @@ SOURCES += src/main.cpp \
     src/map/IMG/nodfile.cpp \
     src/map/IMG/mapdata.cpp \
     src/map/IMG/rastertile.cpp \
+    src/map/IMG/imgdata.cpp \
+    src/map/IMG/subfile.cpp \
+    src/map/IMG/trefile.cpp \
+    src/map/IMG/rgnfile.cpp \
+    src/map/IMG/lblfile.cpp \
+    src/map/IMG/vectortile.cpp \
+    src/map/IMG/style.cpp \
+    src/map/IMG/netfile.cpp \
     src/map/mapsforge/style.cpp \
-    src/map/prjfile.cpp \
-    src/map/textpathitem.cpp \
-    src/map/textpointitem.cpp \
     src/map/mapsforge/mapdata.cpp \
     src/map/mapsforge/rastertile.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 \
     src/map/kmzmap.cpp \
     src/map/maplist.cpp \
     src/map/onlinemap.cpp \
     src/map/emptymap.cpp \
     src/map/ozimap.cpp \
-    src/map/polyconic.cpp \
     src/map/sqlitemap.cpp \
     src/map/tar.cpp \
     src/map/atlas.cpp \
@@ -331,12 +394,7 @@ SOURCES += src/main.cpp \
     src/map/matrix.cpp \
     src/map/ellipsoid.cpp \
     src/map/datum.cpp \
-    src/map/webmercator.cpp \
-    src/map/transversemercator.cpp \
     src/map/utm.cpp \
-    src/map/lambertconic.cpp \
-    src/map/albersequal.cpp \
-    src/map/lambertazimuthal.cpp \
     src/map/geotiff.cpp \
     src/map/pcs.cpp \
     src/map/transform.cpp \
@@ -356,16 +414,23 @@ SOURCES += src/main.cpp \
     src/map/crs.cpp \
     src/map/coordinatesystem.cpp \
     src/map/geocentric.cpp \
-    src/map/mercator.cpp \
     src/map/jnxmap.cpp \
-    src/map/krovak.cpp \
     src/map/map.cpp \
     src/map/geotiffmap.cpp \
     src/map/image.cpp \
     src/map/mbtilesmap.cpp \
     src/map/osm.cpp \
-    src/map/polarstereographic.cpp \
     src/map/rectd.cpp \
+    src/map/rmap.cpp \
+    src/map/textitem.cpp \
+    src/map/aqmmap.cpp \
+    src/map/mapsforgemap.cpp \
+    src/map/worldfilemap.cpp \
+    src/data/address.cpp \
+    src/data/itnparser.cpp \
+    src/data/onmoveparsers.cpp \
+    src/data/ov2parser.cpp \
+    src/data/waypoint.cpp \
     src/data/data.cpp \
     src/data/poi.cpp \
     src/data/track.cpp \
@@ -383,33 +448,11 @@ SOURCES += src/main.cpp \
     src/data/slfparser.cpp \
     src/data/dem.cpp \
     src/data/demloader.cpp \
-    src/map/obliquestereographic.cpp \
-    src/GUI/coordinatesitem.cpp \
-    src/map/rmap.cpp \
     src/data/exifparser.cpp \
-    src/map/imgmap.cpp \
-    src/map/IMG/imgdata.cpp \
-    src/map/IMG/subfile.cpp \
-    src/map/IMG/trefile.cpp \
-    src/map/IMG/rgnfile.cpp \
-    src/map/IMG/lblfile.cpp \
-    src/map/IMG/vectortile.cpp \
-    src/map/IMG/style.cpp \
-    src/map/IMG/netfile.cpp \
-    src/GUI/pathtickitem.cpp \
-    src/map/textitem.cpp \
-    src/data/csv.cpp \
     src/data/cupparser.cpp \
-    src/GUI/graphicsscene.cpp \
     src/data/gpiparser.cpp \
     src/data/smlparser.cpp \
-    src/GUI/pdfexportdialog.cpp \
-    src/GUI/pngexportdialog.cpp \
-    src/data/geojsonparser.cpp \
-    src/map/aqmmap.cpp \
-    src/map/mapsforgemap.cpp \
-    src/map/worldfilemap.cpp \
-    src/GUI/projectioncombobox.cpp
+    src/data/geojsonparser.cpp
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
     QT_NO_DEPRECATED_WARNINGS
@@ -431,63 +474,28 @@ TRANSLATIONS = lang/gpxsee_en.ts \
     lang/gpxsee_uk.ts \
     lang/gpxsee_hu.ts \
     lang/gpxsee_it.ts \
-    lang/gpxsee_eo.ts
+    lang/gpxsee_eo.ts \
+    lang/gpxsee_zh.ts \
+    lang/gpxsee_ca.ts \
+    lang/gpxsee_ko.ts
 
 macx {
     ICON = icons/app/gpxsee.icns
-    QMAKE_INFO_PLIST = pkg/Info.plist
+    QMAKE_INFO_PLIST = pkg/mac/Info.plist
     locale.path = Contents/Resources/translations
-    locale.files = lang/gpxsee_en.qm \
-        lang/gpxsee_cs.qm \
-        lang/gpxsee_de.qm \
-        lang/gpxsee_fi.qm \
-        lang/gpxsee_fr.qm \
-        lang/gpxsee_ru.qm \
-        lang/gpxsee_sv.qm \
-        lang/gpxsee_pl.qm \
-        lang/gpxsee_nb.qm \
-        lang/gpxsee_da.qm \
-        lang/gpxsee_tr.qm \
-        lang/gpxsee_es.qm \
-        lang/gpxsee_pt_BR.qm \
-        lang/gpxsee_uk.qm \
-        lang/gpxsee_hu.qm \
-        lang/gpxsee_it.qm \
-        lang/gpxsee_eo.qm
-    csv.path = Contents/Resources
-    csv.files = pkg/csv
+    locale.files = $$files(lang/*.qm)
+    crs.path = Contents/Resources
+    crs.files = data/CRS
     maps.path = Contents/Resources
-    maps.files = pkg/maps
+    maps.files = data/maps
+    symbols.path = Contents/Resources/symbols
+    symbols.files = $$files(icons/symbols/*.png)
     icons.path = Contents/Resources/icons
-    icons.files = icons/formats/gpx.icns \
-        icons/formats/tcx.icns \
-        icons/formats/kml.icns \
-        icons/formats/fit.icns \
-        icons/formats/igc.icns \
-        icons/formats/nmea.icns \
-        icons/formats/plt.icns \
-        icons/formats/rte.icns \
-        icons/formats/wpt.icns \
-        icons/formats/loc.icns \
-        icons/formats/slf.icns \
-        icons/formats/json.icns \
-        icons/formats/cup.icns \
-        icons/formats/gpi.icns \
-        icons/formats/sml.icns \
-        icons/formats/img.icns \
-        icons/formats/jnx.icns \
-        icons/formats/kap.icns \
-        icons/formats/mbts.icns \
-        icons/formats/rmap.icns \
-        icons/formats/tba.icns \
-        icons/formats/aqm.icns \
-        icons/formats/sqlt.icns \
-        icons/formats/ov2.icns \
-        icons/formats/itn.icns \
-        icons/formats/wld.icns \
-        icons/formats/omd.icns \
-        icons/formats/ghp.icns
-    QMAKE_BUNDLE_DATA += locale maps icons csv
+    icons.files = $$files(icons/formats/*.icns)
+    lproj.path = Contents/Resources
+    lproj.files = $$files(pkg/mac/lproj/*)
+
+    QMAKE_BUNDLE_DATA += locale maps symbols icons crs lproj
 }
 
 win32 {
@@ -520,26 +528,78 @@ 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 \
+        icons/formats/gemf.ico \
+        icons/formats/000.ico
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }
 
-unix:!macx {
+unix:!macx:!android {
     isEmpty(PREFIX):PREFIX = /usr/local
 
-    maps.files = pkg/maps/*
+    maps.files = $$files(data/maps/*)
     maps.path = $$PREFIX/share/gpxsee/maps
-    csv.files = pkg/csv/*
-    csv.path = $$PREFIX/share/gpxsee/csv
-    locale.files = lang/*.qm
+    crs.files = $$files(data/CRS/*)
+    crs.path = $$PREFIX/share/gpxsee/CRS
+    symbols.files = $$files(icons/symbols/*.png)
+    symbols.path = $$PREFIX/share/gpxsee/symbols
+    locale.files = $$files(lang/*.qm)
     locale.path = $$PREFIX/share/gpxsee/translations
-    icon.files = icons/app/hicolor/*
+    icon.files = $$files(icons/app/hicolor/*)
     icon.path = $$PREFIX/share/icons/hicolor
-    desktop.files = pkg/gpxsee.desktop
+    desktop.files = pkg/linux/gpxsee.desktop
     desktop.path = $$PREFIX/share/applications
-    mime.files = pkg/gpxsee.xml
+    mime.files = pkg/linux/gpxsee.xml
     mime.path = $$PREFIX/share/mime/packages
+    appdata.files = pkg/linux/gpxsee.appdata.xml
+    appdata.path = $$PREFIX/share/metainfo
     target.path = $$PREFIX/bin
-    INSTALLS += target maps csv locale icon desktop mime
+    INSTALLS += target maps crs symbols locale icon desktop mime appdata
+}
+
+android {
+    HEADERS += src/GUI/navigationwidget.h
+    SOURCES += src/GUI/navigationwidget.cpp
+
+    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_TARGET_SDK_VERSION = 31
+    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(data/maps/*)
+    maps.path = /assets/maps
+    crs.files = $$files(data/CRS/*)
+    crs.path = /assets/CRS
+    symbols.files = $$files(icons/symbols/*.png)
+    symbols.path = /assets/symbols
+    translations.files = $$files(lang/*.qm)
+    translations.path = /assets/translations
+    INSTALLS += maps crs symbols translations
 }

gpxsee.qrc

@@ -45,223 +45,295 @@
 		<file alias="applications-internet_32@2x.png">icons/GUI/applications-internet_32@2x.png</file>
 		<file alias="view-grid.png">icons/GUI/view-grid.png</file>
 		<file alias="view-grid@2x.png">icons/GUI/view-grid@2x.png</file>
+		<file alias="document-decrypt.png">icons/GUI/document-decrypt.png</file>
+		<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>
-	
-	<!-- POI icons for default IMG map style -->
+
+	<!-- POIs (IMG & ENC style) -->
 	<qresource prefix="/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="convenience-11.png">icons/POI/convenience-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="entrance-alt1-11.png">icons/POI/entrance-alt1-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="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>
+		<file alias="airfield-11.png">icons/map/POI/airfield-11.png</file>
+		<file alias="airport-11.png">icons/map/POI/airport-11.png</file>
+		<file alias="amusement-park-11.png">icons/map/POI/amusement-park-11.png</file>
+		<file alias="bakery-11.png">icons/map/POI/bakery-11.png</file>
+		<file alias="bank-11.png">icons/map/POI/bank-11.png</file>
+		<file alias="bar-11.png">icons/map/POI/bar-11.png</file>
+		<file alias="bbq-11.png">icons/map/POI/bbq-11.png</file>
+		<file alias="beach-11.png">icons/map/POI/beach-11.png</file>
+		<file alias="bowling-alley-11.png">icons/map/POI/bowling-alley-11.png</file>
+		<file alias="building-alt1-11.png">icons/map/POI/building-alt1-11.png</file>
+		<file alias="bridge-11.png">icons/map/POI/bridge-11.png</file>
+		<file alias="bus-11.png">icons/map/POI/bus-11.png</file>
+		<file alias="cafe-11.png">icons/map/POI/cafe-11.png</file>
+		<file alias="campsite-11.png">icons/map/POI/campsite-11.png</file>
+		<file alias="car-11.png">icons/map/POI/car-11.png</file>
+		<file alias="car-rental-11.png">icons/map/POI/car-rental-11.png</file>
+		<file alias="car-repair-11.png">icons/map/POI/car-repair-11.png</file>
+		<file alias="casino-11.png">icons/map/POI/casino-11.png</file>
+		<file alias="cemetery-11.png">icons/map/POI/cemetery-11.png</file>
+		<file alias="cinema-11.png">icons/map/POI/cinema-11.png</file>
+		<file alias="clothing-store-11.png">icons/map/POI/clothing-store-11.png</file>
+		<file alias="communications-tower-11.png">icons/map/POI/communications-tower-11.png</file>
+		<file alias="convenience-11.png">icons/map/POI/convenience-11.png</file>
+		<file alias="dam-11.png">icons/map/POI/dam-11.png</file>
+		<file alias="danger-11.png">icons/map/POI/danger-11.png</file>
+		<file alias="drinking-water-11.png">icons/map/POI/drinking-water-11.png</file>
+		<file alias="fast-food-11.png">icons/map/POI/fast-food-11.png</file>
+		<file alias="entrance-alt1-11.png">icons/map/POI/entrance-alt1-11.png</file>
+		<file alias="fire-station-11.png">icons/map/POI/fire-station-11.png</file>
+		<file alias="fitness-centre-11.png">icons/map/POI/fitness-centre-11.png</file>
+		<file alias="fuel-11.png">icons/map/POI/fuel-11.png</file>
+		<file alias="furniture-11.png">icons/map/POI/furniture-11.png</file>
+		<file alias="garden-11.png">icons/map/POI/garden-11.png</file>
+		<file alias="garden-centre-11.png">icons/map/POI/garden-centre-11.png</file>
+		<file alias="golf-11.png">icons/map/POI/golf-11.png</file>
+		<file alias="grocery-11.png">icons/map/POI/grocery-11.png</file>
+		<file alias="hairdresser-11.png">icons/map/POI/hairdresser-11.png</file>
+		<file alias="harbor-11.png">icons/map/POI/harbor-11.png</file>
+		<file alias="hardware-11.png">icons/map/POI/hardware-11.png</file>
+		<file alias="heliport-11.png">icons/map/POI/heliport-11.png</file>
+		<file alias="hospital-11.png">icons/map/POI/hospital-11.png</file>
+		<file alias="information-11.png">icons/map/POI/information-11.png</file>
+		<file alias="landmark-11.png">icons/map/POI/landmark-11.png</file>
+		<file alias="library-11.png">icons/map/POI/library-11.png</file>
+		<file alias="lodging-11.png">icons/map/POI/lodging-11.png</file>
+		<file alias="mountain-11.png">icons/map/POI/mountain-11.png</file>
+		<file alias="museum-11.png">icons/map/POI/museum-11.png</file>
+		<file alias="park-11.png">icons/map/POI/park-11.png</file>
+		<file alias="parking-11.png">icons/map/POI/parking-11.png</file>
+		<file alias="pharmacy-11.png">icons/map/POI/pharmacy-11.png</file>
+		<file alias="picnic-site-11.png">icons/map/POI/picnic-site-11.png</file>
+		<file alias="place-of-worship-11.png">icons/map/POI/place-of-worship-11.png</file>
+		<file alias="police-11.png">icons/map/POI/police-11.png</file>
+		<file alias="post-11.png">icons/map/POI/post-11.png</file>
+		<file alias="religious-christian-11.png">icons/map/POI/religious-christian-11.png</file>
+		<file alias="religious-jewish-11.png">icons/map/POI/religious-jewish-11.png</file>
+		<file alias="religious-muslim-11.png">icons/map/POI/religious-muslim-11.png</file>
+		<file alias="restaurant-11.png">icons/map/POI/restaurant-11.png</file>
+		<file alias="restaurant-noodle-11.png">icons/map/POI/restaurant-noodle-11.png</file>
+		<file alias="restaurant-pizza-11.png">icons/map/POI/restaurant-pizza-11.png</file>
+		<file alias="restaurant-seafood-11.png">icons/map/POI/restaurant-seafood-11.png</file>
+		<file alias="roadblock-11.png">icons/map/POI/roadblock-11.png</file>
+		<file alias="school-11.png">icons/map/POI/school-11.png</file>
+		<file alias="shelter-11.png">icons/map/POI/shelter-11.png</file>
+		<file alias="shop-11.png">icons/map/POI/shop-11.png</file>
+		<file alias="skiing-11.png">icons/map/POI/skiing-11.png</file>
+		<file alias="soccer-11.png">icons/map/POI/soccer-11.png</file>
+		<file alias="swimming-11.png">icons/map/POI/swimming-11.png</file>
+		<file alias="theatre-11.png">icons/map/POI/theatre-11.png</file>
+		<file alias="telephone-11.png">icons/map/POI/telephone-11.png</file>
+		<file alias="toilet-11.png">icons/map/POI/toilet-11.png</file>
+		<file alias="town-hall-11.png">icons/map/POI/town-hall-11.png</file>
+		<file alias="viewpoint-11.png">icons/map/POI/viewpoint-11.png</file>
+		<file alias="village-11.png">icons/map/POI/village-11.png</file>
+		<file alias="waterfall-11.png">icons/map/POI/waterfall-11.png</file>
+		<file alias="wetland-11.png">icons/map/POI/wetland-11.png</file>
+		<file alias="zoo-11.png">icons/map/POI/zoo-11.png</file>
+	</qresource>
+
+	<!-- marine stuff (IMG & ENC style) -->
+	<qresource prefix="/marine">
+		<file alias="light-major.png">icons/map/marine/light-major.png</file>
+		<file alias="light-platform.png">icons/map/marine/light-platform.png</file>
+		<file alias="buoy.png">icons/map/marine/buoy.png</file>
+		<file alias="beacon.png">icons/map/marine/beacon.png</file>
+		<file alias="rock-exposed.png">icons/map/marine/rock-exposed.png</file>
+		<file alias="rock-dangerous.png">icons/map/marine/rock-dangerous.png</file>
+		<file alias="wreck.png">icons/map/marine/wreck.png</file>
+		<file alias="wreck-exposed.png">icons/map/marine/wreck-exposed.png</file>
+		<file alias="wreck-dangerous.png">icons/map/marine/wreck-dangerous.png</file>
+		<file alias="obstruction.png">icons/map/marine/obstruction.png</file>
+		<file alias="obstruction-covers.png">icons/map/marine/obstruction-covers.png</file>
+		<file alias="anchor-line.png">icons/map/marine/anchor-line.png</file>
+		<file alias="noanchor-line.png">icons/map/marine/noanchor-line.png</file>
+		<file alias="cable-line.png">icons/map/marine/cable-line.png</file>
+		<file alias="pipeline.png">icons/map/marine/pipeline.png</file>
+		<file alias="cable.png">icons/map/marine/cable.png</file>
+		<file alias="anchorage.png">icons/map/marine/anchorage.png</file>
+		<file alias="anchoring-prohibited.png">icons/map/marine/anchoring-prohibited.png</file>
+		<file alias="church.png">icons/map/marine/church.png</file>
+		<file alias="triangulation-point.png">icons/map/marine/triangulation-point.png</file>
+		<file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
+		<file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
+		<file alias="pile.png">icons/map/marine/pile.png</file>
+		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
+		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
+		<file alias="tower.png">icons/map/marine/tower.png</file>
+		<file alias="chimney.png">icons/map/marine/chimney.png</file>
+		<file alias="platform.png">icons/map/marine/platform.png</file>
+		<file alias="ferry-line.png">icons/map/marine/ferry-line.png</file>
+		<file alias="dw-route-line.png">icons/map/marine/dw-route-line.png</file>
+		<file alias="fence-line.png">icons/map/marine/fence-line.png</file>
+		<file alias="crane.png">icons/map/marine/crane.png</file>
+		<file alias="distance-mark.png">icons/map/marine/distance-mark.png</file>
+		<file alias="distance-mark-land.png">icons/map/marine/distance-mark-land.png</file>
+		<file alias="conveyor-line.png">icons/map/marine/conveyor-line.png</file>
+		<file alias="pipeline-overhead.png">icons/map/marine/pipeline-overhead.png</file>
+		<file alias="coast-guard.png">icons/map/marine/coast-guard.png</file>
+		<file alias="monument.png">icons/map/marine/monument.png</file>
+		<file alias="radio.png">icons/map/marine/radio.png</file>
+		<file alias="radar.png">icons/map/marine/radar.png</file>
+		<file alias="radar-transponder.png">icons/map/marine/radar-transponder.png</file>
+		<file alias="silo.png">icons/map/marine/silo.png</file>
+		<file alias="turning-basin.png">icons/map/marine/turning-basin.png</file>
+		<file alias="entry-prohibited-line.png">icons/map/marine/entry-prohibited-line.png</file>
+		<file alias="safety-zone-line.png">icons/map/marine/safety-zone-line.png</file>
+		<file alias="cable-area-line.png">icons/map/marine/cable-area-line.png</file>
+		<file alias="pipeline-area-line.png">icons/map/marine/pipeline-area-line.png</file>
+		<file alias="windmotor.png">icons/map/marine/windmotor.png</file>
+		<file alias="gauge.png">icons/map/marine/gauge.png</file>
+		<file alias="fishing-farm-line.png">icons/map/marine/fishing-farm-line.png</file>
+		<file alias="shipyard.png">icons/map/marine/shipyard.png</file>
+		<file alias="pylon.png">icons/map/marine/pylon.png</file>
+		<file alias="fleeting-area.png">icons/map/marine/fleeting-area.png</file>
+		<file alias="breakers.png">icons/map/marine/breakers.png</file>
+		<file alias="overfalls.png">icons/map/marine/overfalls.png</file>
+		<file alias="boarding-place.png">icons/map/marine/boarding-place.png</file>
+		<file alias="light.png">icons/map/marine/light.png</file>
+		<file alias="building.png">icons/map/marine/building.png</file>
+		<file alias="fog-signal.png">icons/map/marine/fog-signal.png</file>
+		<file alias="construction.png">icons/map/marine/construction.png</file>
 	</qresource>
 
 	<!-- Mapsforge rendertheme -->
 	<qresource prefix="/mapsforge">
-		<file alias="default.xml">data/default.xml</file>
+		<file alias="default.xml">data/mapsforge/default.xml</file>
 
-		<file alias="patterns/hills.svg">icons/mapsforge/patterns/hills.svg</file>
-		<file alias="patterns/farmland.svg">icons/mapsforge/patterns/farmland.svg</file>
-		<file alias="patterns/coniferous.svg">icons/mapsforge/patterns/coniferous.svg</file>
-		<file alias="patterns/marsh.png">icons/mapsforge/patterns/marsh.png</file>
-		<file alias="patterns/dot.png">icons/mapsforge/patterns/dot.png</file>
-		<file alias="patterns/cemetery.png">icons/mapsforge/patterns/cemetery.png</file>
-		<file alias="patterns/rail.png">icons/mapsforge/patterns/rail.png</file>
-		<file alias="patterns/access-destination.png">icons/mapsforge/patterns/access-destination.png</file>
-		<file alias="patterns/deciduous.svg">icons/mapsforge/patterns/deciduous.svg</file>
-		<file alias="patterns/grass.svg">icons/mapsforge/patterns/grass.svg</file>
-		<file alias="patterns/wood-mixed.png">icons/mapsforge/patterns/wood-mixed.png</file>
-		<file alias="patterns/wood-deciduous.png">icons/mapsforge/patterns/wood-deciduous.png</file>
-		<file alias="patterns/pike.png">icons/mapsforge/patterns/pike.png</file>
-		<file alias="patterns/wood-coniferous.png">icons/mapsforge/patterns/wood-coniferous.png</file>
-		<file alias="patterns/coniferous_and_deciduous.svg">icons/mapsforge/patterns/coniferous_and_deciduous.svg</file>
-		<file alias="patterns/arrow.png">icons/mapsforge/patterns/arrow.png</file>
-		<file alias="patterns/military.png">icons/mapsforge/patterns/military.png</file>
-		<file alias="patterns/scrub.svg">icons/mapsforge/patterns/scrub.svg</file>
-		<file alias="patterns/nature-reserve.png">icons/mapsforge/patterns/nature-reserve.png</file>
-		<file alias="patterns/swamp.svg">icons/mapsforge/patterns/swamp.svg</file>
-		<file alias="patterns/quarry.svg">icons/mapsforge/patterns/quarry.svg</file>
-		<file alias="patterns/access-private.png">icons/mapsforge/patterns/access-private.png</file>
-		<file alias="symbols/barrier/blocks.svg">icons/mapsforge/symbols/barrier/blocks.svg</file>
-		<file alias="symbols/barrier/stile.svg">icons/mapsforge/symbols/barrier/stile.svg</file>
-		<file alias="symbols/barrier/cycle_barrier.svg">icons/mapsforge/symbols/barrier/cycle_barrier.svg</file>
-		<file alias="symbols/barrier/lift_gate.svg">icons/mapsforge/symbols/barrier/lift_gate.svg</file>
-		<file alias="symbols/barrier/bollard.svg">icons/mapsforge/symbols/barrier/bollard.svg</file>
-		<file alias="symbols/barrier/gate.svg">icons/mapsforge/symbols/barrier/gate.svg</file>
-		<file alias="symbols/dot_blue.svg">icons/mapsforge/symbols/dot_blue.svg</file>
-		<file alias="symbols/dot_blue_dark.svg">icons/mapsforge/symbols/dot_blue_dark.svg</file>
-		<file alias="symbols/peak.svg">icons/mapsforge/symbols/peak.svg</file>
-		<file alias="symbols/traffic_signal.svg">icons/mapsforge/symbols/traffic_signal.svg</file>
-		<file alias="symbols/place_of_worship/hindu.svg">icons/mapsforge/symbols/place_of_worship/hindu.svg</file>
-		<file alias="symbols/place_of_worship/unknown.svg">icons/mapsforge/symbols/place_of_worship/unknown.svg</file>
-		<file alias="symbols/place_of_worship/islamic.svg">icons/mapsforge/symbols/place_of_worship/islamic.svg</file>
-		<file alias="symbols/place_of_worship/jewish.svg">icons/mapsforge/symbols/place_of_worship/jewish.svg</file>
-		<file alias="symbols/place_of_worship/shinto.svg">icons/mapsforge/symbols/place_of_worship/shinto.svg</file>
-		<file alias="symbols/place_of_worship/buddhist.svg">icons/mapsforge/symbols/place_of_worship/buddhist.svg</file>
-		<file alias="symbols/place_of_worship/christian.svg">icons/mapsforge/symbols/place_of_worship/christian.svg</file>
-		<file alias="symbols/volcano.svg">icons/mapsforge/symbols/volcano.svg</file>
-		<file alias="symbols/bench.svg">icons/mapsforge/symbols/bench.svg</file>
-		<file alias="symbols/transport/parking_private.svg">icons/mapsforge/symbols/transport/parking_private.svg</file>
-		<file alias="symbols/transport/helicopter.svg">icons/mapsforge/symbols/transport/helicopter.svg</file>
-		<file alias="symbols/transport/rental_bicycle.svg">icons/mapsforge/symbols/transport/rental_bicycle.svg</file>
-		<file alias="symbols/transport/train_station2.svg">icons/mapsforge/symbols/transport/train_station2.svg</file>
-		<file alias="symbols/transport/parking.svg">icons/mapsforge/symbols/transport/parking.svg</file>
-		<file alias="symbols/transport/slipway.svg">icons/mapsforge/symbols/transport/slipway.svg</file>
-		<file alias="symbols/transport/bus_stop.svg">icons/mapsforge/symbols/transport/bus_stop.svg</file>
-		<file alias="symbols/transport/bus_station.svg">icons/mapsforge/symbols/transport/bus_station.svg</file>
-		<file alias="symbols/transport/airport2.svg">icons/mapsforge/symbols/transport/airport2.svg</file>
-		<file alias="symbols/transport/fuel.svg">icons/mapsforge/symbols/transport/fuel.svg</file>
-		<file alias="symbols/transport/lighthouse.svg">icons/mapsforge/symbols/transport/lighthouse.svg</file>
-		<file alias="symbols/transport/traffic_lights.svg">icons/mapsforge/symbols/transport/traffic_lights.svg</file>
-		<file alias="symbols/transport/tram_stop.svg">icons/mapsforge/symbols/transport/tram_stop.svg</file>
-		<file alias="symbols/food/bar.svg">icons/mapsforge/symbols/food/bar.svg</file>
-		<file alias="symbols/food/cafe.svg">icons/mapsforge/symbols/food/cafe.svg</file>
-		<file alias="symbols/food/drinkingtap.svg">icons/mapsforge/symbols/food/drinkingtap.svg</file>
-		<file alias="symbols/food/pub.svg">icons/mapsforge/symbols/food/pub.svg</file>
-		<file alias="symbols/food/fastfood.svg">icons/mapsforge/symbols/food/fastfood.svg</file>
-		<file alias="symbols/food/biergarten.svg">icons/mapsforge/symbols/food/biergarten.svg</file>
-		<file alias="symbols/food/restaurant.svg">icons/mapsforge/symbols/food/restaurant.svg</file>
-		<file alias="symbols/railway-crossing.svg">icons/mapsforge/symbols/railway-crossing.svg</file>
-		<file alias="symbols/accommodation/hotel2.svg">icons/mapsforge/symbols/accommodation/hotel2.svg</file>
-		<file alias="symbols/accommodation/camping.svg">icons/mapsforge/symbols/accommodation/camping.svg</file>
-		<file alias="symbols/accommodation/chalet.svg">icons/mapsforge/symbols/accommodation/chalet.svg</file>
-		<file alias="symbols/accommodation/alpinehut.svg">icons/mapsforge/symbols/accommodation/alpinehut.svg</file>
-		<file alias="symbols/accommodation/shelter2.svg">icons/mapsforge/symbols/accommodation/shelter2.svg</file>
-		<file alias="symbols/accommodation/caravan_park.svg">icons/mapsforge/symbols/accommodation/caravan_park.svg</file>
-		<file alias="symbols/accommodation/hostel.svg">icons/mapsforge/symbols/accommodation/hostel.svg</file>
-		<file alias="symbols/health/doctors2.svg">icons/mapsforge/symbols/health/doctors2.svg</file>
-		<file alias="symbols/health/hospital.svg">icons/mapsforge/symbols/health/hospital.svg</file>
-		<file alias="symbols/health/pharmacy.svg">icons/mapsforge/symbols/health/pharmacy.svg</file>
-		<file alias="symbols/chair_lift.svg">icons/mapsforge/symbols/chair_lift.svg</file>
-		<file alias="symbols/education/school.svg">icons/mapsforge/symbols/education/school.svg</file>
-		<file alias="symbols/education/nursery3.svg">icons/mapsforge/symbols/education/nursery3.svg</file>
-		<file alias="symbols/education/university.svg">icons/mapsforge/symbols/education/university.svg</file>
-		<file alias="symbols/money/atm2.svg">icons/mapsforge/symbols/money/atm2.svg</file>
-		<file alias="symbols/money/bank2.svg">icons/mapsforge/symbols/money/bank2.svg</file>
-		<file alias="symbols/shopping/marketplace.svg">icons/mapsforge/symbols/shopping/marketplace.svg</file>
-		<file alias="symbols/shopping/bicycle.svg">icons/mapsforge/symbols/shopping/bicycle.svg</file>
-		<file alias="symbols/shopping/alcohol.svg">icons/mapsforge/symbols/shopping/alcohol.svg</file>
-		<file alias="symbols/shopping/diy.svg">icons/mapsforge/symbols/shopping/diy.svg</file>
-		<file alias="symbols/shopping/bakery.svg">icons/mapsforge/symbols/shopping/bakery.svg</file>
-		<file alias="symbols/shopping/greengrocer.svg">icons/mapsforge/symbols/shopping/greengrocer.svg</file>
-		<file alias="symbols/shopping/laundrette.svg">icons/mapsforge/symbols/shopping/laundrette.svg</file>
-		<file alias="symbols/shopping/car_repair.svg">icons/mapsforge/symbols/shopping/car_repair.svg</file>
-		<file alias="symbols/shopping/butcher.svg">icons/mapsforge/symbols/shopping/butcher.svg</file>
-		<file alias="symbols/shopping/book.svg">icons/mapsforge/symbols/shopping/book.svg</file>
-		<file alias="symbols/shopping/convenience.svg">icons/mapsforge/symbols/shopping/convenience.svg</file>
-		<file alias="symbols/shopping/supermarket.svg">icons/mapsforge/symbols/shopping/supermarket.svg</file>
-		<file alias="symbols/poi/mountain_pass.svg">icons/mapsforge/symbols/poi/mountain_pass.svg</file>
-		<file alias="symbols/poi/embassy2.svg">icons/mapsforge/symbols/poi/embassy2.svg</file>
-		<file alias="symbols/poi/cave.svg">icons/mapsforge/symbols/poi/cave.svg</file>
-		<file alias="symbols/cable_car.svg">icons/mapsforge/symbols/cable_car.svg</file>
-		<file alias="symbols/railway-crossing-small.svg">icons/mapsforge/symbols/railway-crossing-small.svg</file>
-		<file alias="symbols/dot_magenta.svg">icons/mapsforge/symbols/dot_magenta.svg</file>
-		<file alias="symbols/dot_black.svg">icons/mapsforge/symbols/dot_black.svg</file>
-		<file alias="symbols/gondola.svg">icons/mapsforge/symbols/gondola.svg</file>
-		<file alias="symbols/dot_white.svg">icons/mapsforge/symbols/dot_white.svg</file>
-		<file alias="symbols/amenity/recycling.svg">icons/mapsforge/symbols/amenity/recycling.svg</file>
-		<file alias="symbols/amenity/firestation3.svg">icons/mapsforge/symbols/amenity/firestation3.svg</file>
-		<file alias="symbols/amenity/telephone.svg">icons/mapsforge/symbols/amenity/telephone.svg</file>
-		<file alias="symbols/amenity/post_box.svg">icons/mapsforge/symbols/amenity/post_box.svg</file>
-		<file alias="symbols/amenity/fountain2.svg">icons/mapsforge/symbols/amenity/fountain2.svg</file>
-		<file alias="symbols/amenity/playground.svg">icons/mapsforge/symbols/amenity/playground.svg</file>
-		<file alias="symbols/amenity/library.svg">icons/mapsforge/symbols/amenity/library.svg</file>
-		<file alias="symbols/amenity/post_office.svg">icons/mapsforge/symbols/amenity/post_office.svg</file>
-		<file alias="symbols/amenity/police2.svg">icons/mapsforge/symbols/amenity/police2.svg</file>
-		<file alias="symbols/amenity/toilets.svg">icons/mapsforge/symbols/amenity/toilets.svg</file>
-		<file alias="symbols/tourist/picnic.svg">icons/mapsforge/symbols/tourist/picnic.svg</file>
-		<file alias="symbols/tourist/monument.svg">icons/mapsforge/symbols/tourist/monument.svg</file>
-		<file alias="symbols/tourist/archaeological2.svg">icons/mapsforge/symbols/tourist/archaeological2.svg</file>
-		<file alias="symbols/tourist/museum.svg">icons/mapsforge/symbols/tourist/museum.svg</file>
-		<file alias="symbols/tourist/attraction.svg">icons/mapsforge/symbols/tourist/attraction.svg</file>
-		<file alias="symbols/tourist/information.svg">icons/mapsforge/symbols/tourist/information.svg</file>
-		<file alias="symbols/tourist/theatre.svg">icons/mapsforge/symbols/tourist/theatre.svg</file>
-		<file alias="symbols/tourist/zoo.svg">icons/mapsforge/symbols/tourist/zoo.svg</file>
-		<file alias="symbols/tourist/cinema2.svg">icons/mapsforge/symbols/tourist/cinema2.svg</file>
-		<file alias="symbols/tourist/castle2.svg">icons/mapsforge/symbols/tourist/castle2.svg</file>
-		<file alias="symbols/tourist/ruin.svg">icons/mapsforge/symbols/tourist/ruin.svg</file>
-		<file alias="symbols/tourist/memorial.svg">icons/mapsforge/symbols/tourist/memorial.svg</file>
-		<file alias="symbols/tourist/view_point.svg">icons/mapsforge/symbols/tourist/view_point.svg</file>
-		<file alias="symbols/tourist/windmill.svg">icons/mapsforge/symbols/tourist/windmill.svg</file>
-		<file alias="symbols/water/weir.svg">icons/mapsforge/symbols/water/weir.svg</file>
-		<file alias="symbols/sport/swimming_outdoor.svg">icons/mapsforge/symbols/sport/swimming_outdoor.svg</file>
-		<file alias="symbols/sport/tennis.svg">icons/mapsforge/symbols/sport/tennis.svg</file>
-		<file alias="symbols/sport/shooting.svg">icons/mapsforge/symbols/sport/shooting.svg</file>
-		<file alias="symbols/sport/stadium.svg">icons/mapsforge/symbols/sport/stadium.svg</file>
-		<file alias="symbols/sport/soccer.svg">icons/mapsforge/symbols/sport/soccer.svg</file>
-		<file alias="symbols/sport/golf.svg">icons/mapsforge/symbols/sport/golf.svg</file>
-		<file alias="symbols/oneway.svg">icons/mapsforge/symbols/oneway.svg</file>
+		<file alias="patterns/hills.svg">icons/map/mapsforge/patterns/hills.svg</file>
+		<file alias="patterns/farmland.svg">icons/map/mapsforge/patterns/farmland.svg</file>
+		<file alias="patterns/coniferous.svg">icons/map/mapsforge/patterns/coniferous.svg</file>
+		<file alias="patterns/marsh.png">icons/map/mapsforge/patterns/marsh.png</file>
+		<file alias="patterns/dot.png">icons/map/mapsforge/patterns/dot.png</file>
+		<file alias="patterns/cemetery.png">icons/map/mapsforge/patterns/cemetery.png</file>
+		<file alias="patterns/rail.png">icons/map/mapsforge/patterns/rail.png</file>
+		<file alias="patterns/access-destination.png">icons/map/mapsforge/patterns/access-destination.png</file>
+		<file alias="patterns/deciduous.svg">icons/map/mapsforge/patterns/deciduous.svg</file>
+		<file alias="patterns/grass.svg">icons/map/mapsforge/patterns/grass.svg</file>
+		<file alias="patterns/wood-mixed.png">icons/map/mapsforge/patterns/wood-mixed.png</file>
+		<file alias="patterns/wood-deciduous.png">icons/map/mapsforge/patterns/wood-deciduous.png</file>
+		<file alias="patterns/pike.png">icons/map/mapsforge/patterns/pike.png</file>
+		<file alias="patterns/wood-coniferous.png">icons/map/mapsforge/patterns/wood-coniferous.png</file>
+		<file alias="patterns/coniferous_and_deciduous.svg">icons/map/mapsforge/patterns/coniferous_and_deciduous.svg</file>
+		<file alias="patterns/arrow.png">icons/map/mapsforge/patterns/arrow.png</file>
+		<file alias="patterns/military.png">icons/map/mapsforge/patterns/military.png</file>
+		<file alias="patterns/scrub.svg">icons/map/mapsforge/patterns/scrub.svg</file>
+		<file alias="patterns/nature-reserve.png">icons/map/mapsforge/patterns/nature-reserve.png</file>
+		<file alias="patterns/swamp.svg">icons/map/mapsforge/patterns/swamp.svg</file>
+		<file alias="patterns/quarry.svg">icons/map/mapsforge/patterns/quarry.svg</file>
+		<file alias="patterns/access-private.png">icons/map/mapsforge/patterns/access-private.png</file>
+		<file alias="symbols/barrier/blocks.svg">icons/map/mapsforge/symbols/barrier/blocks.svg</file>
+		<file alias="symbols/barrier/stile.svg">icons/map/mapsforge/symbols/barrier/stile.svg</file>
+		<file alias="symbols/barrier/cycle_barrier.svg">icons/map/mapsforge/symbols/barrier/cycle_barrier.svg</file>
+		<file alias="symbols/barrier/lift_gate.svg">icons/map/mapsforge/symbols/barrier/lift_gate.svg</file>
+		<file alias="symbols/barrier/bollard.svg">icons/map/mapsforge/symbols/barrier/bollard.svg</file>
+		<file alias="symbols/barrier/gate.svg">icons/map/mapsforge/symbols/barrier/gate.svg</file>
+		<file alias="symbols/dot_blue.svg">icons/map/mapsforge/symbols/dot_blue.svg</file>
+		<file alias="symbols/dot_blue_dark.svg">icons/map/mapsforge/symbols/dot_blue_dark.svg</file>
+		<file alias="symbols/peak.svg">icons/map/mapsforge/symbols/peak.svg</file>
+		<file alias="symbols/traffic_signal.svg">icons/map/mapsforge/symbols/traffic_signal.svg</file>
+		<file alias="symbols/place_of_worship/hindu.svg">icons/map/mapsforge/symbols/place_of_worship/hindu.svg</file>
+		<file alias="symbols/place_of_worship/unknown.svg">icons/map/mapsforge/symbols/place_of_worship/unknown.svg</file>
+		<file alias="symbols/place_of_worship/islamic.svg">icons/map/mapsforge/symbols/place_of_worship/islamic.svg</file>
+		<file alias="symbols/place_of_worship/jewish.svg">icons/map/mapsforge/symbols/place_of_worship/jewish.svg</file>
+		<file alias="symbols/place_of_worship/shinto.svg">icons/map/mapsforge/symbols/place_of_worship/shinto.svg</file>
+		<file alias="symbols/place_of_worship/buddhist.svg">icons/map/mapsforge/symbols/place_of_worship/buddhist.svg</file>
+		<file alias="symbols/place_of_worship/christian.svg">icons/map/mapsforge/symbols/place_of_worship/christian.svg</file>
+		<file alias="symbols/volcano.svg">icons/map/mapsforge/symbols/volcano.svg</file>
+		<file alias="symbols/bench.svg">icons/map/mapsforge/symbols/bench.svg</file>
+		<file alias="symbols/transport/parking_private.svg">icons/map/mapsforge/symbols/transport/parking_private.svg</file>
+		<file alias="symbols/transport/helicopter.svg">icons/map/mapsforge/symbols/transport/helicopter.svg</file>
+		<file alias="symbols/transport/rental_bicycle.svg">icons/map/mapsforge/symbols/transport/rental_bicycle.svg</file>
+		<file alias="symbols/transport/train_station2.svg">icons/map/mapsforge/symbols/transport/train_station2.svg</file>
+		<file alias="symbols/transport/parking.svg">icons/map/mapsforge/symbols/transport/parking.svg</file>
+		<file alias="symbols/transport/slipway.svg">icons/map/mapsforge/symbols/transport/slipway.svg</file>
+		<file alias="symbols/transport/bus_stop.svg">icons/map/mapsforge/symbols/transport/bus_stop.svg</file>
+		<file alias="symbols/transport/bus_station.svg">icons/map/mapsforge/symbols/transport/bus_station.svg</file>
+		<file alias="symbols/transport/airport2.svg">icons/map/mapsforge/symbols/transport/airport2.svg</file>
+		<file alias="symbols/transport/fuel.svg">icons/map/mapsforge/symbols/transport/fuel.svg</file>
+		<file alias="symbols/transport/lighthouse.svg">icons/map/mapsforge/symbols/transport/lighthouse.svg</file>
+		<file alias="symbols/transport/traffic_lights.svg">icons/map/mapsforge/symbols/transport/traffic_lights.svg</file>
+		<file alias="symbols/transport/tram_stop.svg">icons/map/mapsforge/symbols/transport/tram_stop.svg</file>
+		<file alias="symbols/food/bar.svg">icons/map/mapsforge/symbols/food/bar.svg</file>
+		<file alias="symbols/food/cafe.svg">icons/map/mapsforge/symbols/food/cafe.svg</file>
+		<file alias="symbols/food/drinkingtap.svg">icons/map/mapsforge/symbols/food/drinkingtap.svg</file>
+		<file alias="symbols/food/pub.svg">icons/map/mapsforge/symbols/food/pub.svg</file>
+		<file alias="symbols/food/fastfood.svg">icons/map/mapsforge/symbols/food/fastfood.svg</file>
+		<file alias="symbols/food/biergarten.svg">icons/map/mapsforge/symbols/food/biergarten.svg</file>
+		<file alias="symbols/food/restaurant.svg">icons/map/mapsforge/symbols/food/restaurant.svg</file>
+		<file alias="symbols/railway-crossing.svg">icons/map/mapsforge/symbols/railway-crossing.svg</file>
+		<file alias="symbols/accommodation/hotel2.svg">icons/map/mapsforge/symbols/accommodation/hotel2.svg</file>
+		<file alias="symbols/accommodation/camping.svg">icons/map/mapsforge/symbols/accommodation/camping.svg</file>
+		<file alias="symbols/accommodation/chalet.svg">icons/map/mapsforge/symbols/accommodation/chalet.svg</file>
+		<file alias="symbols/accommodation/alpinehut.svg">icons/map/mapsforge/symbols/accommodation/alpinehut.svg</file>
+		<file alias="symbols/accommodation/shelter2.svg">icons/map/mapsforge/symbols/accommodation/shelter2.svg</file>
+		<file alias="symbols/accommodation/caravan_park.svg">icons/map/mapsforge/symbols/accommodation/caravan_park.svg</file>
+		<file alias="symbols/accommodation/hostel.svg">icons/map/mapsforge/symbols/accommodation/hostel.svg</file>
+		<file alias="symbols/health/doctors2.svg">icons/map/mapsforge/symbols/health/doctors2.svg</file>
+		<file alias="symbols/health/hospital.svg">icons/map/mapsforge/symbols/health/hospital.svg</file>
+		<file alias="symbols/health/pharmacy.svg">icons/map/mapsforge/symbols/health/pharmacy.svg</file>
+		<file alias="symbols/chair_lift.svg">icons/map/mapsforge/symbols/chair_lift.svg</file>
+		<file alias="symbols/education/school.svg">icons/map/mapsforge/symbols/education/school.svg</file>
+		<file alias="symbols/education/nursery3.svg">icons/map/mapsforge/symbols/education/nursery3.svg</file>
+		<file alias="symbols/education/university.svg">icons/map/mapsforge/symbols/education/university.svg</file>
+		<file alias="symbols/money/atm2.svg">icons/map/mapsforge/symbols/money/atm2.svg</file>
+		<file alias="symbols/money/bank2.svg">icons/map/mapsforge/symbols/money/bank2.svg</file>
+		<file alias="symbols/shopping/marketplace.svg">icons/map/mapsforge/symbols/shopping/marketplace.svg</file>
+		<file alias="symbols/shopping/bicycle.svg">icons/map/mapsforge/symbols/shopping/bicycle.svg</file>
+		<file alias="symbols/shopping/alcohol.svg">icons/map/mapsforge/symbols/shopping/alcohol.svg</file>
+		<file alias="symbols/shopping/diy.svg">icons/map/mapsforge/symbols/shopping/diy.svg</file>
+		<file alias="symbols/shopping/bakery.svg">icons/map/mapsforge/symbols/shopping/bakery.svg</file>
+		<file alias="symbols/shopping/greengrocer.svg">icons/map/mapsforge/symbols/shopping/greengrocer.svg</file>
+		<file alias="symbols/shopping/laundrette.svg">icons/map/mapsforge/symbols/shopping/laundrette.svg</file>
+		<file alias="symbols/shopping/car_repair.svg">icons/map/mapsforge/symbols/shopping/car_repair.svg</file>
+		<file alias="symbols/shopping/butcher.svg">icons/map/mapsforge/symbols/shopping/butcher.svg</file>
+		<file alias="symbols/shopping/book.svg">icons/map/mapsforge/symbols/shopping/book.svg</file>
+		<file alias="symbols/shopping/convenience.svg">icons/map/mapsforge/symbols/shopping/convenience.svg</file>
+		<file alias="symbols/shopping/supermarket.svg">icons/map/mapsforge/symbols/shopping/supermarket.svg</file>
+		<file alias="symbols/poi/mountain_pass.svg">icons/map/mapsforge/symbols/poi/mountain_pass.svg</file>
+		<file alias="symbols/poi/embassy2.svg">icons/map/mapsforge/symbols/poi/embassy2.svg</file>
+		<file alias="symbols/poi/cave.svg">icons/map/mapsforge/symbols/poi/cave.svg</file>
+		<file alias="symbols/cable_car.svg">icons/map/mapsforge/symbols/cable_car.svg</file>
+		<file alias="symbols/railway-crossing-small.svg">icons/map/mapsforge/symbols/railway-crossing-small.svg</file>
+		<file alias="symbols/dot_magenta.svg">icons/map/mapsforge/symbols/dot_magenta.svg</file>
+		<file alias="symbols/dot_black.svg">icons/map/mapsforge/symbols/dot_black.svg</file>
+		<file alias="symbols/gondola.svg">icons/map/mapsforge/symbols/gondola.svg</file>
+		<file alias="symbols/dot_white.svg">icons/map/mapsforge/symbols/dot_white.svg</file>
+		<file alias="symbols/amenity/recycling.svg">icons/map/mapsforge/symbols/amenity/recycling.svg</file>
+		<file alias="symbols/amenity/firestation3.svg">icons/map/mapsforge/symbols/amenity/firestation3.svg</file>
+		<file alias="symbols/amenity/telephone.svg">icons/map/mapsforge/symbols/amenity/telephone.svg</file>
+		<file alias="symbols/amenity/post_box.svg">icons/map/mapsforge/symbols/amenity/post_box.svg</file>
+		<file alias="symbols/amenity/fountain2.svg">icons/map/mapsforge/symbols/amenity/fountain2.svg</file>
+		<file alias="symbols/amenity/playground.svg">icons/map/mapsforge/symbols/amenity/playground.svg</file>
+		<file alias="symbols/amenity/library.svg">icons/map/mapsforge/symbols/amenity/library.svg</file>
+		<file alias="symbols/amenity/post_office.svg">icons/map/mapsforge/symbols/amenity/post_office.svg</file>
+		<file alias="symbols/amenity/police2.svg">icons/map/mapsforge/symbols/amenity/police2.svg</file>
+		<file alias="symbols/amenity/toilets.svg">icons/map/mapsforge/symbols/amenity/toilets.svg</file>
+		<file alias="symbols/tourist/picnic.svg">icons/map/mapsforge/symbols/tourist/picnic.svg</file>
+		<file alias="symbols/tourist/monument.svg">icons/map/mapsforge/symbols/tourist/monument.svg</file>
+		<file alias="symbols/tourist/archaeological2.svg">icons/map/mapsforge/symbols/tourist/archaeological2.svg</file>
+		<file alias="symbols/tourist/museum.svg">icons/map/mapsforge/symbols/tourist/museum.svg</file>
+		<file alias="symbols/tourist/attraction.svg">icons/map/mapsforge/symbols/tourist/attraction.svg</file>
+		<file alias="symbols/tourist/information.svg">icons/map/mapsforge/symbols/tourist/information.svg</file>
+		<file alias="symbols/tourist/theatre.svg">icons/map/mapsforge/symbols/tourist/theatre.svg</file>
+		<file alias="symbols/tourist/zoo.svg">icons/map/mapsforge/symbols/tourist/zoo.svg</file>
+		<file alias="symbols/tourist/cinema2.svg">icons/map/mapsforge/symbols/tourist/cinema2.svg</file>
+		<file alias="symbols/tourist/castle2.svg">icons/map/mapsforge/symbols/tourist/castle2.svg</file>
+		<file alias="symbols/tourist/ruin.svg">icons/map/mapsforge/symbols/tourist/ruin.svg</file>
+		<file alias="symbols/tourist/memorial.svg">icons/map/mapsforge/symbols/tourist/memorial.svg</file>
+		<file alias="symbols/tourist/view_point.svg">icons/map/mapsforge/symbols/tourist/view_point.svg</file>
+		<file alias="symbols/tourist/windmill.svg">icons/map/mapsforge/symbols/tourist/windmill.svg</file>
+		<file alias="symbols/water/weir.svg">icons/map/mapsforge/symbols/water/weir.svg</file>
+		<file alias="symbols/sport/swimming_outdoor.svg">icons/map/mapsforge/symbols/sport/swimming_outdoor.svg</file>
+		<file alias="symbols/sport/tennis.svg">icons/map/mapsforge/symbols/sport/tennis.svg</file>
+		<file alias="symbols/sport/shooting.svg">icons/map/mapsforge/symbols/sport/shooting.svg</file>
+		<file alias="symbols/sport/stadium.svg">icons/map/mapsforge/symbols/sport/stadium.svg</file>
+		<file alias="symbols/sport/soccer.svg">icons/map/mapsforge/symbols/sport/soccer.svg</file>
+		<file alias="symbols/sport/golf.svg">icons/map/mapsforge/symbols/sport/golf.svg</file>
+		<file alias="symbols/oneway.svg">icons/map/mapsforge/symbols/oneway.svg</file>
 	</qresource>
 </RCC>

icons/formats/scripts/extensions

@@ -27,3 +27,7 @@ itn:#b8540d
 wld:#c74c8f
 omd:#ed09cb
 ghp:#ed09cb
+qct:#370642
+trk:#cccccc
+gemf:#147085
+000:#000000