Merge branch 'origin/master' into Weblate.

Translated using Weblate (Hungarian)
Currently translated at 100.0% (438 of 438 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2025-07-01 05:19:15 +02:00 · 2021-12-06 22:59:40 +01:00 · 2021-12-06 22:59:40 +01:00 · 2021-12-06 22:58:49 +01:00 · 2021-12-05 21:30:16 +01:00 · 2021-12-05 21:30:08 +01:00
682 changed files with 29704 additions and 10840 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 8.1.{build}
+version: 10.0.{build}

 configuration:
  - Release
@ -8,58 +8,36 @@ 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.2\msvc2019_64
+    NSISDEF: /DQT6

 install:
- cmd: >-
+- 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: >-
+- cmd: |-
    lrelease gpxsee.pro
-
    qmake gpxsee.pro
-
    nmake release

-
    md installer
-
    copy release\GPXSee.exe installer
-
-    windeployqt --no-svg --release installer\GPXSee.exe
-
-    copy pkg\%NSI% installer
-
-    copy pkg\macros.nsh installer
-
+    windeployqt --release installer\GPXSee.exe
+    copy pkg\gpxsee64.nsi installer
    xcopy pkg\csv installer\csv /i
-
    xcopy pkg\maps installer\maps /i
-
    xcopy lang\*.qm installer\translations\ /sy
-
+    xcopy icons\symbols installer\symbols /i
    copy licence.txt installer
+    copy %OPENSSLDIR%\libcrypto-1_1-x64.dll installer
+    copy %OPENSSLDIR%\libssl-1_1-x64.dll installer

-    copy %OPENSSLDIR%\%LIBCRYPTO% installer
+    makensis.exe %NSISDEF% installer\gpxsee64.nsi

-    copy %OPENSSLDIR%\%LIBSSL% installer
-
-
-    makensis.exe installer\%NSI%
 artifacts:
 - path: installer\GPXSee-*.exe
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -0,0 +1,24 @@
+name: Linux
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: GPXSee
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev
+      - name: Create localization
+        run: lrelease gpxsee.pro
+      - name: Configure build
+        run: qmake gpxsee.pro
+      - name: Build project
+        run: make -j2
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@ -0,0 +1,31 @@
+name: OS X
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: GPXSee
+    runs-on: macos-10.15
+    steps:
+      - name: Set environment variables
+        run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: brew install qt5
+      - name: Create localization
+        run: lrelease gpxsee.pro
+      - name: Configure build
+        run: qmake gpxsee.pro
+      - name: Build project
+        run: make -j3
+      - name: Create DMG
+        run: macdeployqt GPXSee.app -dmg
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: GPXSee.dmg
+          path: GPXSee.dmg
--- a/.travis.yml
+++ b/.travis.yml
@ -1,21 +0,0 @@
-language: c++
-
-os:
-  - linux
-  - osx
-
-dist: focal
-
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-
-install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install qtbase5-dev qtbase5-private-dev libqt5opengl5-dev qttools5-dev-tools; fi
-
-script:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi
-  - lrelease gpxsee.pro
-  - qmake gpxsee.pro
-  - make
--- a/README.md
+++ b/README.md
@ -1,11 +1,19 @@
 # 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 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).
-* 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 and
+  geotagged JPEG files.
+* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS,
+  QuadTiles).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
+  Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts, KMZ maps,
+  AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps, Mapsforge vector maps,
+  QCT maps, ESRI World-File georeferenced images).
+* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts
+  graphs.
 * Support for DEM files (SRTM HGT).
 * Support for multiple tracks in one view.
 * Support for POI files.
@ -18,8 +26,9 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G

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

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

+_* Qt6 builds do not support other encodings than UTF-X and iso8859-1 in XML
+files as support for such files was dropped in Qt6._
+
 ## Download
 * [Windows & OS X builds](http://sourceforge.net/projects/gpxsee)
 * [Linux packages](http://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee)
@ -42,16 +54,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/IMG) - 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
+* [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp),
+  [LCC](src/map/proj/lambertconic.cpp), [Mercator](src/map/proj/mercator.cpp),
+  [Polar Stereographic](src/map/proj/polarstereographic.cpp),
+  [Polyconic](src/map/proj/polyconic.cpp) and
+  [Transverse Mercator](src/map/proj/transversemercator.cpp) projections - NIMA
+  Source Code Disclaimer
 * [Projection parameters CSV files](pkg/csv) - BSD/EPSG/Public domain
+* [Mapsforge render theme](data/default.xml) and its [icons](icons/mapsforge) - LGPLv3
--- a/data/default.xml
+++ b/data/default.xml
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx {
 } else {
    TARGET = GPXSee
 }
-VERSION = 8.1
+VERSION = 10.0

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

+CONFIG += object_parallel_to_source
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
-    src/GUI/axislabelitem.h \
-    src/GUI/graphicsscene.h \
-    src/GUI/mapaction.h \
-    src/GUI/mapitem.h \
-    src/GUI/marginswidget.h \
-    src/GUI/planeitem.h \
-    src/GUI/popup.h \
+    src/GUI/crosshairitem.h \
+    src/GUI/motioninfoitem.h \
+    src/GUI/pluginparameters.h \
    src/common/garmin.h \
    src/common/coordinates.h \
    src/common/range.h \
    src/common/rectc.h \
    src/common/textcodec.h \
+    src/common/treenode.h \
    src/common/wgs84.h \
    src/common/util.h \
    src/common/rtree.h \
@ -36,6 +38,23 @@ HEADERS += src/common/config.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/GUI/authenticationwidget.h \
+    src/GUI/axislabelitem.h \
+    src/GUI/dirselectwidget.h \
+    src/GUI/flowlayout.h \
+    src/GUI/graphicsscene.h \
+    src/GUI/infolabel.h \
+    src/GUI/mapaction.h \
+    src/GUI/mapitem.h \
+    src/GUI/marginswidget.h \
+    src/GUI/markerinfoitem.h \
+    src/GUI/planeitem.h \
+    src/GUI/poiaction.h \
+    src/GUI/popup.h \
+    src/GUI/thumbnail.h \
    src/GUI/app.h \
    src/GUI/icons.h \
    src/GUI/gui.h \
@ -86,38 +105,66 @@ HEADERS += src/common/config.h \
    src/GUI/mapview.h \
    src/GUI/font.h \
    src/GUI/areaitem.h \
-    src/data/link.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/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/IMG/bitmapline.h \
    src/map/IMG/bitstream.h \
    src/map/IMG/deltastream.h \
-    src/map/IMG/gmap.h \
+    src/map/IMG/gmapdata.h \
    src/map/IMG/huffmanbuffer.h \
    src/map/IMG/huffmanstream.h \
    src/map/IMG/huffmantable.h \
    src/map/IMG/huffmantext.h \
    src/map/IMG/nodfile.h \
    src/map/IMG/mapdata.h \
+    src/map/IMG/raster.h \
    src/map/IMG/rastertile.h \
-    src/map/IMG/textpathitem.h \
-    src/map/IMG/textpointitem.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/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/webmercator.h \
-    src/map/transversemercator.h \
-    src/map/latlon.h \
+    src/map/sqlitemap.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 \
-    src/map/downloader.h \
    src/map/tile.h \
    src/map/emptymap.h \
    src/map/ozimap.h \
@ -136,6 +183,7 @@ HEADERS += src/common/config.h \
    src/map/ct.h \
    src/map/mapsource.h \
    src/map/tileloader.h \
+    src/map/wldfile.h \
    src/map/wmtsmap.h \
    src/map/wmts.h \
    src/map/wmsmap.h \
@ -145,14 +193,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 \
@ -175,44 +231,20 @@ HEADERS += src/common/config.h \
    src/data/locparser.h \
    src/data/slfparser.h \
    src/data/dem.h \
-    src/data/polygon.h \
+    src/data/demloader.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/img.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/limitedcombobox.h \
-    src/GUI/pathtickitem.h \
-    src/map/IMG/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/data/geojsonparser.h

 SOURCES += src/main.cpp \
-    src/GUI/axislabelitem.cpp \
-    src/GUI/mapitem.cpp \
-    src/GUI/marginswidget.cpp \
-    src/GUI/popup.cpp \
+    src/GUI/crosshairitem.cpp \
+    src/GUI/motioninfoitem.cpp \
+    src/GUI/pluginparameters.cpp \
    src/common/coordinates.cpp \
    src/common/rectc.cpp \
    src/common/range.cpp \
@ -221,6 +253,17 @@ SOURCES += src/main.cpp \
    src/common/greatcircle.cpp \
    src/common/programpaths.cpp \
    src/common/tifffile.cpp \
+    src/common/downloader.cpp \
+    src/GUI/authenticationwidget.cpp \
+    src/GUI/axislabelitem.cpp \
+    src/GUI/dirselectwidget.cpp \
+    src/GUI/flowlayout.cpp \
+    src/GUI/infolabel.cpp \
+    src/GUI/mapitem.cpp \
+    src/GUI/marginswidget.cpp \
+    src/GUI/markerinfoitem.cpp \
+    src/GUI/popup.cpp \
+    src/GUI/thumbnail.cpp \
    src/GUI/app.cpp \
    src/GUI/gui.cpp \
    src/GUI/axisitem.cpp \
@ -240,7 +283,6 @@ SOURCES += src/main.cpp \
    src/GUI/fileselectwidget.cpp \
    src/GUI/temperaturegraph.cpp \
    src/GUI/trackitem.cpp \
-    src/GUI/tooltip.cpp \
    src/GUI/routeitem.cpp \
    src/GUI/graphitem.cpp \
    src/GUI/pathitem.cpp \
@ -263,11 +305,27 @@ SOURCES += src/main.cpp \
    src/GUI/gearratiographitem.cpp \
    src/GUI/mapview.cpp \
    src/GUI/areaitem.cpp \
-    src/data/waypoint.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/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/IMG/bitmapline.cpp \
    src/map/IMG/bitstream.cpp \
    src/map/IMG/deltastream.cpp \
-    src/map/IMG/gmap.cpp \
+    src/map/IMG/gmapdata.cpp \
    src/map/IMG/huffmanbuffer.cpp \
    src/map/IMG/huffmanstream.cpp \
    src/map/IMG/huffmantable.cpp \
@ -275,28 +333,37 @@ SOURCES += src/main.cpp \
    src/map/IMG/nodfile.cpp \
    src/map/IMG/mapdata.cpp \
    src/map/IMG/rastertile.cpp \
-    src/map/IMG/textpathitem.cpp \
-    src/map/IMG/textpointitem.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/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/downloader.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 \
    src/map/ozf.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 \
@ -308,6 +375,7 @@ SOURCES += src/main.cpp \
    src/map/linearunits.cpp \
    src/map/mapsource.cpp \
    src/map/tileloader.cpp \
+    src/map/wldfile.cpp \
    src/map/wmtsmap.cpp \
    src/map/wmts.cpp \
    src/map/wmsmap.cpp \
@ -315,16 +383,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 \
@ -341,29 +416,12 @@ SOURCES += src/main.cpp \
    src/data/locparser.cpp \
    src/data/slfparser.cpp \
    src/data/dem.cpp \
-    src/data/polygon.cpp \
-    src/map/obliquestereographic.cpp \
-    src/GUI/coordinatesitem.cpp \
-    src/map/rmap.cpp \
+    src/data/demloader.cpp \
    src/data/exifparser.cpp \
-    src/map/imgmap.cpp \
-    src/map/IMG/img.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/IMG/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

 DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
@ -386,55 +444,24 @@ 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

 macx {
    ICON = icons/app/gpxsee.icns
    QMAKE_INFO_PLIST = pkg/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
+    locale.files = $$files(lang/*.qm)
    csv.path = Contents/Resources
    csv.files = pkg/csv
    maps.path = Contents/Resources
    maps.files = pkg/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
-    QMAKE_BUNDLE_DATA += locale maps icons csv
+    icons.files = $$files(icons/formats/*.icns)
+
+    QMAKE_BUNDLE_DATA += locale maps symbols icons csv
 }

 win32 {
@ -460,27 +487,36 @@ win32 {
        icons/formats/map.ico \
        icons/formats/mbts.ico \
        icons/formats/rmap.ico \
-        icons/formats/tba.ico
+        icons/formats/tba.ico \
+        icons/formats/aqm.ico \
+        icons/formats/sqlt.ico \
+        icons/formats/ov2.ico \
+        icons/formats/itn.ico \
+        icons/formats/wld.ico \
+        icons/formats/omd.ico \
+        icons/formats/ghp.ico \
+        icons/formats/qct.ico
    DEFINES += _USE_MATH_DEFINES \
        NOGDI
 }

 unix:!macx {
    isEmpty(PREFIX):PREFIX = /usr/local
-    DEFINES += PREFIX=\\\"$$PREFIX\\\"

-    maps.files = pkg/maps/*
+    maps.files = $$files(pkg/maps/*)
    maps.path = $$PREFIX/share/gpxsee/maps
-    csv.files = pkg/csv/*
+    csv.files = $$files(pkg/csv/*)
    csv.path = $$PREFIX/share/gpxsee/csv
-    locale.files = lang/*.qm
+    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.path = $$PREFIX/share/applications
    mime.files = pkg/gpxsee.xml
    mime.path = $$PREFIX/share/mime/packages
    target.path = $$PREFIX/bin
-    INSTALLS += target maps csv locale icon desktop mime
+    INSTALLS += target maps csv symbols locale icon desktop mime
 }
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -1,6 +1,6 @@
 <RCC>
+	<!-- GUI icons -->
 	<qresource prefix="/">
-		<!-- GUI -->
 		<file alias="gpxsee.png">icons/app/gpxsee.png</file>
 		<file alias="gpxsee@2x.png">icons/app/gpxsee@2x.png</file>
 		<file alias="dialog-close.png">icons/GUI/dialog-close.png</file>
@ -43,84 +43,233 @@
 		<file alias="view-filter@2x.png">icons/GUI/view-filter@2x.png</file>
 		<file alias="applications-internet_32.png">icons/GUI/applications-internet_32.png</file>
 		<file alias="applications-internet_32@2x.png">icons/GUI/applications-internet_32@2x.png</file>
+		<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 -->
-		<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>
+	<!-- 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>
+	</qresource>
+
+	<!-- Mapsforge rendertheme -->
+	<qresource prefix="/mapsforge">
+		<file alias="default.xml">data/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>
 	</qresource>
 </RCC>
--- a/icons/GUI/document-decrypt.png
+++ b/icons/GUI/document-decrypt.png
--- a/icons/GUI/document-decrypt@2x.png
+++ b/icons/GUI/document-decrypt@2x.png
--- a/icons/GUI/document-encrypt.png
+++ b/icons/GUI/document-encrypt.png
--- a/icons/GUI/document-encrypt@2x.png
+++ b/icons/GUI/document-encrypt@2x.png
--- a/icons/GUI/transform-move.png
+++ b/icons/GUI/transform-move.png
--- a/icons/GUI/transform-move@2x.png
+++ b/icons/GUI/transform-move@2x.png
--- a/icons/GUI/transform-move_32.png
+++ b/icons/GUI/transform-move_32.png
--- a/icons/GUI/transform-move_32@2x.png
+++ b/icons/GUI/transform-move_32@2x.png
--- a/icons/GUI/view-grid.png
+++ b/icons/GUI/view-grid.png
--- a/icons/GUI/view-grid@2x.png
+++ b/icons/GUI/view-grid@2x.png
--- a/icons/IMG/airfield-11.png
+++ b/icons/IMG/airfield-11.png
--- a/icons/IMG/airport-11.png
+++ b/icons/IMG/airport-11.png
--- a/icons/IMG/amusement-park-11.png
+++ b/icons/IMG/amusement-park-11.png
--- a/icons/IMG/bakery-11.png
+++ b/icons/IMG/bakery-11.png
--- a/icons/IMG/bank-11.png
+++ b/icons/IMG/bank-11.png
--- a/icons/IMG/bar-11.png
+++ b/icons/IMG/bar-11.png
--- a/icons/IMG/bbq-11.png
+++ b/icons/IMG/bbq-11.png
--- a/icons/IMG/beach-11.png
+++ b/icons/IMG/beach-11.png
--- a/icons/IMG/bowling-alley-11.png
+++ b/icons/IMG/bowling-alley-11.png
--- a/icons/IMG/bridge-11.png
+++ b/icons/IMG/bridge-11.png
--- a/icons/IMG/building-alt1-11.png
+++ b/icons/IMG/building-alt1-11.png
--- a/icons/IMG/bus-11.png
+++ b/icons/IMG/bus-11.png
--- a/icons/IMG/cafe-11.png
+++ b/icons/IMG/cafe-11.png
--- a/icons/IMG/campsite-11.png
+++ b/icons/IMG/campsite-11.png
--- a/icons/IMG/car-11.png
+++ b/icons/IMG/car-11.png
--- a/icons/IMG/car-rental-11.png
+++ b/icons/IMG/car-rental-11.png
--- a/icons/IMG/car-repair-11.png
+++ b/icons/IMG/car-repair-11.png
--- a/icons/IMG/casino-11.png
+++ b/icons/IMG/casino-11.png
--- a/icons/IMG/cemetery-11.png
+++ b/icons/IMG/cemetery-11.png
--- a/icons/IMG/cinema-11.png
+++ b/icons/IMG/cinema-11.png
--- a/icons/IMG/clothing-store-11.png
+++ b/icons/IMG/clothing-store-11.png
--- a/icons/IMG/communications-tower-11.png
+++ b/icons/IMG/communications-tower-11.png
--- a/icons/IMG/convenience-11.png
+++ b/icons/IMG/convenience-11.png
--- a/icons/IMG/dam-11.png
+++ b/icons/IMG/dam-11.png
--- a/icons/IMG/danger-11.png
+++ b/icons/IMG/danger-11.png
--- a/icons/IMG/drinking-water-11.png
+++ b/icons/IMG/drinking-water-11.png
--- a/icons/IMG/entrance-alt1-11.png
+++ b/icons/IMG/entrance-alt1-11.png
--- a/icons/IMG/fast-food-11.png
+++ b/icons/IMG/fast-food-11.png
--- a/icons/IMG/fire-station-11.png
+++ b/icons/IMG/fire-station-11.png
--- a/icons/IMG/fitness-centre-11.png
+++ b/icons/IMG/fitness-centre-11.png
--- a/icons/IMG/fuel-11.png
+++ b/icons/IMG/fuel-11.png
--- a/icons/IMG/furniture-11.png
+++ b/icons/IMG/furniture-11.png
--- a/icons/IMG/garden-11.png
+++ b/icons/IMG/garden-11.png
--- a/icons/IMG/garden-centre-11.png
+++ b/icons/IMG/garden-centre-11.png
--- a/icons/IMG/golf-11.png
+++ b/icons/IMG/golf-11.png
--- a/icons/IMG/grocery-11.png
+++ b/icons/IMG/grocery-11.png
--- a/icons/IMG/hairdresser-11.png
+++ b/icons/IMG/hairdresser-11.png
--- a/icons/IMG/harbor-11.png
+++ b/icons/IMG/harbor-11.png
--- a/icons/IMG/hardware-11.png
+++ b/icons/IMG/hardware-11.png
--- a/icons/IMG/heliport-11.png
+++ b/icons/IMG/heliport-11.png
--- a/icons/IMG/hospital-11.png
+++ b/icons/IMG/hospital-11.png
--- a/icons/IMG/information-11.png
+++ b/icons/IMG/information-11.png
--- a/icons/IMG/landmark-11.png
+++ b/icons/IMG/landmark-11.png
--- a/icons/IMG/library-11.png
+++ b/icons/IMG/library-11.png
--- a/icons/IMG/licence.txt
+++ b/icons/IMG/licence.txt
@ -1,4 +1,4 @@
-The POI icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
+The IMG style icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
 licensed under CC0.

 -----
--- a/icons/IMG/lodging-11.png
+++ b/icons/IMG/lodging-11.png
--- a/icons/IMG/mountain-11.png
+++ b/icons/IMG/mountain-11.png
--- a/icons/IMG/museum-11.png
+++ b/icons/IMG/museum-11.png
--- a/icons/IMG/park-11.png
+++ b/icons/IMG/park-11.png
--- a/icons/IMG/parking-11.png
+++ b/icons/IMG/parking-11.png
--- a/icons/IMG/pharmacy-11.png
+++ b/icons/IMG/pharmacy-11.png
--- a/icons/IMG/picnic-site-11.png
+++ b/icons/IMG/picnic-site-11.png
--- a/icons/IMG/place-of-worship-11.png
+++ b/icons/IMG/place-of-worship-11.png
--- a/icons/IMG/police-11.png
+++ b/icons/IMG/police-11.png
--- a/icons/IMG/post-11.png
+++ b/icons/IMG/post-11.png
--- a/icons/IMG/religious-christian-11.png
+++ b/icons/IMG/religious-christian-11.png
--- a/icons/IMG/religious-jewish-11.png
+++ b/icons/IMG/religious-jewish-11.png
--- a/icons/IMG/religious-muslim-11.png
+++ b/icons/IMG/religious-muslim-11.png
--- a/icons/IMG/restaurant-11.png
+++ b/icons/IMG/restaurant-11.png
--- a/icons/IMG/restaurant-noodle-11.png
+++ b/icons/IMG/restaurant-noodle-11.png
--- a/icons/IMG/restaurant-pizza-11.png
+++ b/icons/IMG/restaurant-pizza-11.png
--- a/icons/IMG/restaurant-seafood-11.png
+++ b/icons/IMG/restaurant-seafood-11.png
--- a/icons/IMG/roadblock-11.png
+++ b/icons/IMG/roadblock-11.png
--- a/icons/IMG/school-11.png
+++ b/icons/IMG/school-11.png
--- a/icons/IMG/shelter-11.png
+++ b/icons/IMG/shelter-11.png
--- a/icons/IMG/shop-11.png
+++ b/icons/IMG/shop-11.png
--- a/icons/IMG/skiing-11.png
+++ b/icons/IMG/skiing-11.png
--- a/icons/IMG/soccer-11.png
+++ b/icons/IMG/soccer-11.png
--- a/icons/IMG/swimming-11.png
+++ b/icons/IMG/swimming-11.png
--- a/icons/IMG/telephone-11.png
+++ b/icons/IMG/telephone-11.png
--- a/icons/IMG/theatre-11.png
+++ b/icons/IMG/theatre-11.png
--- a/icons/IMG/toilet-11.png
+++ b/icons/IMG/toilet-11.png
--- a/icons/IMG/town-hall-11.png
+++ b/icons/IMG/town-hall-11.png
--- a/icons/IMG/viewpoint-11.png
+++ b/icons/IMG/viewpoint-11.png
--- a/icons/IMG/village-11.png
+++ b/icons/IMG/village-11.png
--- a/icons/IMG/waterfall-11.png
+++ b/icons/IMG/waterfall-11.png
--- a/icons/IMG/wetland-11.png
+++ b/icons/IMG/wetland-11.png
--- a/icons/IMG/zoo-11.png
+++ b/icons/IMG/zoo-11.png
--- a/icons/formats/aqm.icns
+++ b/icons/formats/aqm.icns
--- a/icons/formats/aqm.ico
+++ b/icons/formats/aqm.ico
--- a/icons/formats/cup.icns
+++ b/icons/formats/cup.icns
--- a/icons/formats/cup.ico
+++ b/icons/formats/cup.ico
--- a/Show More
+++ b/Show More