Merge branch 'master' into android-latest

Currently translated at 91.0% (449 of 493 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 13.34.{build}
+version: 13.44.{build}
 
 configuration:
   - Release
@@ -8,24 +8,24 @@ image:
 
 environment:
   NSISDIR: C:\Program Files (x86)\NSIS
+  JOMDIR: C:\Qt\Tools\QtCreator\bin\jom
   matrix:
   - QTDIR: C:\Qt\5.15\msvc2019_64
     OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
     NSISDEF: /DOPENSSL /DANGLE
-  - QTDIR: C:\Qt\6.8\msvc2019_64
-    OPENSSLDIR: C:\OpenSSL-v33-Win64\bin
-    NSISDEF: /DQT6 /DOPENSSL
+  - QTDIR: C:\Qt\6.8\msvc2022_64
+    NSISDEF: /DQT6
 
 install:
 - cmd: |-
-    set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
+    set PATH=%QTDIR%\bin;%NSISDIR%;%JOMDIR%;%PATH%
     call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat
 
 build_script:
 - cmd: |-
     lrelease gpxsee.pro
     qmake gpxsee.pro
-    nmake release
+    jom release
 
     md installer
     copy release\GPXSee.exe installer
@@ -36,8 +36,8 @@ build_script:
     xcopy lang\*.qm installer\translations\ /sy
     xcopy icons\symbols installer\symbols /i
     copy licence.txt installer
-    copy %OPENSSLDIR%\libcrypto-*-x64.dll installer
-    copy %OPENSSLDIR%\libssl-*-x64.dll installer
+    IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libcrypto-*-x64.dll installer)
+    IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libssl-*-x64.dll installer)
 
     makensis.exe %NSISDEF% installer\gpxsee64.nsi
 

.github/workflows/android.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Configure build
         run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl 
       - name: Build project
-        run:  make -j2 apk
+        run:  make -j4 apk
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:

.github/workflows/linux.yml

@@ -8,7 +8,10 @@ on:
 jobs:
   build:
     name: GPXSee
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        config: ['release', 'debug']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -19,6 +22,6 @@ jobs:
       - name: Create localization
         run: lrelease gpxsee.pro
       - name: Configure build
-        run: qmake gpxsee.pro
+        run: qmake CONFIG+=${{ matrix.config }} gpxsee.pro
       - name: Build project
-        run: make -j2
+        run: make -j4

.github/workflows/osx.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.8.0'
+          version: '6.8.2'
           modules: qtpositioning qtserialport qtimageformats
       - name: Create localization
         run: lrelease gpxsee.pro

README.md

@@ -5,7 +5,9 @@ GPS log file formats.
 ## Features
 * Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON,
   OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV, TomTom OV2&ITN, ONmove OMD/GHP,
-  TwoNav (TRK, RTE, WPT), GPSDump WPT and geotagged JPEG files.
+  TwoNav (TRK, RTE, WPT), GPSDump WPT, Velocitek VTK, Vakaros VKX, 70mai GPS logs
+  and geotagged JPEG files.
+* Opens geo URIs (RFC 5870).
 * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS,
   QuadTiles).
 * Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
@@ -28,8 +30,8 @@ GPS log file formats.
 
 ## Build
 Build requirements:
-* Qt5 >= 5.11 or Qt6 >= 6.2 (Android builds require Qt6)
-* C++11 or newer compiler (tested: msvc2019, gcc 7.5.0, clang/Apple LLVM version
+* Qt5 >= 5.15 or Qt6 >= 6.2 (Android builds require Qt6)
+* C++11 or newer compiler (tested: msvc2022, gcc 11, clang/Apple LLVM version
   10.0.0)
 
 Build steps:

data/maps/OpenFreeMap.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1.4">
+	<name>OpenFreeMap</name>
+	<url>https://tiles.openfreemap.org/planet/latest/$z/$x/$y.pbf</url>
+	<tile type="vector" size="512"/>
+	<zoom max="14"/>
+	<copyright>© OpenFreeMap © OpenMapTiles © OpenStreetMap contributors</copyright>
+</map>

data/style/style.xml

@@ -214,10 +214,11 @@
     </rule>
 
     <!-- Buildings -->
-    <rule e="way" k="building" v="*">
+    <rule e="way" k="building" v="-|civic|office|cathedral|church|basilica">
         <area fill="#dbd0b6" stroke="#cdccc4" stroke-width="0.1"/>
     </rule>
-    <rule e="way" k="building" v="civic">
+
+    <rule e="way" k="building" v="civic|office">
         <area fill="#cfc4b3" stroke="#cdccc4" stroke-width="0.1"/>
         <rule e="way" k="*" v="*" zoom-min="16">
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" priority="-10"/>
@@ -403,7 +404,7 @@
         <rule e="way" k="*" v="*" zoom-min="14">
             <pathText fill="#000000" font-size="10" k="name" priority="-5" stroke="#FFFFFF" stroke-width="2"/>
             <rule e="way" k="oneway" v="yes|true|1" zoom-min="16">
-                <lineSymbol priority="-50" src=":/symbols/arrow.svg" symbol-width="16" symbol-height="8"/>
+                <lineSymbol priority="-50" src=":/symbols/oneway.svg" symbol-width="16" symbol-height="8"/>
             </rule>
         </rule>
     </rule>
@@ -428,6 +429,12 @@
                 <line stroke="#f7d9a6" stroke-width="1" stroke-linecap="butt"/>
             </rule>
         </rule>
+        <rule e="way" k="*" v="*" zoom-min="14">
+            <pathText fill="#000000" font-size="10" k="name" priority="-3" stroke="#FFFFFF" stroke-width="2"/>
+            <rule e="way" k="oneway" v="yes|true|1" zoom-min="16">
+                <lineSymbol priority="-50" src=":/symbols/oneway.svg" symbol-width="16" symbol-height="8"/>
+            </rule>
+        </rule>
     </rule>
     <rule e="way" k="highway" v="motorway|motorway_link">
         <rule e="way" k="tunnel" v="~|false|no">

gpxsee.pro

@@ -3,8 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 13.34
-
+VERSION = 13.44
 
 QT += core \
     gui \
@@ -24,6 +23,8 @@ greaterThan(QT_MAJOR_VERSION, 5) {
 CONFIG += object_parallel_to_source
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
+    src/GUI/legendentryitem.h \
+    src/GUI/legenditem.h \
     src/common/garmin.h \
     src/common/coordinates.h \
     src/common/hash.h \
@@ -118,6 +119,11 @@ HEADERS += src/common/config.h \
     src/data/gpsdumpparser.h \
     src/data/style.h \
     src/data/twonavparser.h \
+    src/data/txtparser.h \
+    src/data/vkxparser.h \
+    src/data/vtkparser.h \
+    src/map/ENC/data.h \
+    src/map/IMG/light.h \
     src/map/downloader.h \
     src/map/demloader.h \
     src/map/ENC/attributes.h \
@@ -272,6 +278,8 @@ HEADERS += src/common/config.h \
     src/data/geojsonparser.h
 
 SOURCES += src/main.cpp \
+    src/GUI/legendentryitem.cpp \
+    src/GUI/legenditem.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \
@@ -343,6 +351,9 @@ SOURCES += src/main.cpp \
     src/GUI/pngexportdialog.cpp \
     src/GUI/projectioncombobox.cpp \
     src/GUI/passwordedit.cpp \
+    src/data/txtparser.cpp \
+    src/data/vkxparser.cpp \
+    src/data/vtkparser.cpp \
     src/map/downloader.cpp \
     src/map/demloader.cpp \
     src/map/ENC/atlasdata.cpp \
@@ -523,7 +534,7 @@ win32 {
     RESOURCES += theme-color.qrc
 
     QMAKE_TARGET_DESCRIPTION = GPXSee
-    QMAKE_TARGET_COPYRIGHT = Copyright (c) 2015-2024 Martin Tuma
+    QMAKE_TARGET_COPYRIGHT = Copyright (c) 2015-2025 Martin Tuma
     RC_ICONS = icons/app/gpxsee.ico \
         icons/formats/gpx.ico \
         icons/formats/tcx.ico \
@@ -558,7 +569,9 @@ win32 {
         icons/formats/trk.ico \
         icons/formats/gemf.ico \
         icons/formats/000.ico \
-        icons/formats/031.ico
+        icons/formats/031.ico \
+        icons/formats/vtk.ico \
+        icons/formats/vkx.ico
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }

gpxsee.qrc

@@ -43,6 +43,7 @@
 		<file alias="casino-11.svg">icons/map/POI/casino-11.svg</file>
 		<file alias="castle-11.svg">icons/map/POI/castle-11.svg</file>
 		<file alias="cemetery-11.svg">icons/map/POI/cemetery-11.svg</file>
+		<file alias="charging-station-11.svg">icons/map/POI/charging-station-11.svg</file>
 		<file alias="cinema-11.svg">icons/map/POI/cinema-11.svg</file>
 		<file alias="clothing-store-11.svg">icons/map/POI/clothing-store-11.svg</file>
 		<file alias="college-11.svg">icons/map/POI/college-11.svg</file>
@@ -138,7 +139,115 @@
 	<qresource prefix="/marine">
 		<file alias="light-major.png">icons/map/marine/light-major.png</file>
 		<file alias="buoy.png">icons/map/marine/buoy.png</file>
+		<file alias="buoy-white.png">icons/map/marine/buoy-white.png</file>
+		<file alias="buoy-white-black.png">icons/map/marine/buoy-white-black.png</file>
+		<file alias="buoy-white-green.png">icons/map/marine/buoy-white-green.png</file>
+		<file alias="buoy-white-red.png">icons/map/marine/buoy-white-red.png</file>
+		<file alias="buoy-white-yellow.png">icons/map/marine/buoy-white-yellow.png</file>
+		<file alias="buoy-white-orange.png">icons/map/marine/buoy-white-orange.png</file>
+		<file alias="buoy-white-yellow-white.png">icons/map/marine/buoy-white-yellow-white.png</file>
+		<file alias="buoy-white-orange-white.png">icons/map/marine/buoy-white-orange-white.png</file>
+		<file alias="buoy-green.png">icons/map/marine/buoy-green.png</file>
+		<file alias="buoy-green-white.png">icons/map/marine/buoy-green-white.png</file>
+		<file alias="buoy-green-white-green-white.png">icons/map/marine/buoy-green-white-green-white.png</file>
+		<file alias="buoy-green-black.png">icons/map/marine/buoy-green-black.png</file>
+		<file alias="buoy-green-red.png">icons/map/marine/buoy-green-red.png</file>
+		<file alias="buoy-green-red-green.png">icons/map/marine/buoy-green-red-green.png</file>
+		<file alias="buoy-green-red-green-red.png">icons/map/marine/buoy-green-red-green-red.png</file>
+		<file alias="buoy-red.png">icons/map/marine/buoy-red.png</file>
+		<file alias="buoy-red-white.png">icons/map/marine/buoy-red-white.png</file>
+		<file alias="buoy-red-white-red-white.png">icons/map/marine/buoy-red-white-red-white.png</file>
+		<file alias="buoy-red-black.png">icons/map/marine/buoy-red-black.png</file>
+		<file alias="buoy-red-green.png">icons/map/marine/buoy-red-green.png</file>
+		<file alias="buoy-red-yellow.png">icons/map/marine/buoy-red-yellow.png</file>
+		<file alias="buoy-red-green-red.png">icons/map/marine/buoy-red-green-red.png</file>
+		<file alias="buoy-red-green-red-green.png">icons/map/marine/buoy-red-green-red-green.png</file>
+		<file alias="buoy-yellow.png">icons/map/marine/buoy-yellow.png</file>
+		<file alias="buoy-yellow-white.png">icons/map/marine/buoy-yellow-white.png</file>
+		<file alias="buoy-yellow-white-yellow.png">icons/map/marine/buoy-yellow-white-yellow.png</file>
+		<file alias="buoy-yellow-black.png">icons/map/marine/buoy-yellow-black.png</file>
+		<file alias="buoy-yellow-black-yellow.png">icons/map/marine/buoy-yellow-black-yellow.png</file>
+		<file alias="buoy-yellow-red-yellow.png">icons/map/marine/buoy-yellow-red-yellow.png</file>
+		<file alias="buoy-black-white.png">icons/map/marine/buoy-black-white.png</file>
+		<file alias="buoy-black-red.png">icons/map/marine/buoy-black-red.png</file>
+		<file alias="buoy-black-white-black.png">icons/map/marine/buoy-black-white-black.png</file>
+		<file alias="buoy-black-red-black.png">icons/map/marine/buoy-black-red-black.png</file>
+		<file alias="buoy-black-green.png">icons/map/marine/buoy-black-green.png</file>
+		<file alias="buoy-black-yellow.png">icons/map/marine/buoy-black-yellow.png</file>
+		<file alias="buoy-black-orange.png">icons/map/marine/buoy-black-orange.png</file>
+		<file alias="buoy-black-yellow-black.png">icons/map/marine/buoy-black-yellow-black.png</file>
+		<file alias="buoy-orange.png">icons/map/marine/buoy-orange.png</file>
+		<file alias="buoy-orange-white.png">icons/map/marine/buoy-orange-white.png</file>
+		<file alias="buoy-orange-black.png">icons/map/marine/buoy-orange-black.png</file>
+		<file alias="buoy-grey.png">icons/map/marine/buoy-grey.png</file>
 		<file alias="beacon.png">icons/map/marine/beacon.png</file>
+		<file alias="beacon-white.png">icons/map/marine/beacon-white.png</file>
+		<file alias="beacon-white-black.png">icons/map/marine/beacon-white-black.png</file>
+		<file alias="beacon-white-green.png">icons/map/marine/beacon-white-green.png</file>
+		<file alias="beacon-white-red.png">icons/map/marine/beacon-white-red.png</file>
+		<file alias="beacon-white-yellow.png">icons/map/marine/beacon-white-yellow.png</file>
+		<file alias="beacon-white-orange.png">icons/map/marine/beacon-white-orange.png</file>
+		<file alias="beacon-white-yellow-white.png">icons/map/marine/beacon-white-yellow-white.png</file>
+		<file alias="beacon-white-orange-white.png">icons/map/marine/beacon-white-orange-white.png</file>
+		<file alias="beacon-green.png">icons/map/marine/beacon-green.png</file>
+		<file alias="beacon-green-white.png">icons/map/marine/beacon-green-white.png</file>
+		<file alias="beacon-green-white-green-white.png">icons/map/marine/beacon-green-white-green-white.png</file>
+		<file alias="beacon-green-black.png">icons/map/marine/beacon-green-black.png</file>
+		<file alias="beacon-green-red.png">icons/map/marine/beacon-green-red.png</file>
+		<file alias="beacon-green-red-green.png">icons/map/marine/beacon-green-red-green.png</file>
+		<file alias="beacon-green-red-green-red.png">icons/map/marine/beacon-green-red-green-red.png</file>
+		<file alias="beacon-red.png">icons/map/marine/beacon-red.png</file>
+		<file alias="beacon-red-white.png">icons/map/marine/beacon-red-white.png</file>
+		<file alias="beacon-red-white-red-white.png">icons/map/marine/beacon-red-white-red-white.png</file>
+		<file alias="beacon-red-black.png">icons/map/marine/beacon-red-black.png</file>
+		<file alias="beacon-red-green.png">icons/map/marine/beacon-red-green.png</file>
+		<file alias="beacon-red-yellow.png">icons/map/marine/beacon-red-yellow.png</file>
+		<file alias="beacon-red-green-red.png">icons/map/marine/beacon-red-green-red.png</file>
+		<file alias="beacon-red-green-red-green.png">icons/map/marine/beacon-red-green-red-green.png</file>
+		<file alias="beacon-yellow.png">icons/map/marine/beacon-yellow.png</file>
+		<file alias="beacon-yellow-white.png">icons/map/marine/beacon-yellow-white.png</file>
+		<file alias="beacon-yellow-white-yellow.png">icons/map/marine/beacon-yellow-white-yellow.png</file>
+		<file alias="beacon-yellow-black.png">icons/map/marine/beacon-yellow-black.png</file>
+		<file alias="beacon-yellow-black-yellow.png">icons/map/marine/beacon-yellow-black-yellow.png</file>
+		<file alias="beacon-yellow-red-yellow.png">icons/map/marine/beacon-yellow-red-yellow.png</file>
+		<file alias="beacon-black-white.png">icons/map/marine/beacon-black-white.png</file>
+		<file alias="beacon-black-white-black.png">icons/map/marine/beacon-black-white-black.png</file>
+		<file alias="beacon-black-red.png">icons/map/marine/beacon-black-red.png</file>
+		<file alias="beacon-black-red-black.png">icons/map/marine/beacon-black-red-black.png</file>
+		<file alias="beacon-black-green.png">icons/map/marine/beacon-black-green.png</file>
+		<file alias="beacon-black-yellow.png">icons/map/marine/beacon-black-yellow.png</file>
+		<file alias="beacon-black-orange.png">icons/map/marine/beacon-black-orange.png</file>
+		<file alias="beacon-black-yellow-black.png">icons/map/marine/beacon-black-yellow-black.png</file>
+		<file alias="beacon-orange.png">icons/map/marine/beacon-orange.png</file>
+		<file alias="beacon-orange-white.png">icons/map/marine/beacon-orange-white.png</file>
+		<file alias="beacon-orange-black.png">icons/map/marine/beacon-orange-black.png</file>
+		<file alias="beacon-grey.png">icons/map/marine/beacon-grey.png</file>
+		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
+		<file alias="spar-buoy-red.png">icons/map/marine/spar-buoy-red.png</file>
+		<file alias="spar-buoy-green.png">icons/map/marine/spar-buoy-green.png</file>
+		<file alias="spar-buoy-yellow.png">icons/map/marine/spar-buoy-yellow.png</file>
+		<file alias="spar-buoy-white.png">icons/map/marine/spar-buoy-white.png</file>
+		<file alias="spar-buoy-black-yellow.png">icons/map/marine/spar-buoy-black-yellow.png</file>
+		<file alias="spar-buoy-white-red.png">icons/map/marine/spar-buoy-white-red.png</file>
+		<file alias="spar-buoy-black-red.png">icons/map/marine/spar-buoy-black-red.png</file>
+		<file alias="spar-buoy-white-green.png">icons/map/marine/spar-buoy-white-green.png</file>
+		<file alias="spar-buoy-red-yellow.png">icons/map/marine/spar-buoy-red-yellow.png</file>
+		<file alias="spar-buoy-red-green.png">icons/map/marine/spar-buoy-red-green.png</file>
+		<file alias="spar-buoy-black-yellow-black.png">icons/map/marine/spar-buoy-black-yellow-black.png</file>
+		<file alias="spar-buoy-yellow-black.png">icons/map/marine/spar-buoy-yellow-black.png</file>
+		<file alias="spar-buoy-yellow-black-yellow.png">icons/map/marine/spar-buoy-yellow-black-yellow.png</file>
+		<file alias="spar-buoy-red-white.png">icons/map/marine/spar-buoy-red-white.png</file>
+		<file alias="spar-buoy-green-red-green.png">icons/map/marine/spar-buoy-green-red-green.png</file>
+		<file alias="spar-buoy-red-green-red.png">icons/map/marine/spar-buoy-red-green-red.png</file>
+		<file alias="spar-buoy-black-red-black.png">icons/map/marine/spar-buoy-black-red-black.png</file>
+		<file alias="spar-buoy-yellow-red-yellow.png">icons/map/marine/spar-buoy-yellow-red-yellow.png</file>
+		<file alias="spar-buoy-green-red.png">icons/map/marine/spar-buoy-green-red.png</file>
+		<file alias="spar-buoy-black-white.png">icons/map/marine/spar-buoy-black-white.png</file>
+		<file alias="spar-buoy-white-yellow.png">icons/map/marine/spar-buoy-white-yellow.png</file>
+		<file alias="spar-buoy-yellow-white.png">icons/map/marine/spar-buoy-yellow-white.png</file>
+		<file alias="spar-buoy-green-white.png">icons/map/marine/spar-buoy-green-white.png</file>
+		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
+		<file alias="platform.png">icons/map/marine/platform.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>
@@ -158,11 +267,8 @@
 		<file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
 		<file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
 		<file alias="pile.png">icons/map/marine/pile.png</file>
-		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
-		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
 		<file alias="tower.png">icons/map/marine/tower.png</file>
 		<file alias="chimney.png">icons/map/marine/chimney.png</file>
-		<file alias="platform.png">icons/map/marine/platform.png</file>
 		<file alias="ferry-line.png">icons/map/marine/ferry-line.png</file>
 		<file alias="dw-route-line.png">icons/map/marine/dw-route-line.png</file>
 		<file alias="fence-line.png">icons/map/marine/fence-line.png</file>
@@ -193,6 +299,10 @@
 		<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="light-red.png">icons/map/marine/light-red.png</file>
+		<file alias="light-green.png">icons/map/marine/light-green.png</file>
+		<file alias="light-yellow.png">icons/map/marine/light-yellow.png</file>
+		<file alias="light-white.png">icons/map/marine/light-white.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>
@@ -207,6 +317,24 @@
 		<file alias="eddies.png">icons/map/marine/eddies.png</file>
 		<file alias="dome.png">icons/map/marine/dome.png</file>
 		<file alias="radar-reflector.png">icons/map/marine/radar-reflector.png</file>
+		<file alias="24h-anchorage.png">icons/map/marine/24h-anchorage.png</file>
+		<file alias="dw-anchorage.png">icons/map/marine/dw-anchorage.png</file>
+		<file alias="tanker-anchorage.png">icons/map/marine/tanker-anchorage.png</file>
+		<file alias="nature-reserve-line.png">icons/map/marine/nature-reserve-line.png</file>
+		<file alias="sanctuary-line.png">icons/map/marine/sanctuary-line.png</file>
+		<file alias="fishing-farm.png">icons/map/marine/fishing-farm.png</file>
+		<file alias="shellfish-farm-line.png">icons/map/marine/shellfish-farm-line.png</file>
+		<file alias="degaussing-line.png">icons/map/marine/degaussing-line.png</file>
+		<file alias="nofishing-line.png">icons/map/marine/nofishing-line.png</file>
+		<file alias="fishing-line.png">icons/map/marine/fishing-line.png</file>
+		<file alias="minefield-line.png">icons/map/marine/minefield-line.png</file>
+		<file alias="international-maritime-boundary.png">icons/map/marine/international-maritime-boundary.png</file>
+		<file alias="straight-territorial-sea-baseline.png">icons/map/marine/straight-territorial-sea-baseline.png</file>
+		<file alias="seaward-limit-of-territorial-sea.png">icons/map/marine/seaward-limit-of-territorial-sea.png</file>
+		<file alias="seaward-limit-of-contiguous-zone.png">icons/map/marine/seaward-limit-of-contiguous-zone.png</file>
+		<file alias="foul.png">icons/map/marine/foul.png</file>
+		<file alias="dumping-ground-line.png">icons/map/marine/dumping-ground-line.png</file>
+		<file alias="radio-call-garmin.png">icons/map/marine/radio-call-garmin.png</file>
 	</qresource>
 
 	<!-- Patterns (Mapsforge) -->

icons/formats/scripts/extensions

@@ -32,3 +32,5 @@ trk:#cccccc
 gemf:#147085
 000:#000000
 031:#000000
+vtk:#632433
+vkx:#00ccff

icons/map/POI/charging-station-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="charging-station-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M9.5,3H9V1.5C9,1.2239,8.7761,1,8.5,1S8,1.2239,8,1.5V3c0,0.5523,0.4477,1,1,1v4.25C9,8.3881,8.8881,8.5,8.75,8.5&#xA;&#x9;S8.5,8.3881,8.5,8.25V6.5C8.5,5.6716,7.8284,5,7,5V2c0-0.5523-0.4477-1-1-1H2C1.4477,1,1,1.4477,1,2v7c0,0.5523,0.4477,1,1,1h4&#xA;&#x9;c0.5523,0,1-0.4477,1-1V6c0.2761,0,0.5,0.2239,0.5,0.5v1.75c0,0.6904,0.5596,1.25,1.25,1.25S10,8.9404,10,8.25V3.5&#xA;&#x9;C10,3.2239,9.7761,3,9.5,3z M3.5,8.75H3L4,6H1.75L4.5,2.25H5L4,5h2.25L3.5,8.75z"/>
+</svg>