Fixed layout centering

Fixed some possible corner case
A more human yaml syntax
2025-07-01 21:39:15 +02:00 · 2021-08-08 11:07:53 +02:00 · 2021-08-05 00:02:47 +02:00 · 2021-08-04 23:51:24 +02:00 · 2021-08-04 08:57:42 +02:00 · 2021-07-31 08:25:30 +02:00
589 changed files with 45004 additions and 12218 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,54 +1,58 @@
-version: 7.9.{build}
-configuration: Release
-platform: Any CPU
+version: 9.4.{build}
+
+configuration:
+  - Release
+
+image:
+  - Visual Studio 2019
+
 environment:
  NSISDIR: C:\Program Files (x86)\NSIS
  matrix:
-  - QTDIR: C:\Qt\5.11\msvc2015
-    PLATFORM: x86
+  - QTDIR: C:\Qt\5.15\msvc2019
    NSI: gpxsee.nsi
-    OPENSSLDIR: C:\OpenSSL-Win32\bin
-  - QTDIR: C:\Qt\5.11\msvc2015_64
-    PLATFORM: x86_amd64
+    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
-    OPENSSLDIR: C:\OpenSSL-Win64\bin
+    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
+    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 14.0\VC\vcvarsall.bat" %PLATFORM%
 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
-
+    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
-
    xcopy lang\*.qm installer\translations\ /sy
-
    copy licence.txt installer
+    copy %OPENSSLDIR%\%LIBCRYPTO% installer
+    copy %OPENSSLDIR%\%LIBSSL% installer

-    copy %OPENSSLDIR%\libeay32.dll installer
+    makensis.exe %NSISDEF% installer\%NSI%

-    copy %OPENSSLDIR%\ssleay32.dll installer
-
-
-    makensis.exe installer\%NSI%
 artifacts:
 - path: installer\GPXSee-*.exe
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -0,0 +1 @@
+github: tumic0
--- a/.travis.yml
+++ b/.travis.yml
@ -4,12 +4,26 @@ os:
  - linux
  - osx

-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
+dist: focal
+osx_image: xcode12

-install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev; fi
+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
--- a/README.md
+++ b/README.md
@ -2,14 +2,14 @@
 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, IGC, NMEA, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin CSV and geotagged JPEG files.
+* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV, TomTom OV2&ITN 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 & JNX maps, TwoNav RMaps, GeoTIFF images).
+* 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.
 * Support for DEM files (SRTM HGT).
 * Support for multiple tracks in one view.
 * Support for POI files.
-* Print/export to PDF.
+* Print/export to PDF/PNG.
 * Full-screen mode.
 * HiDPI/Retina displays & maps support.
 * Native GUI for Windows, Mac OS X and Linux.
@ -18,8 +18,8 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G

 ## Build
 Build requirements:
-* Qt 4.8 or QT 5.x (Qt >= 5.10.1 recommended for all features)
-* C++03 or newer compiler (tested: msvc2015, gcc >= 4.8, clang/Apple LLVM version 8.1.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
@ -43,3 +43,16 @@ make # nmake on windows

 ## 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:
+* [Oxygen icons](icons/GUI) - LGPLv3
+* [Mapbox Maki icons](icons/POI) - CC0
+* [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
--- a/data/default.xml
+++ b/data/default.xml
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,26 +3,39 @@ unix:!macx {
 } else {
    TARGET = GPXSee
 }
-VERSION = 7.9
+VERSION = 9.4

 QT += core \
    gui \
+    gui-private \
    network \
    sql \
-    concurrent
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += widgets
-    QT += printsupport
-}
-lessThan(QT_MAJOR_VERSION, 5) {QT += opengl}
-equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
+    concurrent \
+    widgets \
+    printsupport
+greaterThan(QT_MAJOR_VERSION, 5) {QT += openglwidgets}

+CONFIG += object_parallel_to_source
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
-    src/common/staticassert.h \
+    src/GUI/axislabelitem.h \
+    src/GUI/dirselectwidget.h \
+    src/GUI/flowlayout.h \
+    src/GUI/graphicsscene.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/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 \
@ -49,9 +62,7 @@ HEADERS += src/common/config.h \
    src/GUI/palette.h \
    src/GUI/heartrategraph.h \
    src/GUI/trackinfo.h \
-    src/GUI/exportdialog.h \
    src/GUI/fileselectwidget.h \
-    src/GUI/margins.h \
    src/GUI/temperaturegraph.h \
    src/GUI/graphtab.h \
    src/GUI/trackitem.h \
@ -67,7 +78,6 @@ HEADERS += src/common/config.h \
    src/GUI/optionsdialog.h \
    src/GUI/colorbox.h \
    src/GUI/stylecombobox.h \
-    src/GUI/opengl.h \
    src/GUI/timetype.h \
    src/GUI/percentslider.h \
    src/GUI/elevationgraphitem.h \
@ -79,17 +89,41 @@ HEADERS += src/common/config.h \
    src/GUI/gearratiographitem.h \
    src/GUI/oddspinbox.h \
    src/GUI/settings.h \
-    src/GUI/cpuarch.h \
    src/GUI/searchpointer.h \
    src/GUI/mapview.h \
    src/GUI/font.h \
    src/GUI/areaitem.h \
+    src/data/itnparser.h \
+    src/data/link.h \
+    src/data/ov2parser.h \
    src/map/IMG/bitmapline.h \
-    src/map/IMG/textpathitem.h \
-    src/map/IMG/textpointitem.h \
+    src/map/IMG/bitstream.h \
+    src/map/IMG/deltastream.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/shield.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/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 \
@ -119,6 +153,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 \
@ -158,7 +193,7 @@ HEADERS += src/common/config.h \
    src/data/locparser.h \
    src/data/slfparser.h \
    src/data/dem.h \
-    src/data/polygon.h \
+    src/common/polygon.h \
    src/data/area.h \
    src/map/obliquestereographic.h \
    src/GUI/coordinatesitem.h \
@ -168,23 +203,45 @@ HEADERS += src/common/config.h \
    src/data/exifparser.h \
    src/data/imageinfo.h \
    src/map/imgmap.h \
-    src/map/IMG/img.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/units.h \
    src/map/IMG/style.h \
    src/map/IMG/netfile.h \
-    src/GUI/limitedcombobox.h \
+    src/GUI/projectioncombobox.h \
    src/GUI/pathtickitem.h \
-    src/map/IMG/textitem.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
+
 SOURCES += src/main.cpp \
+    src/GUI/axislabelitem.cpp \
+    src/GUI/dirselectwidget.cpp \
+    src/GUI/flowlayout.cpp \
+    src/GUI/mapitem.cpp \
+    src/GUI/marginswidget.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 \
@ -205,11 +262,9 @@ SOURCES += src/main.cpp \
    src/GUI/palette.cpp \
    src/GUI/heartrategraph.cpp \
    src/GUI/trackinfo.cpp \
-    src/GUI/exportdialog.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 \
@ -232,14 +287,37 @@ 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/ov2parser.cpp \
+    src/data/waypoint.cpp \
    src/map/IMG/bitmapline.cpp \
-    src/map/IMG/textpathitem.cpp \
-    src/map/IMG/textpointitem.cpp \
+    src/map/IMG/bitstream.cpp \
+    src/map/IMG/deltastream.cpp \
+    src/map/IMG/gmapdata.cpp \
+    src/map/IMG/huffmanbuffer.cpp \
+    src/map/IMG/huffmanstream.cpp \
+    src/map/IMG/huffmantable.cpp \
+    src/map/IMG/huffmantext.cpp \
+    src/map/IMG/nodfile.cpp \
+    src/map/IMG/mapdata.cpp \
+    src/map/IMG/rastertile.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/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 \
@ -263,6 +341,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 \
@ -296,13 +375,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/exifparser.cpp \
    src/map/imgmap.cpp \
-    src/map/IMG/img.cpp \
+    src/map/IMG/imgdata.cpp \
    src/map/IMG/subfile.cpp \
    src/map/IMG/trefile.cpp \
    src/map/IMG/rgnfile.cpp \
@ -311,15 +389,22 @@ SOURCES += src/main.cpp \
    src/map/IMG/style.cpp \
    src/map/IMG/netfile.cpp \
    src/GUI/pathtickitem.cpp \
-    src/map/IMG/textitem.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

-greaterThan(QT_MAJOR_VERSION, 4) {
-    HEADERS += src/data/geojsonparser.h
-    SOURCES += src/data/geojsonparser.cpp
-}
-
-DEFINES += APP_VERSION=\\\"$$VERSION\\\"
-DEFINES *= QT_USE_QSTRINGBUILDER
+DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
+    QT_NO_DEPRECATED_WARNINGS

 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_en.ts \
@ -334,10 +419,14 @@ TRANSLATIONS = lang/gpxsee_en.ts \
    lang/gpxsee_da.ts \
    lang/gpxsee_tr.ts \
    lang/gpxsee_es.ts \
-    lang/gpxsee_pt_BR.ts
+    lang/gpxsee_pt_BR.ts \
+    lang/gpxsee_uk.ts \
+    lang/gpxsee_hu.ts \
+    lang/gpxsee_it.ts \
+    lang/gpxsee_eo.ts

 macx {
-    ICON = icons/gpxsee.icns
+    ICON = icons/app/gpxsee.icns
    QMAKE_INFO_PLIST = pkg/Info.plist
    locale.path = Contents/Resources/translations
    locale.files = lang/gpxsee_en.qm \
@ -352,7 +441,11 @@ macx {
        lang/gpxsee_da.qm \
        lang/gpxsee_tr.qm \
        lang/gpxsee_es.qm \
-        lang/gpxsee_pt_BR.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
    maps.path = Contents/Resources
@ -369,12 +462,26 @@ macx {
        icons/formats/wpt.icns \
        icons/formats/loc.icns \
        icons/formats/slf.icns \
-        icons/formats/json.icns
+        icons/formats/json.icns \
+        icons/formats/cup.icns \
+        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
    QMAKE_BUNDLE_DATA += locale maps icons csv
 }

 win32 {
-    RC_ICONS = icons/gpxsee.ico \
+    RC_ICONS = icons/app/gpxsee.ico \
        icons/formats/gpx.ico \
        icons/formats/tcx.ico \
        icons/formats/kml.ico \
@ -386,14 +493,28 @@ win32 {
        icons/formats/wpt.ico \
        icons/formats/loc.ico \
        icons/formats/slf.ico \
-        icons/formats/json.ico
+        icons/formats/json.ico \
+        icons/formats/cup.ico \
+        icons/formats/gpi.ico \
+        icons/formats/sml.ico \
+        icons/formats/img.ico \
+        icons/formats/jnx.ico \
+        icons/formats/kap.ico \
+        icons/formats/map.ico \
+        icons/formats/mbts.ico \
+        icons/formats/rmap.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
    DEFINES += _USE_MATH_DEFINES \
        NOGDI
 }

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

    maps.files = pkg/maps/*
    maps.path = $$PREFIX/share/gpxsee/maps
@ -401,8 +522,8 @@ unix:!macx {
    csv.path = $$PREFIX/share/gpxsee/csv
    locale.files = lang/*.qm
    locale.path = $$PREFIX/share/gpxsee/translations
-    icon.files = icons/gpxsee.png
-    icon.path = $$PREFIX/share/pixmaps
+    icon.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
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -1,8 +1,8 @@
 <RCC>
+	<!-- GUI icons -->
 	<qresource prefix="/">
-		<!-- GUI -->
-		<file alias="gpxsee.png">icons/gpxsee.png</file>
-		<file alias="gpxsee@2x.png">icons/gpxsee@2x.png</file>
+		<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>
 		<file alias="dialog-close@2x.png">icons/GUI/dialog-close@2x.png</file>
 		<file alias="document-open.png">icons/GUI/document-open.png</file>
@ -43,8 +43,10 @@
 		<file alias="view-filter@2x.png">icons/GUI/view-filter@2x.png</file>
 		<file alias="applications-internet_32.png">icons/GUI/applications-internet_32.png</file>
 		<file alias="applications-internet_32@2x.png">icons/GUI/applications-internet_32@2x.png</file>
-
-		<!-- POI -->
+	</qresource>
+	
+	<!-- POI icons for default IMG map 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>
@ -67,10 +69,12 @@
 		<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>
@ -97,7 +101,6 @@
 		<file alias="place-of-worship-11.png">icons/POI/place-of-worship-11.png</file>
 		<file alias="police-11.png">icons/POI/police-11.png</file>
 		<file alias="post-11.png">icons/POI/post-11.png</file>
-		<file alias="prison-11.png">icons/POI/prison-11.png</file>
 		<file alias="religious-christian-11.png">icons/POI/religious-christian-11.png</file>
 		<file alias="religious-jewish-11.png">icons/POI/religious-jewish-11.png</file>
 		<file alias="religious-muslim-11.png">icons/POI/religious-muslim-11.png</file>
@ -122,4 +125,141 @@
 		<file alias="wetland-11.png">icons/POI/wetland-11.png</file>
 		<file alias="zoo-11.png">icons/POI/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/POI/convenience-11.png
+++ b/icons/POI/convenience-11.png
--- a/icons/POI/entrance-alt1-11.png
+++ b/icons/POI/entrance-alt1-11.png
--- a/icons/POI/prison-11.png
+++ b/icons/POI/prison-11.png
--- a/icons/app/gpxsee.dia
+++ b/icons/app/gpxsee.dia
--- a/icons/app/gpxsee.icns
+++ b/icons/app/gpxsee.icns
--- a/icons/app/gpxsee.ico
+++ b/icons/app/gpxsee.ico
--- a/icons/app/gpxsee.png
+++ b/icons/app/gpxsee.png
--- a/icons/app/gpxsee@2x.png
+++ b/icons/app/gpxsee@2x.png
--- a/icons/app/hicolor/128x128/apps/gpxsee.png
+++ b/icons/app/hicolor/128x128/apps/gpxsee.png
--- a/icons/app/hicolor/16x16/apps/gpxsee.png
+++ b/icons/app/hicolor/16x16/apps/gpxsee.png
--- a/icons/app/hicolor/32x32/apps/gpxsee.png
+++ b/icons/app/hicolor/32x32/apps/gpxsee.png
--- a/icons/app/hicolor/48x48/apps/gpxsee.png
+++ b/icons/app/hicolor/48x48/apps/gpxsee.png
--- a/icons/app/hicolor/64x64/apps/gpxsee.png
+++ b/icons/app/hicolor/64x64/apps/gpxsee.png
--- a/icons/app/hicolor/scalable/apps/gpxsee.svg
+++ b/icons/app/hicolor/scalable/apps/gpxsee.svg
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd">
+<svg width="6cm" height="6cm" viewBox="47 79 119 119" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g>
+    <rect style="fill: #ffffff" x="47.729" y="79.875" width="118.071" height="118.071" rx="10" ry="10"/>
+    <rect style="fill: none; fill-opacity:0; stroke-width: 2.35099e-37; stroke-linejoin: round; stroke: #ffffff" x="47.729" y="79.875" width="118.071" height="118.071" rx="10" ry="10"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="113" cy="90.875" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke-linejoin: round; stroke: #000000" cx="113" cy="90.875" rx="7.021" ry="7.021"/>
+  </g>
+  <polyline style="fill: none; fill-opacity:0; stroke-width: 4; stroke: #000000" points="61.5289,182.479 73.5,125.854 96,151.875 113,90.875 136.5,172.375 151.658,157.199 "/>
+  <g>
+    <ellipse style="fill: #000000" cx="73.5" cy="125.854" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="73.5" cy="125.854" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="136.5" cy="172.375" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="136.5" cy="172.375" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="60.7" cy="186.4" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="60.7" cy="186.4" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="154.5" cy="154.354" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="154.5" cy="154.354" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="96" cy="151.875" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="96" cy="151.875" rx="7.021" ry="7.021"/>
+  </g>
+</svg>
--- 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/icons/formats/fit.icns
+++ b/icons/formats/fit.icns
--- a/icons/formats/fit.ico
+++ b/icons/formats/fit.ico
--- a/icons/formats/gpi.icns
+++ b/icons/formats/gpi.icns
--- a/icons/formats/gpi.ico
+++ b/icons/formats/gpi.ico
--- a/icons/formats/gpx.icns
+++ b/icons/formats/gpx.icns
--- a/icons/formats/gpx.ico
+++ b/icons/formats/gpx.ico
--- a/icons/formats/igc.icns
+++ b/icons/formats/igc.icns
--- a/icons/formats/igc.ico
+++ b/icons/formats/igc.ico
--- a/icons/formats/img.icns
+++ b/icons/formats/img.icns
--- a/icons/formats/img.ico
+++ b/icons/formats/img.ico
--- a/icons/formats/itn.icns
+++ b/icons/formats/itn.icns
--- a/icons/formats/itn.ico
+++ b/icons/formats/itn.ico
--- a/icons/formats/jnx.icns
+++ b/icons/formats/jnx.icns
--- a/icons/formats/jnx.ico
+++ b/icons/formats/jnx.ico
--- a/icons/formats/json.icns
+++ b/icons/formats/json.icns
--- a/icons/formats/json.ico
+++ b/icons/formats/json.ico
--- a/icons/formats/kap.icns
+++ b/icons/formats/kap.icns
--- a/icons/formats/kap.ico
+++ b/icons/formats/kap.ico
--- a/icons/formats/kml.icns
+++ b/icons/formats/kml.icns
--- a/icons/formats/kml.ico
+++ b/icons/formats/kml.ico
--- a/icons/formats/loc.icns
+++ b/icons/formats/loc.icns
--- a/icons/formats/loc.ico
+++ b/icons/formats/loc.ico
--- a/icons/formats/map.icns
+++ b/icons/formats/map.icns
--- a/icons/formats/map.ico
+++ b/icons/formats/map.ico
--- a/icons/formats/mbts.icns
+++ b/icons/formats/mbts.icns
--- a/icons/formats/mbts.ico
+++ b/icons/formats/mbts.ico
--- a/icons/formats/nmea.icns
+++ b/icons/formats/nmea.icns
--- a/icons/formats/nmea.ico
+++ b/icons/formats/nmea.ico
--- a/icons/formats/ov2.icns
+++ b/icons/formats/ov2.icns
--- a/icons/formats/ov2.ico
+++ b/icons/formats/ov2.ico
--- a/icons/formats/plt.icns
+++ b/icons/formats/plt.icns
--- a/icons/formats/plt.ico
+++ b/icons/formats/plt.ico
--- a/icons/formats/rmap.icns
+++ b/icons/formats/rmap.icns
--- a/icons/formats/rmap.ico
+++ b/icons/formats/rmap.ico
--- a/icons/formats/rte.icns
+++ b/icons/formats/rte.icns
--- a/icons/formats/rte.ico
+++ b/icons/formats/rte.ico
--- a/icons/formats/scripts/extensions
+++ b/icons/formats/scripts/extensions
@ -0,0 +1,27 @@
+fit:#006600
+gpx:#003399
+igc:#ff3300
+json:#003333
+kml:#990000
+nmea:#0083d7
+plt:#66ff00
+rte:#66ff00
+tcx:#ffcc00
+wpt:#66ff00
+loc:#556677
+slf:#881199
+cup:#20a810
+gpi:#fca314
+sml:#6434eb
+img:#cf0a0a
+jnx:#aeff00
+kap:#080045
+map:#f6ff00
+mbts:#ff0062
+rmap:#145cba
+tba:#367050
+aqm:#32a89e
+sqlt:#303030
+ov2:#a8c920
+itn:#b8540d
+wld:#c74c8f
--- a/icons/formats/scripts/icns.sh
+++ b/icons/formats/scripts/icns.sh
@ -0,0 +1,25 @@
+#!/bin/bash
+
+while read e; do
+	IFS=":"; set $e
+
+	EXT=`echo $1 | tr /a-z/ /A-Z/`
+	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
+
+	ICONSET=$1.iconset
+	mkdir $ICONSET
+
+	rsvg-convert -w 16 -h 16 -o "$ICONSET/icon_16x16.png" "$1.svg"
+	rsvg-convert -w 32 -h 32 -o "$ICONSET/icon_16x16@2x.png" "$1.svg"
+	cp "$ICONSET/icon_16x16@2x.png" "$ICONSET/icon_32x32.png"
+	rsvg-convert -w 64 -h 64 -o "$ICONSET/icon_32x32@2x.png" "$1.svg"
+	rsvg-convert -w 128 -h 128 -o "$ICONSET/icon_128x128.png" "$1.svg"
+	rsvg-convert -w 256 -h 256 -o "$ICONSET/icon_128x128@2x.png" "$1.svg"
+	cp "$ICONSET/icon_128x128@2x.png" "$ICONSET/icon_256x256.png"
+	rsvg-convert -w 512 -h 512 -o "$ICONSET/icon_256x256@2x.png" "$1.svg"
+	cp "$ICONSET/icon_256x256@2x.png" "$ICONSET/icon_512x512.png"
+	rsvg-convert -w 1024 -h 1024 -o "$ICONSET/icon_512x512@2x.png" "$1.svg"
+
+	iconutil -c icns -o $1.icns "$ICONSET"
+	rm -R "$ICONSET" $1.svg
+done < extensions
--- a/icons/formats/scripts/ico.sh
+++ b/icons/formats/scripts/ico.sh
@ -5,6 +5,6 @@ while read e; do

 	EXT=`echo $1 | tr /a-z/ /A-Z/`
 	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
-	convert -density 400 $1.svg -define icon:auto-resize $1.ico
+	convert -density 400 -background none $1.svg -define icon:auto-resize $1.ico
 	rm $1.svg
 done < extensions
--- a/icons/formats/scripts/icon-template.svg
+++ b/icons/formats/scripts/icon-template.svg
--- a/icons/formats/slf.icns
+++ b/icons/formats/slf.icns
--- a/icons/formats/slf.ico
+++ b/icons/formats/slf.ico
--- a/icons/formats/sml.icns
+++ b/icons/formats/sml.icns
--- a/icons/formats/sml.ico
+++ b/icons/formats/sml.ico
--- a/icons/formats/sqlt.icns
+++ b/icons/formats/sqlt.icns
--- a/icons/formats/sqlt.ico
+++ b/icons/formats/sqlt.ico
--- a/icons/formats/tba.icns
+++ b/icons/formats/tba.icns
--- a/icons/formats/tba.ico
+++ b/icons/formats/tba.ico
--- a/icons/formats/tcx.icns
+++ b/icons/formats/tcx.icns
--- a/icons/formats/tcx.ico
+++ b/icons/formats/tcx.ico
--- a/icons/formats/wld.icns
+++ b/icons/formats/wld.icns
--- a/icons/formats/wld.ico
+++ b/icons/formats/wld.ico
--- a/icons/formats/wpt.icns
+++ b/icons/formats/wpt.icns
--- a/icons/formats/wpt.ico
+++ b/icons/formats/wpt.ico
--- a/icons/gpxsee.dia
+++ b/icons/gpxsee.dia
--- a/icons/mapsforge/licence.txt
+++ b/icons/mapsforge/licence.txt
@ -0,0 +1,169 @@
+Mapsforge render theme icons as provided by the Mapsforge project
+(https://github.com/mapsforge). Licensed under LGPLv3.
+
+-----
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
--- a/icons/mapsforge/patterns/access-destination.png
+++ b/icons/mapsforge/patterns/access-destination.png
--- a/icons/mapsforge/patterns/access-private.png
+++ b/icons/mapsforge/patterns/access-private.png
--- a/icons/mapsforge/patterns/arrow.png
+++ b/icons/mapsforge/patterns/arrow.png
--- a/icons/mapsforge/patterns/cemetery.png
+++ b/icons/mapsforge/patterns/cemetery.png
--- a/icons/mapsforge/patterns/coniferous.svg
+++ b/icons/mapsforge/patterns/coniferous.svg
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
+   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
+   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
+   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
+   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
+  </symbol>
+  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
+   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <path inkscape:connector-curvature="0" id="path8893-1-1" d="m 151.49813,293.8417 -44.4375,95.875 -0.34375,0.71875 0.78125,0 8.9375,0 -15.15625,27.53125 -0.40625,0.71875 0.84375,0 10.71875,0 -18.062502,29.875 -0.5625,0.90625 1.0625,-0.15625 45.593752,-6.84375 0,48.53125 0,0.5 0.5,0 10.625,0 0.375,0 0.125,0 0.375,0 10.59375,0 0.5,0 0,-0.5 0,-48.53125 45.6875,6.84375 1.03125,0.15625 -0.53125,-0.90625 -18.0625,-29.875 10.625,0 0.84375,0 -0.40625,-0.71875 -15.15625,-27.53125 9,0 0.78125,0 -0.3125,-0.71875 -44.53125,-95.875 -0.5,0.0937 -0.53125,-0.0937 z m -0.0312,2.4375 0,194.21875 -10,0 0,-48.625 0,-0.5625 -0.5625,0.0937 -45.125002,6.75 17.937502,-29.6875 0.46875,-0.78125 -0.875,0 -10.75,0 15.15625,-27.53125 0.40625,-0.71875 -0.84375,0 -9,0 43.1875,-93.15625 z m 1.125,0.0625 43.25,93.09375 -9.09375,0 -0.84375,0 0.40625,0.71875 15.15625,27.53125 -10.65625,0 -0.875,0 0.4375,0.78125 17.9375,29.6875 -45.15625,-6.75 -0.59375,-0.0937 0,0.5625 0,48.625 -9.96875,0 0,-194.15625 z m -0.63664,-2.30136 -44.44666,95.87969 9.78092,0 -15.56963,28.27819 11.57742,0 -18.497262,30.60698 46.176622,-6.91983 0,49.10424 10.97859,0 0,-196.94927 z m 0.13307,0 0,196.94927 10.97859,0 0,-49.10424 46.24316,6.91983 -18.49726,-30.60698 11.51089,0 -15.56964,-28.27819 9.84746,0 -44.5132,-95.87969 z" fill-opacity=".733" color="#000000" fill="#87b987"/>
+ <path inkscape:connector-curvature="0" id="path8893-1-7" d="m 438.03409,87.423634 -44.4375,95.874996 -0.34375,0.71875 0.78125,0 8.9375,0 -15.15625,27.53125 -0.40625,0.71875 0.84375,0 10.71875,0 -18.0625,29.875 -0.5625,0.90625 1.0625,-0.15625 45.59375,-6.84375 0,48.53125 0,0.5 0.5,0 10.625,0 0.375,0 0.125,0 0.375,0 10.59375,0 0.5,0 0,-0.5 0,-48.53125 45.6875,6.84375 1.03125,0.15625 -0.53125,-0.90625 -18.0625,-29.875 10.625,0 0.84375,0 -0.40625,-0.71875 -15.15625,-27.53125 9,0 0.78125,0 -0.3125,-0.71875 -44.53125,-95.874996 -0.5,0.0937 -0.53125,-0.0937 z m -0.0312,2.4375 0,194.218746 -10,0 0,-48.625 0,-0.5625 -0.5625,0.0937 -45.125,6.75 17.9375,-29.6875 0.46875,-0.78125 -0.875,0 -10.75,0 15.15625,-27.53125 0.40625,-0.71875 -0.84375,0 -9,0 43.1875,-93.156246 z m 1.125,0.0625 43.25,93.093746 -9.09375,0 -0.84375,0 0.40625,0.71875 15.15625,27.53125 -10.65625,0 -0.875,0 0.4375,0.78125 17.9375,29.6875 -45.15625,-6.75 -0.59375,-0.0937 0,0.5625 0,48.625 -9.96875,0 0,-194.156246 z m -0.63664,-2.30136 -44.44666,95.879686 9.78092,0 -15.56963,28.27819 11.57742,0 -18.49726,30.60698 46.17662,-6.91983 0,49.10424 10.97859,0 0,-196.949266 z m 0.13307,0 0,196.949266 10.97859,0 0,-49.10424 46.24316,6.91983 -18.49726,-30.60698 11.51089,0 -15.56964,-28.27819 9.84746,0 -44.5132,-95.879686 z" fill-opacity=".733" color="#000000" fill="#87b987"/>
+</svg>
--- a/icons/mapsforge/patterns/coniferous_and_deciduous.svg
+++ b/icons/mapsforge/patterns/coniferous_and_deciduous.svg
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
+   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
+   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
+   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
+   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
+  </symbol>
+  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
+   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <path id="path8893-1" d="m 171,276.21875 -44.4375,95.875 -0.34375,0.71875 0.78125,0 8.9375,0 -15.15625,27.53125 -0.40625,0.71875 0.84375,0 10.71875,0 -18.0625,29.875 -0.5625,0.90625 1.0625,-0.15625 45.59375,-6.84375 0,48.53125 0,0.5 0.5,0 10.625,0 0.375,0 0.125,0 0.375,0 10.59375,0 0.5,0 0,-0.5 0,-48.53125 45.6875,6.84375 1.03125,0.15625 -0.53125,-0.90625 -18.0625,-29.875 10.625,0 0.84375,0 -0.40625,-0.71875 -15.15625,-27.53125 9,0 0.78125,0 -0.3125,-0.71875 -44.53125,-95.875 -0.5,0.0937 L 171,276.21875 z m -0.0312,2.4375 0,194.21875 -10,0 0,-48.625 0,-0.5625 -0.5625,0.0937 -45.125,6.75 17.9375,-29.6875 0.46875,-0.78125 -0.875,0 -10.75,0 15.15625,-27.53125 0.40625,-0.71875 -0.84375,0 -9,0 43.1875,-93.15625 z m 1.125,0.0625 43.25,93.09375 -9.09375,0 -0.84375,0 0.40625,0.71875 15.15625,27.53125 -10.65625,0 -0.875,0 0.4375,0.78125 17.9375,29.6875 -45.15625,-6.75 -0.59375,-0.0937 0,0.5625 0,48.625 -9.96875,0 0,-194.15625 z m -0.63664,-2.30136 -44.44666,95.87969 9.78092,0 -15.56963,28.27819 11.57742,0 -18.49726,30.60698 46.17662,-6.91983 0,49.10424 10.97859,0 0,-196.94927 z m 0.13307,0 0,196.94927 10.97859,0 0,-49.10424 46.24316,6.91983 -18.49726,-30.60698 11.51089,0 -15.56964,-28.27819 9.84746,0 -44.5132,-95.87969 z" fill-opacity=".733" color="#000000" fill="#87b987"/>
+ <path d="m 401.20072,107.52099 c -12.89249,-0.21792 -26.4631,6.91624 -29.20596,21.537 -1.16133,6.19036 -2.13136,8.18098 -9.45839,8.30804 -22.57124,0.39142 -32.17031,33.57097 -13.10114,49.20917 1.88949,1.54956 0.80099,2.89533 -5.56,7.73287 -32.37287,24.61961 2.48489,73.74553 35.59676,50.16779 4.84775,-3.4519 5.61647,-3.48967 6.71034,-0.63908 2.30895,6.01702 1.28278,34.9088 -1.5977,44.47997 l -2.87586,9.52229 17.31908,0 c 1.71459,0 2.57221,0.006 3.96229,0 1.40745,0.006 2.28396,0 4.0262,0 l 17.31908,0 -2.81195,-9.52229 c -2.88049,-9.57117 -3.97059,-38.46295 -1.66161,-44.47997 1.09387,-2.85059 1.86259,-2.81282 6.71034,0.63908 33.11187,23.57774 67.96963,-25.54818 35.59676,-50.16779 -6.36099,-4.83754 -7.77751,-6.8574 -5.49609,-7.73287 19.06917,-7.31754 8.85147,-45.48948 -13.16505,-49.20917 -7.22574,-1.22077 -8.23315,-2.11768 -9.39448,-8.30804 -2.87273,-15.31291 -17.65149,-22.36306 -31.05929,-21.40919 -0.61108,-0.0438 -1.23787,-0.1174 -1.85333,-0.12781 z" id="path9696" inkscape:connector-curvature="0" fill="#87b987" fill-opacity=".733"/>
+</svg>
--- a/icons/mapsforge/patterns/deciduous.svg
+++ b/icons/mapsforge/patterns/deciduous.svg
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <defs id="defs4">
+  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
+   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
+   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
+   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
+   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
+  </symbol>
+  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
+   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
+   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
+  </symbol>
+ </defs>
+ <path d="m 159.3237,301.42595 c -12.89248,-0.21792 -26.46309,6.91624 -29.20596,21.537 -1.16132,6.19036 -2.13136,8.18098 -9.45839,8.30804 -22.571243,0.39142 -32.170313,33.57097 -13.10114,49.20917 1.88949,1.54956 0.80099,2.89533 -5.55999,7.73287 -32.372883,24.61961 2.48489,73.74553 35.59676,50.16779 4.84774,-3.4519 5.61646,-3.48967 6.71034,-0.63908 2.30895,6.01702 1.28278,34.9088 -1.5977,44.47997 l -2.87586,9.52229 17.31907,0 c 1.71459,0 2.57221,0.006 3.9623,0 1.40744,0.006 2.28396,0 4.0262,0 l 17.31907,0 -2.81195,-9.52229 c -2.88048,-9.57117 -3.97058,-38.46295 -1.66161,-44.47997 1.09388,-2.85059 1.8626,-2.81282 6.71034,0.63908 33.11188,23.57774 67.96964,-25.54818 35.59676,-50.16779 -6.36098,-4.83754 -7.77751,-6.8574 -5.49608,-7.73287 19.06916,-7.31754 8.85147,-45.48948 -13.16505,-49.20917 -7.22574,-1.22077 -8.23316,-2.11768 -9.39448,-8.30804 -2.87273,-15.31291 -17.6515,-22.36306 -31.0593,-21.40919 -0.61108,-0.0438 -1.23787,-0.1174 -1.85333,-0.12781 z" id="path9696" inkscape:connector-curvature="0" fill="#87b987" fill-opacity=".733"/>
+ <path d="m 419.39534,72.446632 c -12.89248,-0.21792 -26.46309,6.91624 -29.20596,21.537 -1.16132,6.190358 -2.13136,8.180978 -9.45839,8.308038 -22.57124,0.39142 -32.17031,33.57097 -13.10114,49.20917 1.88949,1.54956 0.80099,2.89533 -5.55999,7.73287 -32.37288,24.6196 2.48489,73.74552 35.59676,50.16778 4.84774,-3.4519 5.61646,-3.48967 6.71034,-0.63908 2.30895,6.01702 1.28278,34.9088 -1.5977,44.47997 l -2.87586,9.52229 17.31907,0 c 1.71459,0 2.57221,0.006 3.9623,0 1.40744,0.006 2.28396,0 4.0262,0 l 17.31907,0 -2.81195,-9.52229 c -2.88048,-9.57117 -3.97058,-38.46295 -1.66161,-44.47997 1.09388,-2.85059 1.8626,-2.81282 6.71034,0.63908 33.11189,23.57774 67.96965,-25.54818 35.59677,-50.16778 -6.36098,-4.83754 -7.77751,-6.8574 -5.49608,-7.73287 19.06916,-7.31754 8.85147,-45.48948 -13.16505,-49.20917 -7.22574,-1.22077 -8.23316,-2.11768 -9.39448,-8.308038 -2.87273,-15.31291 -17.65151,-22.36306 -31.05931,-21.40919 -0.61108,-0.0438 -1.23787,-0.1174 -1.85333,-0.12781 z" id="path9696-1" inkscape:connector-curvature="0" fill="#87b987" fill-opacity=".733"/>
+</svg>
--- a/icons/mapsforge/patterns/dot.png
+++ b/icons/mapsforge/patterns/dot.png
--- a/icons/mapsforge/patterns/farmland.svg
+++ b/icons/mapsforge/patterns/farmland.svg
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="128" width="128" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-311,-468.36218)">
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="64" width="64" y="-596.4" x="-375" fill="#f7f5e5"/>
+  <rect style="enable-background:new;" height="64" width="64" y="468.4" x="375" fill="#f7f5e5"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="64" width="64" y="-439" x="532.4" fill="#f7f5e5"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="64" width="64" y="311" x="-532.4" fill="#f7f5e5"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-594.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-586.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-578.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-570.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-562.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-554.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-546.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-538.4" x="-375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="470.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="478.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="486.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="494.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="502.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="510.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="518.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" height="4" width="64" y="526.4" x="375" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-437" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-429" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-421" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-413" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-405" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-397" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-389" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-381" x="532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="313" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="321" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="329" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="337" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="345" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="353" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="361" x="-532.4" fill="#efe9c9"/>
+  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="369" x="-532.4" fill="#efe9c9"/>
+ </g>
+</svg>
--- a/icons/mapsforge/patterns/grass.svg
+++ b/icons/mapsforge/patterns/grass.svg
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" id="path3781" d="m 185.62513,286.07679 0.32964,-83.39783" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" id="path3783" d="M 235.01392,232.12965 208.64307,286.1899" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" id="path3785" d="m 268.03405,253.11322 -32.3043,32.96357" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" d="m 140.65911,229.8222 22.74487,56.3677" id="path3787" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" d="m 104.34263,254.10212 31.97466,31.97467" id="path3789" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 385.62513,190.07678 0.32964,-83.39783" id="path3793" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="M 435.01392,136.12964 408.64307,190.1899" id="path3795" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 468.03405,157.11321 -32.3043,32.96357" id="path3797" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" id="path3799" d="m 340.65911,133.8222 22.74487,56.3677" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" id="path3801" d="m 304.34263,158.10212 31.97466,31.97466" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 289.62513,436.07679 0.32964,-83.39783" id="path3807" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 339.01392,382.12965 -26.37085,54.06026" id="path3809" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" d="m 372.03405,403.11322 -32.3043,32.96357" id="path3811" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" id="path3813" d="m 244.65911,379.82221 22.74487,56.3677" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+ <path inkscape:connector-curvature="0" id="path3815" d="m 208.34263,404.10213 31.97466,31.97466" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
+</svg>
--- a/icons/mapsforge/patterns/hills.svg
+++ b/icons/mapsforge/patterns/hills.svg
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path d="m 362.98225,178.74951 c -18.3712,0.59518 -37.24028,3.30167 -53.875,11.21875 -11.25487,7.22101 -22.36174,14.50288 -33.40625,22.03125 -1.46855,1.05996 -6.63905,5.09345 -2.09375,3.0625 23.14953,-7.60492 43.81095,-22.25924 68.19266,-26.47693 20.60973,-5.15501 44.5539,-7.48552 63.05734,4.88318 12.34319,7.70967 22.99577,18.05648 36.3125,24.25 14.27752,7.77103 24.71792,24.76074 41.09375,26.75 -16.38702,-23.13213 -44.74653,-33.04697 -64.59013,-52.78497 -14.71539,-13.83429 -35.8556,-12.62913 -54.69112,-12.93378 z" id="path3656" fill="#999999"/>
+ <path d="m 196.70535,94.254447 c -39.22077,-0.83704 -81.18443,5.73512 -111.323742,32.742223 -17.84714,15.20614 -33.7635,33.63041 -55.27001,43.75778 -2.650844,3.00967 2.800086,3.75932 4.90625,3 9.019234,-2.2793 15.95483,-9.35158 24.07693,-13.84356 15.98596,-10.61568 29.67645,-23.9299 42.574182,-37.94328 13.17695,-9.53662 29.87141,-12.00889 45.2614,-16.37281 24.51897,-5.32234 49.90938,-8.779243 74.99374,-6.652853 17.9245,4.576333 29.12992,21.095083 44.84375,29.968753 15.17614,9.89258 31.52486,18.7369 45.25,30.25 1.11555,-1.9244 -0.91505,-5.53366 -1.15625,-7.84375 -3.15304,-7.06153 -11.43345,-9.86687 -17.1875,-14.53125 -15.56308,-9.47906 -31.54849,-18.77017 -44.28125,-31.8125 -7.39152,-7.118783 -17.21364,-11.069463 -27.5,-10.468753 -8.38657,-0.4434 -16.79286,-0.33168 -25.1875,-0.25 z" id="path3658" fill="#999999"/>
+ <path d="m 230.65504,246.00676 c -31.62382,2.61225 -64.4086,9.42287 -89.71169,29.65518 -17.03503,12.8395 -31.04208,29.79465 -50.069559,39.68857 -1.92089,2.78152 2.84221,7.28577 4.9375,3.78125 24.244999,-13.1651 41.551299,-35.81632 64.843749,-50.21875 22.74862,-11.9244 48.95265,-14.49799 74.09375,-17.625 17.57282,-0.89735 36.19959,4.8049 47.5625,18.71875 15.26441,12.85776 34.81496,19.83178 48.8125,34.1875 6.33889,5.2207 11.49959,13.49618 19.4375,15.4375 -0.53075,-5.86255 -6.28126,-9.81487 -9.53125,-14.34375 -14.02641,-15.2832 -32.85089,-24.47094 -49.75,-35.9375 -9.35849,-7.95098 -17.80511,-19.73683 -31.38058,-19.94438 -9.72254,-1.54075 -19.3656,-3.61775 -29.24442,-3.39937 z" id="path3660" fill="#999999"/>
+</svg>
--- a/icons/mapsforge/patterns/marsh.png
+++ b/icons/mapsforge/patterns/marsh.png
--- a/icons/mapsforge/patterns/military.png
+++ b/icons/mapsforge/patterns/military.png
--- a/icons/mapsforge/patterns/nature-reserve.png
+++ b/icons/mapsforge/patterns/nature-reserve.png
--- a/icons/mapsforge/patterns/pike.png
+++ b/icons/mapsforge/patterns/pike.png
--- a/icons/mapsforge/patterns/quarry.svg
+++ b/icons/mapsforge/patterns/quarry.svg
@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path d="m 162.09375,118.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path2845" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3720" d="m 213.09375,306.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 317.8125,219.03125 c -6.94506,1.66919 -15.66332,-1.75576 -21.21875,3.96875 -1.08673,7.66083 7.17525,14.05434 14.375,11.6875 7.55393,0.21939 16.59421,3.12237 23.0625,-1.625 -2.35509,-6.81053 -9.47907,-10.9266 -15.34375,-14.15625 -0.29932,0.01 -0.57875,-0.26991 -0.875,0.125 z" id="path3722" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 179.90625,216.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" id="path3724" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 353.8125,325.90625 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" id="path3736" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3742" d="m 278.90625,291.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 110.84375,257.34375 c -5.18653,1.2232 -12.129845,-1.78199 -16.25,2.0625 1.142733,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" id="path3744" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3750" d="m 125.84375,403.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 81.09375,509.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path3752" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 184.90625,492.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" id="path3754" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3758" d="M 86.8125,336.03125 C 79.86744,337.70044 71.14918,334.27549 65.59375,340 c -1.08673,7.66083 7.17525,14.05434 14.375,11.6875 7.55393,0.21939 16.59421,3.12237 23.0625,-1.625 -2.35509,-6.81053 -9.47907,-10.9266 -15.34375,-14.15625 -0.29932,0.01 -0.57875,-0.26991 -0.875,0.125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3760" d="m 467.09375,281.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3762" d="m 46.812499,151.90625 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3764" d="m 520.8125,504.90625 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 496.90625,459.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" id="path3766" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3768" d="m 397.84375,514.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3770" d="m 407.8125,418.03125 c -6.94506,1.66919 -15.66332,-1.75576 -21.21875,3.96875 -1.08673,7.66083 7.17525,14.05434 14.375,11.6875 7.55393,0.21939 16.59421,3.12237 23.0625,-1.625 -2.35509,-6.81053 -9.47907,-10.9266 -15.34375,-14.15625 -0.29932,0.01 -0.57875,-0.26991 -0.875,0.125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 284.09375,450.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path3772" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 499.09375,133.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path3774" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3776" d="m 456.90625,89.406249 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.843751 5.20747,2.21591 11.12585,-0.341641 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.437501 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3778" d="m 387.84375,174.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3780" d="m 241.8125,21.906249 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3782" d="m 270.90625,73.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path d="m 163.84375,50.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" id="path3784" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+ <path id="path3786" d="m 553.84375,171.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
+</svg>
--- a/icons/mapsforge/patterns/rail.png
+++ b/icons/mapsforge/patterns/rail.png
--- a/icons/mapsforge/patterns/scrub.svg
+++ b/icons/mapsforge/patterns/scrub.svg
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path d="m 91.846983,454.74639 376.797227,0" id="path3752" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="12" stroke-opacity=".733"/>
+ <g id="g3779" transform="matrix(0.74835908,0,0,0.74835908,47.4084,40.634415)" stroke="#87b987" stroke-opacity=".733">
+  <path d="m 219.43574,376.07932 0.44048,-111.44093" id="path3781" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path d="m 285.43186,303.99208 -35.23824,72.23839" id="path3783" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path d="m 329.55523,332.03152 -43.16684,44.0478" id="path3785" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path id="path3787" d="m 159.34959,300.90874 30.39298,75.32173" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path id="path3789" d="m 110.82144,333.35295 42.72636,42.72637" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+ </g>
+ <g transform="matrix(0.74835908,0,0,0.74835908,247.4084,-55.36559)" id="g3791" stroke="#87b987" stroke-opacity=".733">
+  <path sodipodi:nodetypes="cc" id="path3793" d="m 219.43574,376.07932 0.44048,-111.44093" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path sodipodi:nodetypes="cc" id="path3795" d="m 285.43186,303.99208 -35.23824,72.23839" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path sodipodi:nodetypes="cc" id="path3797" d="m 329.55523,332.03152 -43.16684,44.0478" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path sodipodi:nodetypes="cc" d="m 159.34959,300.90874 30.39298,75.32173" id="path3799" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+  <path sodipodi:nodetypes="cc" d="m 110.82144,333.35295 42.72636,42.72637" id="path3801" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
+ </g>
+ <path id="path3803" d="m 346.41953,394.74639 169.65214,0" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="12" stroke-opacity=".733"/>
+</svg>
--- a/icons/mapsforge/patterns/swamp.svg
+++ b/icons/mapsforge/patterns/swamp.svg
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path inkscape:connector-curvature="0" d="m 181.73921,194.70571 c -0.36208,-47.80432 1.03597,-56.4901 0.0356,-77.88187 -0.70547,-15.15612 -3.35673,-41.490921 0.14412,-39.682489 13.97763,7.21985 27.08725,184.465759 5.24773,184.465759 -7.57632,0 -9.08557,-18.58927 -5.43179,-66.9014 l 0.004,0 1e-5,0 z" id="path3683" sodipodi:nodetypes="csssccc" fill="#60b8ff"/>
+ <path inkscape:connector-curvature="0" sodipodi:nodetypes="csssscccsssc" id="path3685" d="m 268.61521,245.51493 c 0,-8.85071 1.81377,-23.3155 7.5572,-39.2584 7.32509,-20.33329 22.5433,-25.46652 6.40886,-19.27518 -6.99753,2.68517 -18.97163,16.77542 -24.20646,31.79213 -11.82358,33.917 -9.98259,42.83363 1.34396,42.83363 4.89294,0 8.89626,-7.24146 8.89626,-16.09218 l 1.8e-4,0 z m -35.58505,-10.01745 c 0,-34.3596 8.12745,-55.66267 18.25122,-84.10944 10.42588,-29.29575 34.4997,-50.04067 11.69084,-31.16476 -33.48633,27.71221 -64.71212,141.38383 -38.83832,141.38383 4.89295,0 8.89626,-11.74929 8.89626,-26.10963 z" fill="#60b8ff"/>
+ <path inkscape:connector-curvature="0" d="m 278.32812,317.3576 c -11.73052,0.48378 -23.69834,0.39217 -35.19543,2.76424 -2.88537,1.6697 -1.19132,6.25193 2.00331,6.17633 17.49808,4.03041 35.74826,2.75786 53.61207,2.74633 7.66155,-0.34655 15.65922,-0.50312 22.85408,-3.1995 2.85708,-1.90147 0.91299,-6.4662 -2.37491,-6.24875 -13.37358,-2.92705 -27.26954,-2.38486 -40.89912,-2.23865 z" id="path3687" fill="#60b8ff"/>
+ <path inkscape:connector-curvature="0" d="m 101.122,245.51493 c 0,-8.85071 -1.813771,-23.3155 -7.557198,-39.2584 -7.32509,-20.33329 -22.543301,-25.46652 -6.408863,-19.27518 6.99753,2.68517 18.971631,16.77542 24.206461,31.79213 11.82357,33.917 9.98258,42.83363 -1.34396,42.83363 -4.89294,0 -8.89626,-7.24146 -8.89626,-16.09218 l -1.8e-4,0 z m 35.58505,-10.01745 c 0,-34.3596 -8.12745,-55.66267 -18.25122,-84.10944 -10.42588,-29.29575 -34.499697,-50.04067 -11.69084,-31.16476 33.48632,27.71221 64.71211,141.38383 38.83832,141.38383 -4.89295,0 -8.89626,-11.74929 -8.89626,-26.10963 z" id="path3689" sodipodi:nodetypes="csssscccsssc" fill="#60b8ff"/>
+ <path inkscape:connector-curvature="0" d="m 223.76353,283.99202 c -28.7682,0.42228 -57.64822,0.51219 -86.31446,2.60851 -2.70507,0.43595 -4.05156,4.4494 -1.09012,5.58689 14.32727,3.21782 29.2919,2.53438 43.93539,3.29402 40.22877,0.85238 80.55721,1.25187 120.71225,-1.60044 2.83845,-0.56816 8.41438,-0.63035 7.80607,-4.71089 -1.96973,-3.87654 -7.56813,-2.5836 -11.0959,-3.34824 -24.59864,-1.90498 -49.29685,-1.88353 -73.95323,-1.82985 z" id="path3713" fill="#60b8ff"/>
+</svg>
--- a/Show More
+++ b/Show More