Some more micro-optimizations & code cleanup

Version++
Added support for custom HTTP headers in map tile requests
2025-07-01 05:19:15 +02:00 · 2023-05-16 23:03:07 +02:00 · 2023-05-13 15:05:10 +02:00 · 2023-05-13 15:01:35 +02:00 · 2023-05-12 10:19:52 +02:00 · 2023-05-11 22:57:35 +02:00
339 changed files with 19145 additions and 15445 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 11.10.{build}
+version: 13.3.{build}

 configuration:
  - Release
@ -28,9 +28,9 @@ build_script:
    md installer
    copy release\GPXSee.exe installer
    windeployqt --release installer\GPXSee.exe
-    copy pkg\gpxsee64.nsi installer
-    xcopy pkg\csv installer\csv /i
-    xcopy pkg\maps installer\maps /i
+    copy pkg\windows\gpxsee64.nsi installer
+    xcopy data\CRS installer\CRS /i
+    xcopy data\maps installer\maps /i
    xcopy lang\*.qm installer\translations\ /sy
    xcopy icons\symbols installer\symbols /i
    copy licence.txt installer
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -28,16 +28,14 @@ jobs:
      - name: Install Qt (Desktop)
        uses: jurplel/install-qt-action@v3
        with:
-          aqtversion: '==2.1.0'
          version: '6.4.0'
      - name: Install Qt (Android)
        uses: jurplel/install-qt-action@v3
        with:
-          aqtversion: '==2.1.0'
          version: '6.4.0'
          target: 'android'
          arch: 'android_armv7'
-          modules: qtpositioning qt5compat
+          modules: qtpositioning qt5compat qtserialport
      - name: Install Android OpenSSL
        run:  git clone https://github.com/KDAB/android_openssl.git
      - name: Create localization
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -0,0 +1,45 @@
+name: "CodeQL"
+
+on: [workflow_dispatch]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Install dependencies
+      run: |
+          sudo apt-get update
+          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev libqt5serialport5-dev
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -15,7 +15,7 @@ jobs:
      - name: Install dependencies
        run: |
          sudo apt-get update
-          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev
+          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev libqt5serialport5-dev
      - name: Create localization
        run: lrelease gpxsee.pro
      - name: Configure build
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@ -10,12 +10,12 @@ jobs:
    name: GPXSee Qt5 build
    runs-on: macos-latest
    steps:
-      - name: Set environment variables
-        run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
      - name: Checkout
        uses: actions/checkout@v3
-      - name: Install dependencies
-        run: brew install qt5
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '5.15.2'
      - name: Create localization
        run: lrelease gpxsee.pro
      - name: Configure build
@ -23,7 +23,7 @@ jobs:
      - name: Build project
        run: make -j3
      - name: Create DMG
-        run: macdeployqt GPXSee.app -dmg
+        run: macdeployqt GPXSee.app -dmg -appstore-compliant
      - name: Upload artifacts
        uses: actions/upload-artifact@v3
        with:
@ -34,12 +34,13 @@ jobs:
    name: GPXSee Qt6 build
    runs-on: macos-latest
    steps:
-      - name: Set environment variables
-        run: echo "PATH=/usr/local/opt/qt@6/bin:$PATH" >> $GITHUB_ENV
      - name: Checkout
        uses: actions/checkout@v3
-      - name: Install dependencies
-        run: brew install qt6
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '6.4.3'
+          modules: qtpositioning qt5compat qtserialport
      - name: Create localization
        run: lrelease gpxsee.pro
      - name: Configure build
@ -47,7 +48,7 @@ jobs:
      - name: Build project
        run: make -j3
      - name: Create DMG
-        run: macdeployqt GPXSee.app -dmg
+        run: macdeployqt GPXSee.app -dmg -appstore-compliant
      - name: Upload artifacts
        uses: actions/upload-artifact@v3
        with:
--- a/README.md
+++ b/README.md
@ -64,7 +64,7 @@ GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using
 different, GPL compatible, licenses:

 * [Oxygen icons](icons/GUI) - LGPLv3
-* [Mapbox Maki icons](icons/map/IMG/POI) - CC0
+* [Mapbox Maki icons](icons/map/POI) - CC0
 * [Map Icons Collection](icons/symbols) - CC BY SA 3.0
 * [RTree implementation](src/common/rtree.h) - Public domain
 * [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp),
@ -73,5 +73,5 @@ different, GPL compatible, licenses:
  [Polyconic](src/map/proj/polyconic.cpp) and
  [Transverse Mercator](src/map/proj/transversemercator.cpp) projections - NIMA
  Source Code Disclaimer
-* [Projection parameters CSV files](pkg/csv) - BSD/EPSG/Public domain
-* [Mapsforge render theme](data/default.xml) and its [icons](icons/map/mapsforge) - LGPLv3
+* [Projection parameters CSV files](data/CRS) - BSD/EPSG/Public domain
+* [Mapsforge render theme](data/mapsforge/default.xml) and its [icons](icons/map/mapsforge) - LGPLv3
--- a/data/CRS/ellipsoids.csv
+++ b/data/CRS/ellipsoids.csv
--- a/data/CRS/gcs.csv
+++ b/data/CRS/gcs.csv
@ -345,6 +345,7 @@ FEH2010,5593,1078,9122,7019,8901,9603,0,0,0,,,,
 CIGD11,6135,1100,9122,7019,8901,9603,0,0,0,,,,
 Nepal 1981,6207,1111,9122,7015,8901,9603,293.17,726.18,245.36,,,,
 CGRS93,6311,1112,9122,7030,8901,9607,8.846,-4.394,-1.122,0.00237,0.146528,-0.130428,0.783926
+NAD83(2011),6318,1116,9122,7019,8901,9603,0,0,0,,,,
 Mexico ITRF2008,6365,1120,9122,7019,8901,9603,0,0,0,,,,
 RDN2008,6706,1132,9122,7019,8901,9603,0,0,0,,,,
 Aden 1925,6881,1135,9122,7012,8901,9603,-24,-203,268,,,,
--- a/data/CRS/pcs.csv
+++ b/data/CRS/pcs.csv
--- a/data/CRS/projections.csv
+++ b/data/CRS/projections.csv
--- a/data/maps/4UMaps.xml
+++ b/data/maps/4UMaps.xml
--- a/data/maps/Antarctica.xml
+++ b/data/maps/Antarctica.xml
--- a/data/maps/OpenStreetMap.xml
+++ b/data/maps/OpenStreetMap.xml
--- a/data/maps/OpenTopoMap.xml
+++ b/data/maps/OpenTopoMap.xml
--- a/data/maps/USGS-imagery.xml
+++ b/data/maps/USGS-imagery.xml
--- a/data/maps/USGS-topo.xml
+++ b/data/maps/USGS-topo.xml
--- a/data/mapsforge/default.xml
+++ b/data/mapsforge/default.xml
@ -1144,7 +1144,7 @@
        <rule e="any" k="amenity" v="fuel" zoom-min="13">
            <symbol id="fuel" src=":/mapsforge/symbols/transport/fuel.svg" />
            <rule e="any" k="*" v="*" zoom-min="18">
-                <caption fill="#0092DA" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
+                <caption fill="#AC39AC" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
                    stroke-width="2.0" symbol-id="fuel" />
            </rule>
        </rule>
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
    TARGET = GPXSee
 }
-VERSION = 11.10
+VERSION = 13.3

 QT += core \
    gui \
@ -14,7 +14,8 @@ QT += core \
    widgets \
    printsupport \
    positioning \
-    svg
+    svg \
+    serialport
 greaterThan(QT_MAJOR_VERSION, 5) {
    QT += openglwidgets \
          core5compat
@ -25,10 +26,10 @@ INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
    src/GUI/crosshairitem.h \
    src/GUI/motioninfoitem.h \
-    src/GUI/navigationwidget.h \
    src/GUI/pluginparameters.h \
    src/common/garmin.h \
    src/common/coordinates.h \
+    src/common/hash.h \
    src/common/linec.h \
    src/common/range.h \
    src/common/rectc.h \
@ -44,6 +45,7 @@ HEADERS += src/common/config.h \
    src/common/downloader.h \
    src/common/polygon.h \
    src/common/color.h \
+    src/common/csv.h \
    src/GUI/authenticationwidget.h \
    src/GUI/axislabelitem.h \
    src/GUI/dirselectwidget.h \
@ -123,6 +125,8 @@ HEADERS += src/common/config.h \
    src/map/ENC/rastertile.h \
    src/map/ENC/style.h \
    src/map/IMG/section.h \
+    src/map/IMG/zoom.h \
+    src/map/conversion.h \
    src/map/encmap.h \
    src/map/ENC/iso8211.h \
    src/map/gemfmap.h \
@ -250,7 +254,6 @@ HEADERS += src/common/config.h \
    src/data/demloader.h \
    src/data/area.h \
    src/data/exifparser.h \
-    src/data/csv.h \
    src/data/cupparser.h \
    src/data/gpiparser.h \
    src/data/address.h \
@ -260,8 +263,8 @@ HEADERS += src/common/config.h \
 SOURCES += src/main.cpp \
    src/GUI/crosshairitem.cpp \
    src/GUI/motioninfoitem.cpp \
-    src/GUI/navigationwidget.cpp \
    src/GUI/pluginparameters.cpp \
+    src/GUI/settings.cpp \
    src/common/coordinates.cpp \
    src/common/rectc.cpp \
    src/common/range.cpp \
@ -271,6 +274,7 @@ SOURCES += src/main.cpp \
    src/common/programpaths.cpp \
    src/common/tifffile.cpp \
    src/common/downloader.cpp \
+    src/common/csv.cpp \
    src/GUI/authenticationwidget.cpp \
    src/GUI/axislabelitem.cpp \
    src/GUI/dirselectwidget.cpp \
@ -333,6 +337,7 @@ SOURCES += src/main.cpp \
    src/map/ENC/mapdata.cpp \
    src/map/ENC/rastertile.cpp \
    src/map/ENC/style.cpp \
+    src/map/conversion.cpp \
    src/map/encmap.cpp \
    src/map/ENC/iso8211.cpp \
    src/map/gemfmap.cpp \
@ -444,7 +449,6 @@ SOURCES += src/main.cpp \
    src/data/dem.cpp \
    src/data/demloader.cpp \
    src/data/exifparser.cpp \
-    src/data/csv.cpp \
    src/data/cupparser.cpp \
    src/data/gpiparser.cpp \
    src/data/smlparser.cpp \
@ -472,23 +476,26 @@ TRANSLATIONS = lang/gpxsee_en.ts \
    lang/gpxsee_it.ts \
    lang/gpxsee_eo.ts \
    lang/gpxsee_zh.ts \
-    lang/gpxsee_ca.ts
+    lang/gpxsee_ca.ts \
+    lang/gpxsee_ko.ts

 macx {
    ICON = icons/app/gpxsee.icns
-    QMAKE_INFO_PLIST = pkg/Info.plist
+    QMAKE_INFO_PLIST = pkg/mac/Info.plist
    locale.path = Contents/Resources/translations
    locale.files = $$files(lang/*.qm)
-    csv.path = Contents/Resources
-    csv.files = pkg/csv
+    crs.path = Contents/Resources
+    crs.files = data/CRS
    maps.path = Contents/Resources
-    maps.files = pkg/maps
+    maps.files = data/maps
    symbols.path = Contents/Resources/symbols
    symbols.files = $$files(icons/symbols/*.png)
    icons.path = Contents/Resources/icons
    icons.files = $$files(icons/formats/*.icns)
+    lproj.path = Contents/Resources
+    lproj.files = $$files(pkg/mac/lproj/*)

-    QMAKE_BUNDLE_DATA += locale maps symbols icons csv
+    QMAKE_BUNDLE_DATA += locale maps symbols icons crs lproj
 }

 win32 {
@ -533,25 +540,30 @@ win32 {
 unix:!macx:!android {
    isEmpty(PREFIX):PREFIX = /usr/local

-    maps.files = $$files(pkg/maps/*)
+    maps.files = $$files(data/maps/*)
    maps.path = $$PREFIX/share/gpxsee/maps
-    csv.files = $$files(pkg/csv/*)
-    csv.path = $$PREFIX/share/gpxsee/csv
+    crs.files = $$files(data/CRS/*)
+    crs.path = $$PREFIX/share/gpxsee/CRS
    symbols.files = $$files(icons/symbols/*.png)
    symbols.path = $$PREFIX/share/gpxsee/symbols
    locale.files = $$files(lang/*.qm)
    locale.path = $$PREFIX/share/gpxsee/translations
    icon.files = $$files(icons/app/hicolor/*)
    icon.path = $$PREFIX/share/icons/hicolor
-    desktop.files = pkg/gpxsee.desktop
+    desktop.files = pkg/linux/gpxsee.desktop
    desktop.path = $$PREFIX/share/applications
-    mime.files = pkg/gpxsee.xml
+    mime.files = pkg/linux/gpxsee.xml
    mime.path = $$PREFIX/share/mime/packages
+    appdata.files = pkg/linux/gpxsee.appdata.xml
+    appdata.path = $$PREFIX/share/metainfo
    target.path = $$PREFIX/bin
-    INSTALLS += target maps csv symbols locale icon desktop mime
+    INSTALLS += target maps crs symbols locale icon desktop mime appdata
 }

 android {
+    HEADERS += src/GUI/navigationwidget.h
+    SOURCES += src/GUI/navigationwidget.cpp
+
    defineReplace(versionCode) {
        segments = $$split(1, ".")
        for (segment, segments): \
@ -581,13 +593,13 @@ android {
        pkg/android/build.gradle \
        pkg/android/res/values/libs.xml

-    maps.files = $$files(pkg/maps/*)
+    maps.files = $$files(data/maps/*)
    maps.path = /assets/maps
-    csv.files = $$files(pkg/csv/*)
-    csv.path = /assets/csv
+    crs.files = $$files(data/CRS/*)
+    crs.path = /assets/CRS
    symbols.files = $$files(icons/symbols/*.png)
    symbols.path = /assets/symbols
    translations.files = $$files(lang/*.qm)
    translations.path = /assets/translations
-    INSTALLS += maps csv symbols translations
+    INSTALLS += maps crs symbols translations
 }
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -55,99 +55,93 @@
 		<file alias="transform-move_32@2x.png">icons/GUI/transform-move_32@2x.png</file>
 	</qresource>

-	<!-- IMG map style -->
-	<qresource prefix="/IMG">
-		<file alias="airfield-11.png">icons/map/IMG/POI/airfield-11.png</file>
-		<file alias="airport-11.png">icons/map/IMG/POI/airport-11.png</file>
-		<file alias="amusement-park-11.png">icons/map/IMG/POI/amusement-park-11.png</file>
-		<file alias="bakery-11.png">icons/map/IMG/POI/bakery-11.png</file>
-		<file alias="bank-11.png">icons/map/IMG/POI/bank-11.png</file>
-		<file alias="bar-11.png">icons/map/IMG/POI/bar-11.png</file>
-		<file alias="bbq-11.png">icons/map/IMG/POI/bbq-11.png</file>
-		<file alias="beach-11.png">icons/map/IMG/POI/beach-11.png</file>
-		<file alias="bowling-alley-11.png">icons/map/IMG/POI/bowling-alley-11.png</file>
-		<file alias="building-alt1-11.png">icons/map/IMG/POI/building-alt1-11.png</file>
-		<file alias="bridge-11.png">icons/map/IMG/POI/bridge-11.png</file>
-		<file alias="bus-11.png">icons/map/IMG/POI/bus-11.png</file>
-		<file alias="cafe-11.png">icons/map/IMG/POI/cafe-11.png</file>
-		<file alias="campsite-11.png">icons/map/IMG/POI/campsite-11.png</file>
-		<file alias="car-11.png">icons/map/IMG/POI/car-11.png</file>
-		<file alias="car-rental-11.png">icons/map/IMG/POI/car-rental-11.png</file>
-		<file alias="car-repair-11.png">icons/map/IMG/POI/car-repair-11.png</file>
-		<file alias="casino-11.png">icons/map/IMG/POI/casino-11.png</file>
-		<file alias="cemetery-11.png">icons/map/IMG/POI/cemetery-11.png</file>
-		<file alias="cinema-11.png">icons/map/IMG/POI/cinema-11.png</file>
-		<file alias="clothing-store-11.png">icons/map/IMG/POI/clothing-store-11.png</file>
-		<file alias="communications-tower-11.png">icons/map/IMG/POI/communications-tower-11.png</file>
-		<file alias="convenience-11.png">icons/map/IMG/POI/convenience-11.png</file>
-		<file alias="dam-11.png">icons/map/IMG/POI/dam-11.png</file>
-		<file alias="danger-11.png">icons/map/IMG/POI/danger-11.png</file>
-		<file alias="drinking-water-11.png">icons/map/IMG/POI/drinking-water-11.png</file>
-		<file alias="fast-food-11.png">icons/map/IMG/POI/fast-food-11.png</file>
-		<file alias="entrance-alt1-11.png">icons/map/IMG/POI/entrance-alt1-11.png</file>
-		<file alias="fire-station-11.png">icons/map/IMG/POI/fire-station-11.png</file>
-		<file alias="fitness-centre-11.png">icons/map/IMG/POI/fitness-centre-11.png</file>
-		<file alias="fuel-11.png">icons/map/IMG/POI/fuel-11.png</file>
-		<file alias="furniture-11.png">icons/map/IMG/POI/furniture-11.png</file>
-		<file alias="garden-11.png">icons/map/IMG/POI/garden-11.png</file>
-		<file alias="garden-centre-11.png">icons/map/IMG/POI/garden-centre-11.png</file>
-		<file alias="golf-11.png">icons/map/IMG/POI/golf-11.png</file>
-		<file alias="grocery-11.png">icons/map/IMG/POI/grocery-11.png</file>
-		<file alias="hairdresser-11.png">icons/map/IMG/POI/hairdresser-11.png</file>
-		<file alias="harbor-11.png">icons/map/IMG/POI/harbor-11.png</file>
-		<file alias="hardware-11.png">icons/map/IMG/POI/hardware-11.png</file>
-		<file alias="heliport-11.png">icons/map/IMG/POI/heliport-11.png</file>
-		<file alias="hospital-11.png">icons/map/IMG/POI/hospital-11.png</file>
-		<file alias="information-11.png">icons/map/IMG/POI/information-11.png</file>
-		<file alias="landmark-11.png">icons/map/IMG/POI/landmark-11.png</file>
-		<file alias="library-11.png">icons/map/IMG/POI/library-11.png</file>
-		<file alias="lodging-11.png">icons/map/IMG/POI/lodging-11.png</file>
-		<file alias="mountain-11.png">icons/map/IMG/POI/mountain-11.png</file>
-		<file alias="museum-11.png">icons/map/IMG/POI/museum-11.png</file>
-		<file alias="park-11.png">icons/map/IMG/POI/park-11.png</file>
-		<file alias="parking-11.png">icons/map/IMG/POI/parking-11.png</file>
-		<file alias="pharmacy-11.png">icons/map/IMG/POI/pharmacy-11.png</file>
-		<file alias="picnic-site-11.png">icons/map/IMG/POI/picnic-site-11.png</file>
-		<file alias="place-of-worship-11.png">icons/map/IMG/POI/place-of-worship-11.png</file>
-		<file alias="police-11.png">icons/map/IMG/POI/police-11.png</file>
-		<file alias="post-11.png">icons/map/IMG/POI/post-11.png</file>
-		<file alias="religious-christian-11.png">icons/map/IMG/POI/religious-christian-11.png</file>
-		<file alias="religious-jewish-11.png">icons/map/IMG/POI/religious-jewish-11.png</file>
-		<file alias="religious-muslim-11.png">icons/map/IMG/POI/religious-muslim-11.png</file>
-		<file alias="restaurant-11.png">icons/map/IMG/POI/restaurant-11.png</file>
-		<file alias="restaurant-noodle-11.png">icons/map/IMG/POI/restaurant-noodle-11.png</file>
-		<file alias="restaurant-pizza-11.png">icons/map/IMG/POI/restaurant-pizza-11.png</file>
-		<file alias="restaurant-seafood-11.png">icons/map/IMG/POI/restaurant-seafood-11.png</file>
-		<file alias="roadblock-11.png">icons/map/IMG/POI/roadblock-11.png</file>
-		<file alias="school-11.png">icons/map/IMG/POI/school-11.png</file>
-		<file alias="shelter-11.png">icons/map/IMG/POI/shelter-11.png</file>
-		<file alias="shop-11.png">icons/map/IMG/POI/shop-11.png</file>
-		<file alias="skiing-11.png">icons/map/IMG/POI/skiing-11.png</file>
-		<file alias="soccer-11.png">icons/map/IMG/POI/soccer-11.png</file>
-		<file alias="swimming-11.png">icons/map/IMG/POI/swimming-11.png</file>
-		<file alias="theatre-11.png">icons/map/IMG/POI/theatre-11.png</file>
-		<file alias="telephone-11.png">icons/map/IMG/POI/telephone-11.png</file>
-		<file alias="toilet-11.png">icons/map/IMG/POI/toilet-11.png</file>
-		<file alias="town-hall-11.png">icons/map/IMG/POI/town-hall-11.png</file>
-		<file alias="viewpoint-11.png">icons/map/IMG/POI/viewpoint-11.png</file>
-		<file alias="village-11.png">icons/map/IMG/POI/village-11.png</file>
-		<file alias="waterfall-11.png">icons/map/IMG/POI/waterfall-11.png</file>
-		<file alias="wetland-11.png">icons/map/IMG/POI/wetland-11.png</file>
-		<file alias="zoo-11.png">icons/map/IMG/POI/zoo-11.png</file>
+	<!-- POIs (IMG & ENC style) -->
+	<qresource prefix="/POI">
+		<file alias="airfield-11.png">icons/map/POI/airfield-11.png</file>
+		<file alias="airport-11.png">icons/map/POI/airport-11.png</file>
+		<file alias="amusement-park-11.png">icons/map/POI/amusement-park-11.png</file>
+		<file alias="bakery-11.png">icons/map/POI/bakery-11.png</file>
+		<file alias="bank-11.png">icons/map/POI/bank-11.png</file>
+		<file alias="bar-11.png">icons/map/POI/bar-11.png</file>
+		<file alias="bbq-11.png">icons/map/POI/bbq-11.png</file>
+		<file alias="beach-11.png">icons/map/POI/beach-11.png</file>
+		<file alias="bowling-alley-11.png">icons/map/POI/bowling-alley-11.png</file>
+		<file alias="building-alt1-11.png">icons/map/POI/building-alt1-11.png</file>
+		<file alias="bridge-11.png">icons/map/POI/bridge-11.png</file>
+		<file alias="bus-11.png">icons/map/POI/bus-11.png</file>
+		<file alias="cafe-11.png">icons/map/POI/cafe-11.png</file>
+		<file alias="campsite-11.png">icons/map/POI/campsite-11.png</file>
+		<file alias="car-11.png">icons/map/POI/car-11.png</file>
+		<file alias="car-rental-11.png">icons/map/POI/car-rental-11.png</file>
+		<file alias="car-repair-11.png">icons/map/POI/car-repair-11.png</file>
+		<file alias="casino-11.png">icons/map/POI/casino-11.png</file>
+		<file alias="cemetery-11.png">icons/map/POI/cemetery-11.png</file>
+		<file alias="cinema-11.png">icons/map/POI/cinema-11.png</file>
+		<file alias="clothing-store-11.png">icons/map/POI/clothing-store-11.png</file>
+		<file alias="communications-tower-11.png">icons/map/POI/communications-tower-11.png</file>
+		<file alias="convenience-11.png">icons/map/POI/convenience-11.png</file>
+		<file alias="dam-11.png">icons/map/POI/dam-11.png</file>
+		<file alias="danger-11.png">icons/map/POI/danger-11.png</file>
+		<file alias="drinking-water-11.png">icons/map/POI/drinking-water-11.png</file>
+		<file alias="fast-food-11.png">icons/map/POI/fast-food-11.png</file>
+		<file alias="entrance-alt1-11.png">icons/map/POI/entrance-alt1-11.png</file>
+		<file alias="fire-station-11.png">icons/map/POI/fire-station-11.png</file>
+		<file alias="fitness-centre-11.png">icons/map/POI/fitness-centre-11.png</file>
+		<file alias="fuel-11.png">icons/map/POI/fuel-11.png</file>
+		<file alias="furniture-11.png">icons/map/POI/furniture-11.png</file>
+		<file alias="garden-11.png">icons/map/POI/garden-11.png</file>
+		<file alias="garden-centre-11.png">icons/map/POI/garden-centre-11.png</file>
+		<file alias="golf-11.png">icons/map/POI/golf-11.png</file>
+		<file alias="grocery-11.png">icons/map/POI/grocery-11.png</file>
+		<file alias="hairdresser-11.png">icons/map/POI/hairdresser-11.png</file>
+		<file alias="harbor-11.png">icons/map/POI/harbor-11.png</file>
+		<file alias="hardware-11.png">icons/map/POI/hardware-11.png</file>
+		<file alias="heliport-11.png">icons/map/POI/heliport-11.png</file>
+		<file alias="hospital-11.png">icons/map/POI/hospital-11.png</file>
+		<file alias="information-11.png">icons/map/POI/information-11.png</file>
+		<file alias="landmark-11.png">icons/map/POI/landmark-11.png</file>
+		<file alias="library-11.png">icons/map/POI/library-11.png</file>
+		<file alias="lodging-11.png">icons/map/POI/lodging-11.png</file>
+		<file alias="mountain-11.png">icons/map/POI/mountain-11.png</file>
+		<file alias="museum-11.png">icons/map/POI/museum-11.png</file>
+		<file alias="park-11.png">icons/map/POI/park-11.png</file>
+		<file alias="parking-11.png">icons/map/POI/parking-11.png</file>
+		<file alias="pharmacy-11.png">icons/map/POI/pharmacy-11.png</file>
+		<file alias="picnic-site-11.png">icons/map/POI/picnic-site-11.png</file>
+		<file alias="place-of-worship-11.png">icons/map/POI/place-of-worship-11.png</file>
+		<file alias="police-11.png">icons/map/POI/police-11.png</file>
+		<file alias="post-11.png">icons/map/POI/post-11.png</file>
+		<file alias="religious-christian-11.png">icons/map/POI/religious-christian-11.png</file>
+		<file alias="religious-jewish-11.png">icons/map/POI/religious-jewish-11.png</file>
+		<file alias="religious-muslim-11.png">icons/map/POI/religious-muslim-11.png</file>
+		<file alias="restaurant-11.png">icons/map/POI/restaurant-11.png</file>
+		<file alias="restaurant-noodle-11.png">icons/map/POI/restaurant-noodle-11.png</file>
+		<file alias="restaurant-pizza-11.png">icons/map/POI/restaurant-pizza-11.png</file>
+		<file alias="restaurant-seafood-11.png">icons/map/POI/restaurant-seafood-11.png</file>
+		<file alias="roadblock-11.png">icons/map/POI/roadblock-11.png</file>
+		<file alias="school-11.png">icons/map/POI/school-11.png</file>
+		<file alias="shelter-11.png">icons/map/POI/shelter-11.png</file>
+		<file alias="shop-11.png">icons/map/POI/shop-11.png</file>
+		<file alias="skiing-11.png">icons/map/POI/skiing-11.png</file>
+		<file alias="soccer-11.png">icons/map/POI/soccer-11.png</file>
+		<file alias="swimming-11.png">icons/map/POI/swimming-11.png</file>
+		<file alias="theatre-11.png">icons/map/POI/theatre-11.png</file>
+		<file alias="telephone-11.png">icons/map/POI/telephone-11.png</file>
+		<file alias="toilet-11.png">icons/map/POI/toilet-11.png</file>
+		<file alias="town-hall-11.png">icons/map/POI/town-hall-11.png</file>
+		<file alias="viewpoint-11.png">icons/map/POI/viewpoint-11.png</file>
+		<file alias="village-11.png">icons/map/POI/village-11.png</file>
+		<file alias="waterfall-11.png">icons/map/POI/waterfall-11.png</file>
+		<file alias="wetland-11.png">icons/map/POI/wetland-11.png</file>
+		<file alias="zoo-11.png">icons/map/POI/zoo-11.png</file>
 	</qresource>

 	<!-- marine stuff (IMG & ENC style) -->
 	<qresource prefix="/marine">
 		<file alias="light-major.png">icons/map/marine/light-major.png</file>
-		<file alias="light-major-port.png">icons/map/marine/light-major-port.png</file>
-		<file alias="light-major-starboard.png">icons/map/marine/light-major-starboard.png</file>
 		<file alias="light-platform.png">icons/map/marine/light-platform.png</file>
 		<file alias="buoy.png">icons/map/marine/buoy.png</file>
-		<file alias="buoy-starboard.png">icons/map/marine/buoy-starboard.png</file>
-		<file alias="buoy-port.png">icons/map/marine/buoy-port.png</file>
 		<file alias="beacon.png">icons/map/marine/beacon.png</file>
-		<file alias="beacon-port.png">icons/map/marine/beacon-port.png</file>
-		<file alias="beacon-starboard.png">icons/map/marine/beacon-starboard.png</file>
 		<file alias="rock-exposed.png">icons/map/marine/rock-exposed.png</file>
 		<file alias="rock-dangerous.png">icons/map/marine/rock-dangerous.png</file>
 		<file alias="wreck.png">icons/map/marine/wreck.png</file>
@ -165,6 +159,7 @@
 		<file alias="church.png">icons/map/marine/church.png</file>
 		<file alias="triangulation-point.png">icons/map/marine/triangulation-point.png</file>
 		<file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
+		<file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
 		<file alias="pile.png">icons/map/marine/pile.png</file>
 		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
 		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
@ -176,6 +171,7 @@
 		<file alias="fence-line.png">icons/map/marine/fence-line.png</file>
 		<file alias="crane.png">icons/map/marine/crane.png</file>
 		<file alias="distance-mark.png">icons/map/marine/distance-mark.png</file>
+		<file alias="distance-mark-land.png">icons/map/marine/distance-mark-land.png</file>
 		<file alias="conveyor-line.png">icons/map/marine/conveyor-line.png</file>
 		<file alias="pipeline-overhead.png">icons/map/marine/pipeline-overhead.png</file>
 		<file alias="coast-guard.png">icons/map/marine/coast-guard.png</file>
@ -186,11 +182,27 @@
 		<file alias="silo.png">icons/map/marine/silo.png</file>
 		<file alias="turning-basin.png">icons/map/marine/turning-basin.png</file>
 		<file alias="entry-prohibited-line.png">icons/map/marine/entry-prohibited-line.png</file>
+		<file alias="safety-zone-line.png">icons/map/marine/safety-zone-line.png</file>
+		<file alias="cable-area-line.png">icons/map/marine/cable-area-line.png</file>
+		<file alias="pipeline-area-line.png">icons/map/marine/pipeline-area-line.png</file>
+		<file alias="windmotor.png">icons/map/marine/windmotor.png</file>
+		<file alias="gauge.png">icons/map/marine/gauge.png</file>
+		<file alias="fishing-farm-line.png">icons/map/marine/fishing-farm-line.png</file>
+		<file alias="shipyard.png">icons/map/marine/shipyard.png</file>
+		<file alias="pylon.png">icons/map/marine/pylon.png</file>
+		<file alias="fleeting-area.png">icons/map/marine/fleeting-area.png</file>
+		<file alias="breakers.png">icons/map/marine/breakers.png</file>
+		<file alias="overfalls.png">icons/map/marine/overfalls.png</file>
+		<file alias="boarding-place.png">icons/map/marine/boarding-place.png</file>
+		<file alias="light.png">icons/map/marine/light.png</file>
+		<file alias="building.png">icons/map/marine/building.png</file>
+		<file alias="fog-signal.png">icons/map/marine/fog-signal.png</file>
+		<file alias="construction.png">icons/map/marine/construction.png</file>
 	</qresource>

 	<!-- Mapsforge rendertheme -->
 	<qresource prefix="/mapsforge">
-		<file alias="default.xml">data/default.xml</file>
+		<file alias="default.xml">data/mapsforge/default.xml</file>

 		<file alias="patterns/hills.svg">icons/map/mapsforge/patterns/hills.svg</file>
 		<file alias="patterns/farmland.svg">icons/map/mapsforge/patterns/farmland.svg</file>
--- a/icons/map/IMG/POI/airfield-11.png
+++ b/icons/map/IMG/POI/airfield-11.png
--- a/icons/map/IMG/POI/airport-11.png
+++ b/icons/map/IMG/POI/airport-11.png
--- a/icons/map/IMG/POI/amusement-park-11.png
+++ b/icons/map/IMG/POI/amusement-park-11.png
--- a/icons/map/IMG/POI/bakery-11.png
+++ b/icons/map/IMG/POI/bakery-11.png
--- a/icons/map/IMG/POI/bank-11.png
+++ b/icons/map/IMG/POI/bank-11.png
--- a/icons/map/IMG/POI/bar-11.png
+++ b/icons/map/IMG/POI/bar-11.png
--- a/icons/map/IMG/POI/bbq-11.png
+++ b/icons/map/IMG/POI/bbq-11.png
--- a/icons/map/IMG/POI/beach-11.png
+++ b/icons/map/IMG/POI/beach-11.png
--- a/icons/map/IMG/POI/bowling-alley-11.png
+++ b/icons/map/IMG/POI/bowling-alley-11.png
--- a/icons/map/IMG/POI/bridge-11.png
+++ b/icons/map/IMG/POI/bridge-11.png
--- a/icons/map/IMG/POI/building-alt1-11.png
+++ b/icons/map/IMG/POI/building-alt1-11.png
--- a/icons/map/IMG/POI/bus-11.png
+++ b/icons/map/IMG/POI/bus-11.png
--- a/icons/map/IMG/POI/cafe-11.png
+++ b/icons/map/IMG/POI/cafe-11.png
--- a/icons/map/IMG/POI/campsite-11.png
+++ b/icons/map/IMG/POI/campsite-11.png
--- a/icons/map/IMG/POI/car-11.png
+++ b/icons/map/IMG/POI/car-11.png
--- a/icons/map/IMG/POI/car-rental-11.png
+++ b/icons/map/IMG/POI/car-rental-11.png
--- a/icons/map/IMG/POI/car-repair-11.png
+++ b/icons/map/IMG/POI/car-repair-11.png
--- a/icons/map/IMG/POI/casino-11.png
+++ b/icons/map/IMG/POI/casino-11.png
--- a/icons/map/IMG/POI/cemetery-11.png
+++ b/icons/map/IMG/POI/cemetery-11.png
--- a/icons/map/IMG/POI/cinema-11.png
+++ b/icons/map/IMG/POI/cinema-11.png
--- a/icons/map/IMG/POI/clothing-store-11.png
+++ b/icons/map/IMG/POI/clothing-store-11.png
--- a/icons/map/IMG/POI/communications-tower-11.png
+++ b/icons/map/IMG/POI/communications-tower-11.png
--- a/icons/map/IMG/POI/convenience-11.png
+++ b/icons/map/IMG/POI/convenience-11.png
--- a/icons/map/IMG/POI/dam-11.png
+++ b/icons/map/IMG/POI/dam-11.png
--- a/icons/map/IMG/POI/danger-11.png
+++ b/icons/map/IMG/POI/danger-11.png
--- a/icons/map/IMG/POI/drinking-water-11.png
+++ b/icons/map/IMG/POI/drinking-water-11.png
--- a/icons/map/IMG/POI/entrance-alt1-11.png
+++ b/icons/map/IMG/POI/entrance-alt1-11.png
--- a/icons/map/IMG/POI/fast-food-11.png
+++ b/icons/map/IMG/POI/fast-food-11.png
--- a/icons/map/IMG/POI/fire-station-11.png
+++ b/icons/map/IMG/POI/fire-station-11.png
--- a/icons/map/IMG/POI/fitness-centre-11.png
+++ b/icons/map/IMG/POI/fitness-centre-11.png
--- a/icons/map/IMG/POI/fuel-11.png
+++ b/icons/map/IMG/POI/fuel-11.png
--- a/icons/map/IMG/POI/furniture-11.png
+++ b/icons/map/IMG/POI/furniture-11.png
--- a/icons/map/IMG/POI/garden-11.png
+++ b/icons/map/IMG/POI/garden-11.png
--- a/icons/map/IMG/POI/garden-centre-11.png
+++ b/icons/map/IMG/POI/garden-centre-11.png
--- a/icons/map/IMG/POI/golf-11.png
+++ b/icons/map/IMG/POI/golf-11.png
--- a/icons/map/IMG/POI/grocery-11.png
+++ b/icons/map/IMG/POI/grocery-11.png
--- a/icons/map/IMG/POI/hairdresser-11.png
+++ b/icons/map/IMG/POI/hairdresser-11.png
--- a/icons/map/IMG/POI/harbor-11.png
+++ b/icons/map/IMG/POI/harbor-11.png
--- a/icons/map/IMG/POI/hardware-11.png
+++ b/icons/map/IMG/POI/hardware-11.png
--- a/icons/map/IMG/POI/heliport-11.png
+++ b/icons/map/IMG/POI/heliport-11.png
--- a/icons/map/IMG/POI/hospital-11.png
+++ b/icons/map/IMG/POI/hospital-11.png
--- a/icons/map/IMG/POI/information-11.png
+++ b/icons/map/IMG/POI/information-11.png
--- a/icons/map/IMG/POI/landmark-11.png
+++ b/icons/map/IMG/POI/landmark-11.png
--- a/icons/map/IMG/POI/library-11.png
+++ b/icons/map/IMG/POI/library-11.png
--- a/icons/map/IMG/POI/licence.txt
+++ b/icons/map/IMG/POI/licence.txt
@ -1,4 +1,4 @@
-The IMG style icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
+The POI icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
 licensed under CC0.

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