Always run the redistributables installer and let it decide what to do

(instead of an own and broken registry check with magic numbers)
Fixed MSVC redist checks
2025-07-01 13:29:16 +02:00 · 2020-01-26 15:58:20 +01:00 · 2020-01-26 14:07:49 +01:00 · 2020-01-26 13:23:45 +01:00 · 2020-01-26 13:13:34 +01:00 · 2020-01-26 13:07:55 +01:00
442 changed files with 28266 additions and 7379 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,22 +1,33 @@
-version: 6.0.{build}
-configuration: Release
-platform: Any CPU
+version: 7.20.{build}
+
+configuration:
+  - Release
+
+image:
+  - Visual Studio 2017
+
 environment:
  NSISDIR: C:\Program Files (x86)\NSIS
  matrix:
-  - QTDIR: C:\Qt\5.11\msvc2015
-    PLATFORM: x86
+  - QTDIR: C:\Qt\5.13\msvc2017
    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.13\msvc2017_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    
+
 install:
 - cmd: >-
    set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%

-    call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\"%VCVARS%
+
 build_script:
 - cmd: >-
    lrelease gpxsee.pro
@ -34,6 +45,8 @@ build_script:

    copy pkg\%NSI% installer

+    copy pkg\macros.nsh installer
+
    xcopy pkg\csv installer\csv /i

    xcopy pkg\maps installer\maps /i
@ -42,9 +55,9 @@ build_script:

    copy licence.txt installer

-    copy %OPENSSLDIR%\libeay32.dll installer
+    copy %OPENSSLDIR%\%LIBCRYPTO% installer

-    copy %OPENSSLDIR%\ssleay32.dll installer
+    copy %OPENSSLDIR%\%LIBSSL% installer


    makensis.exe installer\%NSI%
--- a/.gitignore
+++ b/.gitignore
@ -11,3 +11,4 @@ Makefile*

 # Binary
 GPXSee
+gpxsee
--- a/.travis.yml
+++ b/.travis.yml
@ -6,10 +6,11 @@ os:

 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 libqt4-dev; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev libqt4-opengl-dev; fi

 script:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,7 +1,6 @@
 Only localization contributions are accepted at the moment, code pull requests will be rejected.

 The rationale is, that I want leave the possibility to distribute GPXsee builds in the OS X/Windows
-stores under a non-GPL licence open. In the future, code pull requests under a QT-like contribution
-agreement [1] will be possible.
-
-[1] https://d21tv0wm5mksdn.cloudfront.net/wp-content/uploads/2015/03/Qt-ContributionLicenseAgreement_v1_2_FINAL.pdf
+stores under a non-GPL licence open. In the future, code pull requests under a
+[QT-like contribution agreement](https://d21tv0wm5mksdn.cloudfront.net/wp-content/uploads/2015/03/Qt-ContributionLicenseAgreement_v1_2_FINAL.pdf)
+may become possible.
--- a/README.md
+++ b/README.md
@ -1,25 +1,25 @@
 # GPXSee
-GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, TCX,
-KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files.
+GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats.

 ## Features
-* User-definable online maps (OSM/Google tiles, WMTS, WMS).
-* Offline maps (OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images).
+* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SLF, 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 & JNX maps, TwoNav RMaps, GeoTIFF 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.
 * Full-screen mode.
 * HiDPI/Retina displays & maps support.
 * Native GUI for Windows, Mac OS X and Linux.
-* Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, OziExplorer (PLT, RTE, WPT) and Garmin CSV files.

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

 ## Build
 Build requirements:
 * Qt 4.8 or QT 5.x (Qt >= 5.10.1 recommended for all features)
-* C++03 compiler (tested: msvc2015, gcc >= 4.8, clang/Apple LLVM version 8.1.0)
+* C++03 or newer compiler (tested: msvc2015, gcc >= 4.8, clang/Apple LLVM version 8.1.0)

 Build steps:
 ```shell
@ -36,10 +36,10 @@ make # nmake on windows
 [Changelog](https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes)

 ## Homepage
-http://www.gpxsee.org
+[https://www.gpxsee.org](https://www.gpxsee.org)

 ## Maps
 [GPXSee maps repository](https://github.com/tumic0/GPXSee-maps)

 ## Translations
-GPXSee uses [Weblate](https://hosted.weblate.org/projects/gpxsee) for translations.
+GPXSee uses [Weblate](https://hosted.weblate.org/projects/gpxsee/translations/) for translations.
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -1,10 +1,15 @@
-TARGET = GPXSee
-VERSION = 6.0
+unix:!macx {
+    TARGET = gpxsee
+} else {
+    TARGET = GPXSee
+}
+VERSION = 7.20

 QT += core \
    gui \
    network \
-    sql
+    sql \
+    concurrent
 greaterThan(QT_MAJOR_VERSION, 4) {
    QT += widgets
    QT += printsupport
@ -13,14 +18,21 @@ lessThan(QT_MAJOR_VERSION, 5) {QT += opengl}
 equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}

 INCLUDEPATH += ./src
-HEADERS += src/config.h \
+HEADERS += src/common/config.h \
+    src/GUI/graphicsscene.h \
+    src/GUI/popup.h \
+    src/common/garmin.h \
    src/common/staticassert.h \
    src/common/coordinates.h \
    src/common/range.h \
    src/common/rectc.h \
    src/common/wgs84.h \
-    src/common/str2int.h \
+    src/common/util.h \
    src/common/rtree.h \
+    src/common/kv.h \
+    src/common/greatcircle.h \
+    src/common/programpaths.h \
+    src/common/tifffile.h \
    src/GUI/app.h \
    src/GUI/icons.h \
    src/GUI/gui.h \
@ -70,10 +82,19 @@ HEADERS += src/config.h \
    src/GUI/gearratiographitem.h \
    src/GUI/oddspinbox.h \
    src/GUI/settings.h \
-    src/GUI/nicenum.h \
    src/GUI/cpuarch.h \
    src/GUI/searchpointer.h \
    src/GUI/mapview.h \
+    src/GUI/font.h \
+    src/GUI/areaitem.h \
+    src/data/link.h \
+    src/map/IMG/bitmapline.h \
+    src/map/IMG/bitstream.h \
+    src/map/IMG/deltastream.h \
+    src/map/IMG/huffmanstream.h \
+    src/map/IMG/huffmantable.h \
+    src/map/IMG/textpathitem.h \
+    src/map/IMG/textpointitem.h \
    src/map/projection.h \
    src/map/ellipsoid.h \
    src/map/datum.h \
@ -99,7 +120,6 @@ HEADERS += src/config.h \
    src/map/pcs.h \
    src/map/transform.h \
    src/map/mapfile.h \
-    src/map/tifffile.h \
    src/map/gcs.h \
    src/map/angularunits.h \
    src/map/primemeridian.h \
@ -114,6 +134,16 @@ HEADERS += src/config.h \
    src/map/crs.h \
    src/map/coordinatesystem.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/data/graph.h \
    src/data/poi.h \
    src/data/waypoint.h \
@ -133,24 +163,46 @@ HEADERS += src/config.h \
    src/data/igcparser.h \
    src/data/nmeaparser.h \
    src/data/oziparsers.h \
-    src/map/rectd.h \
-    src/map/geocentric.h \
-    src/map/mercator.h \
-    src/map/jnxmap.h \
-    src/map/krovak.h \
-    src/GUI/kv.h \
    src/data/locparser.h \
    src/data/slfparser.h \
-    src/map/geotiffmap.h \
-    src/map/image.h \
-    src/common/greatcircle.h \
-    src/map/mbtilesmap.h \
-    src/map/osm.h
+    src/data/dem.h \
+    src/data/polygon.h \
+    src/data/area.h \
+    src/map/obliquestereographic.h \
+    src/GUI/coordinatesitem.h \
+    src/map/rmap.h \
+    src/map/calibrationpoint.h \
+    src/map/color.h \
+    src/data/exifparser.h \
+    src/data/imageinfo.h \
+    src/map/imgmap.h \
+    src/map/IMG/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
 SOURCES += src/main.cpp \
+    src/GUI/popup.cpp \
    src/common/coordinates.cpp \
    src/common/rectc.cpp \
    src/common/range.cpp \
-    src/common/str2int.cpp \
+    src/common/util.cpp \
+    src/common/greatcircle.cpp \
+    src/common/programpaths.cpp \
+    src/common/tifffile.cpp \
    src/GUI/app.cpp \
    src/GUI/gui.cpp \
    src/GUI/axisitem.cpp \
@ -192,8 +244,15 @@ SOURCES += src/main.cpp \
    src/GUI/cadencegraphitem.cpp \
    src/GUI/powergraphitem.cpp \
    src/GUI/gearratiographitem.cpp \
-    src/GUI/nicenum.cpp \
    src/GUI/mapview.cpp \
+    src/GUI/areaitem.cpp \
+    src/map/IMG/bitmapline.cpp \
+    src/map/IMG/bitstream.cpp \
+    src/map/IMG/deltastream.cpp \
+    src/map/IMG/huffmanstream.cpp \
+    src/map/IMG/huffmantable.cpp \
+    src/map/IMG/textpathitem.cpp \
+    src/map/IMG/textpointitem.cpp \
    src/map/maplist.cpp \
    src/map/onlinemap.cpp \
    src/map/downloader.cpp \
@ -215,7 +274,6 @@ SOURCES += src/main.cpp \
    src/map/pcs.cpp \
    src/map/transform.cpp \
    src/map/mapfile.cpp \
-    src/map/tifffile.cpp \
    src/map/projection.cpp \
    src/map/gcs.cpp \
    src/map/angularunits.cpp \
@ -229,6 +287,17 @@ SOURCES += src/main.cpp \
    src/map/wms.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/data/data.cpp \
    src/data/poi.cpp \
    src/data/track.cpp \
@ -242,18 +311,39 @@ SOURCES += src/main.cpp \
    src/data/igcparser.cpp \
    src/data/nmeaparser.cpp \
    src/data/oziparsers.cpp \
-    src/map/geocentric.cpp \
-    src/map/mercator.cpp \
-    src/map/jnxmap.cpp \
-    src/map/krovak.cpp \
-    src/map/map.cpp \
    src/data/locparser.cpp \
    src/data/slfparser.cpp \
-    src/map/geotiffmap.cpp \
-    src/map/image.cpp \
-    src/common/greatcircle.cpp \
-    src/map/mbtilesmap.cpp \
-    src/map/osm.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/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
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+    HEADERS += src/data/geojsonparser.h
+    SOURCES += src/data/geojsonparser.cpp
+}
+
+DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
+    QT_NO_DEPRECATED_WARNINGS
+DEFINES *= QT_USE_QSTRINGBUILDER

 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_en.ts \
@ -263,53 +353,92 @@ TRANSLATIONS = lang/gpxsee_en.ts \
    lang/gpxsee_ru.ts \
    lang/gpxsee_fi.ts \
    lang/gpxsee_fr.ts \
-    lang/gpxsee_pl.ts
+    lang/gpxsee_pl.ts \
+    lang/gpxsee_nb.ts \
+    lang/gpxsee_da.ts \
+    lang/gpxsee_tr.ts \
+    lang/gpxsee_es.ts \
+    lang/gpxsee_pt_BR.ts \
+    lang/gpxsee_uk.ts

 macx {
    ICON = icons/gpxsee.icns
    QMAKE_INFO_PLIST = pkg/Info.plist
-    LOCALE.path = Contents/Resources/translations
-    LOCALE.files = lang/gpxsee_en.qm \
+    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
-    CSV.path = Contents/Resources
-    CSV.files = pkg/csv
-    MAPS.path = Contents/Resources
-    MAPS.files = pkg/maps
-    ICONS.path = Contents/Resources/icons
-    ICONS.files = icons/gpx.icns \
-        icons/tcx.icns \
-        icons/kml.icns \
-        icons/fit.icns \
-        icons/igc.icns \
-        icons/nmea.icns \
-        icons/plt.icns \
-        icons/rte.icns \
-        icons/wpt.icns \
-        icons/loc.icns \
-        icons/slf.icns
-    QMAKE_BUNDLE_DATA += LOCALE MAPS ICONS CSV
-}
-win32 {
-    RC_ICONS = icons/gpxsee.ico \
-        icons/gpx.ico \
-        icons/tcx.ico \
-        icons/kml.ico \
-        icons/fit.ico \
-        icons/igc.ico \
-        icons/nmea.ico \
-        icons/plt.ico \
-        icons/rte.ico \
-        icons/wpt.ico \
-        icons/loc.ico \
-        icons/slf.ico
-    DEFINES += _USE_MATH_DEFINES
+        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
+    csv.path = Contents/Resources
+    csv.files = pkg/csv
+    maps.path = Contents/Resources
+    maps.files = pkg/maps
+    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
+    QMAKE_BUNDLE_DATA += locale maps icons csv
 }

-DEFINES += APP_VERSION=\\\"$$VERSION\\\"
-DEFINES *= QT_USE_QSTRINGBUILDER
+win32 {
+    RC_ICONS = icons/gpxsee.ico \
+        icons/formats/gpx.ico \
+        icons/formats/tcx.ico \
+        icons/formats/kml.ico \
+        icons/formats/fit.ico \
+        icons/formats/igc.ico \
+        icons/formats/nmea.ico \
+        icons/formats/plt.ico \
+        icons/formats/rte.ico \
+        icons/formats/wpt.ico \
+        icons/formats/loc.ico \
+        icons/formats/slf.ico \
+        icons/formats/json.ico \
+        icons/formats/cup.ico \
+        icons/formats/gpi.ico \
+        icons/formats/sml.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
+    csv.files = pkg/csv/*
+    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
+    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
+}
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -1,46 +1,125 @@
 <RCC>
 	<qresource prefix="/">
-		<file>icons/dialog-close.png</file>
-		<file>icons/dialog-close@2x.png</file>
-		<file>icons/document-open.png</file>
-		<file>icons/document-open@2x.png</file>
-		<file>icons/document-print.png</file>
-		<file>icons/document-print@2x.png</file>
-		<file>icons/document-export.png</file>
-		<file>icons/document-export@2x.png</file>
-		<file>icons/flag.png</file>
-		<file>icons/flag@2x.png</file>
-		<file>icons/gpxsee.png</file>
-		<file>icons/gpxsee@2x.png</file>
-		<file>icons/application-exit.png</file>
-		<file>icons/application-exit@2x.png</file>
-		<file>icons/applications-internet.png</file>
-		<file>icons/applications-internet@2x.png</file>
-		<file>icons/view-refresh.png</file>
-		<file>icons/view-refresh@2x.png</file>
-		<file>icons/arrow-left.png</file>
-		<file>icons/arrow-left@2x.png</file>
-		<file>icons/arrow-right.png</file>
-		<file>icons/arrow-right@2x.png</file>
-		<file>icons/arrow-left-double.png</file>
-		<file>icons/arrow-left-double@2x.png</file>
-		<file>icons/arrow-right-double.png</file>
-		<file>icons/arrow-right-double@2x.png</file>
-		<file>icons/view-fullscreen.png</file>
-		<file>icons/view-fullscreen@2x.png</file>
-		<file>icons/office-chart-line.png</file>
-		<file>icons/office-chart-line@2x.png</file>
-		<file>icons/format-stroke-color.png</file>
-		<file>icons/format-stroke-color@2x.png</file>
-		<file>icons/flag_32.png</file>
-		<file>icons/flag_32@2x.png</file>
-		<file>icons/preferences-system.png</file>
-		<file>icons/preferences-system@2x.png</file>
-		<file>icons/document-print_32.png</file>
-		<file>icons/document-print_32@2x.png</file>
-		<file>icons/view-filter.png</file>
-		<file>icons/view-filter@2x.png</file>
-		<file>icons/applications-internet_32.png</file>
-		<file>icons/applications-internet_32@2x.png</file>
+		<!-- GUI -->
+		<file alias="gpxsee.png">icons/gpxsee.png</file>
+		<file alias="gpxsee@2x.png">icons/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>
+		<file alias="document-open@2x.png">icons/GUI/document-open@2x.png</file>
+		<file alias="document-print.png">icons/GUI/document-print.png</file>
+		<file alias="document-print@2x.png">icons/GUI/document-print@2x.png</file>
+		<file alias="document-export.png">icons/GUI/document-export.png</file>
+		<file alias="document-export@2x.png">icons/GUI/document-export@2x.png</file>
+		<file alias="flag.png">icons/GUI/flag.png</file>
+		<file alias="flag@2x.png">icons/GUI/flag@2x.png</file>
+		<file alias="application-exit.png">icons/GUI/application-exit.png</file>
+		<file alias="application-exit@2x.png">icons/GUI/application-exit@2x.png</file>
+		<file alias="applications-internet.png">icons/GUI/applications-internet.png</file>
+		<file alias="applications-internet@2x.png">icons/GUI/applications-internet@2x.png</file>
+		<file alias="view-refresh.png">icons/GUI/view-refresh.png</file>
+		<file alias="view-refresh@2x.png">icons/GUI/view-refresh@2x.png</file>
+		<file alias="arrow-left.png">icons/GUI/arrow-left.png</file>
+		<file alias="arrow-left@2x.png">icons/GUI/arrow-left@2x.png</file>
+		<file alias="arrow-right.png">icons/GUI/arrow-right.png</file>
+		<file alias="arrow-right@2x.png">icons/GUI/arrow-right@2x.png</file>
+		<file alias="arrow-left-double.png">icons/GUI/arrow-left-double.png</file>
+		<file alias="arrow-left-double@2x.png">icons/GUI/arrow-left-double@2x.png</file>
+		<file alias="arrow-right-double.png">icons/GUI/arrow-right-double.png</file>
+		<file alias="arrow-right-double@2x.png">icons/GUI/arrow-right-double@2x.png</file>
+		<file alias="view-fullscreen.png">icons/GUI/view-fullscreen.png</file>
+		<file alias="view-fullscreen@2x.png">icons/GUI/view-fullscreen@2x.png</file>
+		<file alias="office-chart-line.png">icons/GUI/office-chart-line.png</file>
+		<file alias="office-chart-line@2x.png">icons/GUI/office-chart-line@2x.png</file>
+		<file alias="format-stroke-color.png">icons/GUI/format-stroke-color.png</file>
+		<file alias="format-stroke-color@2x.png">icons/GUI/format-stroke-color@2x.png</file>
+		<file alias="flag_32.png">icons/GUI/flag_32.png</file>
+		<file alias="flag_32@2x.png">icons/GUI/flag_32@2x.png</file>
+		<file alias="preferences-system.png">icons/GUI/preferences-system.png</file>
+		<file alias="preferences-system@2x.png">icons/GUI/preferences-system@2x.png</file>
+		<file alias="document-print_32.png">icons/GUI/document-print_32.png</file>
+		<file alias="document-print_32@2x.png">icons/GUI/document-print_32@2x.png</file>
+		<file alias="view-filter.png">icons/GUI/view-filter.png</file>
+		<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 -->
+		<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="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="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="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>
+		<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>
 	</qresource>
 </RCC>
--- a/icons/GUI/application-exit.png
+++ b/icons/GUI/application-exit.png
--- a/icons/GUI/application-exit@2x.png
+++ b/icons/GUI/application-exit@2x.png
--- a/icons/GUI/applications-internet.png
+++ b/icons/GUI/applications-internet.png
--- a/icons/GUI/applications-internet@2x.png
+++ b/icons/GUI/applications-internet@2x.png
--- a/icons/GUI/applications-internet_32.png
+++ b/icons/GUI/applications-internet_32.png
--- a/icons/GUI/applications-internet_32@2x.png
+++ b/icons/GUI/applications-internet_32@2x.png
--- a/icons/GUI/arrow-left-double.png
+++ b/icons/GUI/arrow-left-double.png
--- a/icons/GUI/arrow-left-double@2x.png
+++ b/icons/GUI/arrow-left-double@2x.png
--- a/icons/GUI/arrow-left.png
+++ b/icons/GUI/arrow-left.png
--- a/icons/GUI/arrow-left@2x.png
+++ b/icons/GUI/arrow-left@2x.png
--- a/icons/GUI/arrow-right-double.png
+++ b/icons/GUI/arrow-right-double.png
--- a/icons/GUI/arrow-right-double@2x.png
+++ b/icons/GUI/arrow-right-double@2x.png
--- a/icons/GUI/arrow-right.png
+++ b/icons/GUI/arrow-right.png
--- a/icons/GUI/arrow-right@2x.png
+++ b/icons/GUI/arrow-right@2x.png
--- a/icons/GUI/dialog-close.png
+++ b/icons/GUI/dialog-close.png
--- a/icons/GUI/dialog-close@2x.png
+++ b/icons/GUI/dialog-close@2x.png
--- a/icons/GUI/document-export.png
+++ b/icons/GUI/document-export.png
--- a/icons/GUI/document-export@2x.png
+++ b/icons/GUI/document-export@2x.png
--- a/icons/GUI/document-open.png
+++ b/icons/GUI/document-open.png
--- a/icons/GUI/document-open@2x.png
+++ b/icons/GUI/document-open@2x.png
--- a/icons/GUI/document-print.png
+++ b/icons/GUI/document-print.png
--- a/icons/GUI/document-print@2x.png
+++ b/icons/GUI/document-print@2x.png
--- a/icons/GUI/document-print_32.png
+++ b/icons/GUI/document-print_32.png
--- a/icons/GUI/document-print_32@2x.png
+++ b/icons/GUI/document-print_32@2x.png
--- a/icons/GUI/flag.png
+++ b/icons/GUI/flag.png
--- a/icons/GUI/flag@2x.png
+++ b/icons/GUI/flag@2x.png
--- a/icons/GUI/flag_32.png
+++ b/icons/GUI/flag_32.png
--- a/icons/GUI/flag_32@2x.png
+++ b/icons/GUI/flag_32@2x.png
--- a/icons/GUI/format-stroke-color.png
+++ b/icons/GUI/format-stroke-color.png
--- a/icons/GUI/format-stroke-color@2x.png
+++ b/icons/GUI/format-stroke-color@2x.png
--- a/icons/GUI/licence.txt
+++ b/icons/GUI/licence.txt
@ -0,0 +1,169 @@
+The GUI icons are Oxygen icons from the KDE project (http://www.kde.org)
+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/GUI/office-chart-line.png
+++ b/icons/GUI/office-chart-line.png
--- a/icons/GUI/office-chart-line@2x.png
+++ b/icons/GUI/office-chart-line@2x.png
--- a/icons/GUI/preferences-system.png
+++ b/icons/GUI/preferences-system.png
--- a/icons/GUI/preferences-system@2x.png
+++ b/icons/GUI/preferences-system@2x.png
--- a/icons/GUI/view-filter.png
+++ b/icons/GUI/view-filter.png
--- a/icons/GUI/view-filter@2x.png
+++ b/icons/GUI/view-filter@2x.png
--- a/icons/GUI/view-fullscreen.png
+++ b/icons/GUI/view-fullscreen.png
--- a/icons/GUI/view-fullscreen@2x.png
+++ b/icons/GUI/view-fullscreen@2x.png
--- a/icons/GUI/view-refresh.png
+++ b/icons/GUI/view-refresh.png
--- a/icons/GUI/view-refresh@2x.png
+++ b/icons/GUI/view-refresh@2x.png
--- a/icons/POI/airfield-11.png
+++ b/icons/POI/airfield-11.png
--- a/icons/POI/airport-11.png
+++ b/icons/POI/airport-11.png
--- a/icons/POI/amusement-park-11.png
+++ b/icons/POI/amusement-park-11.png
--- a/icons/POI/bakery-11.png
+++ b/icons/POI/bakery-11.png
--- a/icons/POI/bank-11.png
+++ b/icons/POI/bank-11.png
--- a/icons/POI/bar-11.png
+++ b/icons/POI/bar-11.png
--- a/icons/POI/bbq-11.png
+++ b/icons/POI/bbq-11.png
--- a/icons/POI/beach-11.png
+++ b/icons/POI/beach-11.png
--- a/icons/POI/bowling-alley-11.png
+++ b/icons/POI/bowling-alley-11.png
--- a/icons/POI/bridge-11.png
+++ b/icons/POI/bridge-11.png
--- a/icons/POI/building-alt1-11.png
+++ b/icons/POI/building-alt1-11.png
--- a/icons/POI/bus-11.png
+++ b/icons/POI/bus-11.png
--- a/icons/POI/cafe-11.png
+++ b/icons/POI/cafe-11.png
--- a/icons/POI/campsite-11.png
+++ b/icons/POI/campsite-11.png
--- a/icons/POI/car-11.png
+++ b/icons/POI/car-11.png
--- a/icons/POI/car-rental-11.png
+++ b/icons/POI/car-rental-11.png
--- a/icons/POI/car-repair-11.png
+++ b/icons/POI/car-repair-11.png
--- a/icons/POI/casino-11.png
+++ b/icons/POI/casino-11.png
--- a/icons/POI/cemetery-11.png
+++ b/icons/POI/cemetery-11.png
--- a/icons/POI/cinema-11.png
+++ b/icons/POI/cinema-11.png
--- a/icons/POI/clothing-store-11.png
+++ b/icons/POI/clothing-store-11.png
--- a/icons/POI/communications-tower-11.png
+++ b/icons/POI/communications-tower-11.png
--- a/icons/POI/dam-11.png
+++ b/icons/POI/dam-11.png
--- a/icons/POI/danger-11.png
+++ b/icons/POI/danger-11.png
--- a/icons/POI/drinking-water-11.png
+++ b/icons/POI/drinking-water-11.png
--- a/icons/POI/fast-food-11.png
+++ b/icons/POI/fast-food-11.png
--- a/icons/POI/fire-station-11.png
+++ b/icons/POI/fire-station-11.png
--- a/icons/POI/fitness-centre-11.png
+++ b/icons/POI/fitness-centre-11.png
--- a/icons/POI/fuel-11.png
+++ b/icons/POI/fuel-11.png
--- a/icons/POI/furniture-11.png
+++ b/icons/POI/furniture-11.png
--- a/icons/POI/garden-11.png
+++ b/icons/POI/garden-11.png
--- a/icons/POI/garden-centre-11.png
+++ b/icons/POI/garden-centre-11.png
--- a/icons/POI/golf-11.png
+++ b/icons/POI/golf-11.png
--- a/icons/POI/grocery-11.png
+++ b/icons/POI/grocery-11.png
--- a/icons/POI/hairdresser-11.png
+++ b/icons/POI/hairdresser-11.png
--- a/icons/POI/harbor-11.png
+++ b/icons/POI/harbor-11.png
--- a/icons/POI/hardware-11.png
+++ b/icons/POI/hardware-11.png
--- a/icons/POI/heliport-11.png
+++ b/icons/POI/heliport-11.png
--- a/icons/POI/hospital-11.png
+++ b/icons/POI/hospital-11.png
--- a/icons/POI/information-11.png
+++ b/icons/POI/information-11.png
--- a/icons/POI/landmark-11.png
+++ b/icons/POI/landmark-11.png
--- a/icons/POI/library-11.png
+++ b/icons/POI/library-11.png
--- a/icons/POI/licence.txt
+++ b/icons/POI/licence.txt
@ -0,0 +1,126 @@
+The POI icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
+licensed under CC0.
+
+-----
+
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
--- a/icons/POI/lodging-11.png
+++ b/icons/POI/lodging-11.png
--- a/icons/POI/mountain-11.png
+++ b/icons/POI/mountain-11.png
--- a/icons/POI/museum-11.png
+++ b/icons/POI/museum-11.png
--- a/icons/POI/park-11.png
+++ b/icons/POI/park-11.png
--- a/icons/POI/parking-11.png
+++ b/icons/POI/parking-11.png
--- a/icons/POI/pharmacy-11.png
+++ b/icons/POI/pharmacy-11.png
--- a/icons/POI/picnic-site-11.png
+++ b/icons/POI/picnic-site-11.png
--- a/icons/POI/place-of-worship-11.png
+++ b/icons/POI/place-of-worship-11.png
--- a/icons/POI/police-11.png
+++ b/icons/POI/police-11.png
--- a/Show More
+++ b/Show More