1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-12 18:05:10 +02:00

Compare commits

...

100 Commits
13.37 ... 13.42

Author SHA1 Message Date
ca3ea08b99 Show obstruction/wreck depths 2025-05-07 22:47:07 +02:00
70acdd3d96 Added missing buoy/beacon icons 2025-05-07 20:33:16 +02:00
226162eca1 Remove the restriction on the reload action on DEM/map dir load
"Reload" will now behave like "close" when only the mapdir/DEMs are loaded,
but when the DEMs and some other data is opened, reload will help the user to
get rid of the DEMs and leave the other data.
2025-05-06 20:39:18 +02:00
8323694f64 Colored spar buoys 2025-05-06 20:27:44 +02:00
42f785d14b Use the propper image for rescue station (0x1070a) points 2025-05-06 20:16:05 +02:00
87e259a7a1 Unify the area styles with ENC maps 2025-05-06 20:13:49 +02:00
c070aa062b Fetch the buoy color info from class data 2025-05-06 05:52:58 +02:00
a8473fa039 Added missing single color entries 2025-05-05 23:05:21 +02:00
bdd60ed816 Do not overcomplicate the macros and keep them united with the IMG macros 2025-05-05 23:00:55 +02:00
08f9486315 Added support for colored buoys/beacons to IMG maps 2025-05-05 22:41:43 +02:00
cdc9aa1e50 Added support for multi (3 & 4) color buoys/beacons 2025-05-05 22:38:17 +02:00
15767decfc Colorset generating macros cleanup 2025-05-04 20:02:40 +02:00
5178b8732f Handle orange and amber as yellow 2025-05-04 19:20:56 +02:00
f5553377f9 Use colored buoys/beacons in ENC maps 2025-05-04 15:50:02 +02:00
415962b583 Unified RESARE lines icons 2025-05-04 09:04:53 +02:00
0d65affd4b Degaussing ranges and pilot boarding areas 2025-05-02 19:08:16 +02:00
31a3463c9b Cosmetics 2025-05-02 19:06:42 +02:00
46a9fffb8a Fixed error handling 2025-05-02 08:44:19 +02:00
f4765d0c48 Code cleanup 2025-05-02 05:25:44 +02:00
0d9daf8b4f Code cleanup 2025-05-01 08:36:55 +02:00
ed7fc5fba3 Properly render ACHARE labels 2025-05-01 07:59:02 +02:00
ed4c18b773 Improved error reporting 2025-04-30 23:05:04 +02:00
ba50e67380 Refactoring 2025-04-29 09:08:55 +02:00
eb81ee9aaa Shellfish farms 2025-04-25 23:00:25 +02:00
0c0d5dd273 Revert "Micro-optimizations"
This reverts commit f90ac6a37e.
2025-04-25 00:41:21 +02:00
7059eafc81 Merge branch 'origin/master' into Weblate. 2025-04-24 23:52:35 +02:00
b4497aaa3e Silence warning when compiling on Qt >= 6.9 2025-04-24 23:51:31 +02:00
f90ac6a37e Micro-optimizations 2025-04-24 22:57:03 +02:00
28caeef105 Render BUNSTA areas 2025-04-24 22:39:17 +02:00
e2988d4621 Version++ 2025-04-24 22:38:56 +02:00
raf
285ffd680e Translated using Weblate (Catalan)
Currently translated at 100.0% (492 of 492 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2025-04-24 11:01:42 +02:00
50100b02dc Fixed switched units multipliers parameters broken in 13.40 2025-04-24 06:21:13 +02:00
6f7a90fb15 Version++ 2025-04-24 05:24:49 +02:00
04091f21d5 Improved restricted areas rendering 2025-04-23 22:27:26 +02:00
89219a7948 Use a better magic match for Vakaros VKX files 2025-04-23 22:02:45 +02:00
d0ca202520 Added BUNSTA objects style 2025-04-23 08:49:46 +02:00
fafabef792 Make RADRFL draw order higher than PILPNT draw order 2025-04-23 08:10:36 +02:00
0da16199f8 Code cleanup 2025-04-22 19:14:06 +02:00
7d7d62c786 S-57 ISO8211 subfields can not be ommited 2025-04-21 19:48:48 +02:00
d6a4e237d6 Remove unused parameters 2025-04-21 18:40:15 +02:00
b6c7fe9cd1 Assure that ddf data is valid when accessing it 2025-04-21 17:32:46 +02:00
b9396e6bbd Version++ 2025-04-21 17:32:11 +02:00
372f2966bb Properly print the tag name on big-edian systems 2025-04-17 20:58:27 +02:00
1aa0fa4be4 Fixed Qt5 build 2025-04-17 20:37:30 +02:00
f4e19d0917 Multiple S-57 files parse optimizations 2025-04-17 20:25:12 +02:00
91376fd609 Make sure all fields have their definitions 2025-04-17 08:43:23 +02:00
92b2fbaf04 Fixed ISO8211 parser error handling 2025-04-17 07:42:45 +02:00
a21096a0a9 Added Vakaros VKX files support info 2025-04-16 08:59:31 +02:00
920cf03d1b Translated using Weblate (German)
Currently translated at 100.0% (492 of 492 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/de/
2025-04-15 07:18:18 +02:00
72155beb6b Translated using Weblate (Czech)
Currently translated at 100.0% (492 of 492 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/cs/
2025-04-15 07:16:48 +02:00
88acc78e1c Translated using Weblate (Hungarian)
Currently translated at 100.0% (492 of 492 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2025-04-14 19:03:04 +02:00
1583794329 Translated using Weblate (Hungarian)
Currently translated at 100.0% (492 of 492 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2025-04-14 19:03:03 +02:00
beb2f6d70c Translated using Weblate (Ukrainian)
Currently translated at 100.0% (492 of 492 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2025-04-14 19:03:02 +02:00
afd3a09f50 Translated using Weblate (Swedish)
Currently translated at 100.0% (492 of 492 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2025-04-14 19:03:02 +02:00
2a247a2a38 Translated using Weblate (French)
Currently translated at 100.0% (492 of 492 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fr/
2025-04-14 19:03:01 +02:00
44af6eea4d Vakaros VKX MacOS desktop integration 2025-04-14 09:31:10 +02:00
40c396a8c8 Localization update 2025-04-13 18:13:55 +02:00
5018aecb42 Added Vakaros VKX support info 2025-04-13 18:12:16 +02:00
a2d56236b6 Version++ 2025-04-13 18:10:35 +02:00
b20a6cd479 Vakaros VKX Windows desktop integration 2025-04-13 17:55:39 +02:00
7bbf6fba97 Vakaros VKX Linux desktop integration 2025-04-13 17:41:33 +02:00
d2ac9f2ee6 Added support for Vakaros VKX files 2025-04-12 13:16:36 +02:00
fa344e94e4 Translated using Weblate (Danish)
Currently translated at 100.0% (491 of 491 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/da/
2025-04-08 09:01:40 +02:00
raf
dd53293229 Translated using Weblate (Catalan)
Currently translated at 100.0% (491 of 491 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2025-03-25 12:29:40 +01:00
355f451e5c Add "office" as used in OpenAndroMaps as an equivalent to Mapsforge's "civic" 2025-03-21 22:06:50 +01:00
0b61fb0470 Use jom for Windows CI builds 2025-03-21 06:55:21 +01:00
af18c98a03 Update the nuber of cores acording to the latest GitHub runners state 2025-03-21 06:27:33 +01:00
e9a8112196 Fixed error handling 2025-03-21 05:56:17 +01:00
bca335d4b2 Translated using Weblate (Esperanto)
Currently translated at 91.2% (448 of 491 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2025-03-20 22:55:09 +01:00
f3b1fa8eb7 Translated using Weblate (Russian)
Currently translated at 100.0% (491 of 491 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2025-03-20 22:55:09 +01:00
fac377e746 Translated using Weblate (Finnish)
Currently translated at 96.7% (475 of 491 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2025-03-20 22:55:09 +01:00
7184c691d3 Fixed possible null pointer dereferences 2025-03-19 08:11:49 +01:00
381ab1516d Do not draw special type buildings multiple times.
Use the new "exclude" rule to improve performance by not drawing
the civic/church buildings multipe times.
2025-03-19 01:38:04 +01:00
cf84680bc6 Revert "Use jom in Windows CI builds"
This reverts commit 38abffda17.
2025-03-17 22:47:44 +01:00
74e322860f Merge branch 'origin/master' into Weblate. 2025-03-17 22:33:21 +01:00
38abffda17 Use jom in Windows CI builds 2025-03-17 22:33:12 +01:00
304d4f770e Translated using Weblate (Hungarian)
Currently translated at 100.0% (491 of 491 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2025-03-17 16:17:37 +01:00
739564955e Translated using Weblate (Ukrainian)
Currently translated at 100.0% (491 of 491 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2025-03-17 15:17:05 +01:00
4e45cf6d40 Translated using Weblate (French)
Currently translated at 100.0% (491 of 491 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fr/
2025-03-17 15:17:05 +01:00
644e14947d Merge branch 'origin/master' into Weblate. 2025-03-17 09:00:35 +01:00
c171e8088c Added Velocitek VTK support info 2025-03-17 09:00:32 +01:00
431357b08d Merge branch 'origin/master' into Weblate. 2025-03-17 08:41:50 +01:00
af03a85fdb Added missing VTK icns icon 2025-03-17 08:41:20 +01:00
003bdd8814 Translated using Weblate (Swedish)
Currently translated at 100.0% (491 of 491 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2025-03-17 08:01:21 +01:00
91c0e2a83d German translation update 2025-03-17 07:43:05 +01:00
496a474bd2 Czech translation update 2025-03-17 07:42:35 +01:00
f1b7d57027 Lcalization update 2025-03-17 07:40:10 +01:00
2e4e702640 Fixed speed values conversion 2025-03-16 22:33:26 +01:00
9d3cdbbd42 Velocitek VTK MacOS desktop integration 2025-03-16 22:15:37 +01:00
0e329f4b22 Added Velocitek VTK Windows desktop integration 2025-03-16 17:53:00 +01:00
2041cc7ff5 Added Velocitek VTK files Linux desktop integration 2025-03-16 17:37:37 +01:00
8169015f70 Added missing trunk roads names 2025-03-16 17:32:36 +01:00
28f55b7e0d Added support for Velocitek VTK files 2025-03-16 17:17:09 +01:00
912a00c80e Cosmetics 2025-03-16 17:15:33 +01:00
8de6bbe4fb Fixed maximal speed info
Display the maximum of all primary graphs, not the maximum of all graphs.
2025-03-16 17:14:14 +01:00
f34d6b0540 Fixed wrong oneway icon filename 2025-03-16 17:11:13 +01:00
2eb527f2f3 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (490 of 490 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2025-03-11 20:01:29 +01:00
94785ee2ec Added support for the "exclude" theme rules added in recent Mapsforge versions 2025-03-11 07:34:31 +01:00
a2f1ef7572 Silence MSVC C4018 warnings 2025-03-08 18:06:20 +01:00
7731cfaa4f Version++ 2025-03-08 18:05:44 +01:00
164 changed files with 1954 additions and 929 deletions

View File

@ -1,4 +1,4 @@
version: 13.37.{build}
version: 13.42.{build}
configuration:
- Release
@ -8,6 +8,7 @@ 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
@ -17,14 +18,14 @@ environment:
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

View File

@ -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:

View File

@ -24,4 +24,4 @@ jobs:
- name: Configure build
run: qmake CONFIG+=${{ matrix.config }} gpxsee.pro
- name: Build project
run: make -j2
run: make -j4

View File

@ -5,7 +5,8 @@ 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, 70mai GPS logs 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).

View File

@ -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">

View File

@ -3,7 +3,7 @@ unix:!macx:!android {
} else {
TARGET = GPXSee
}
VERSION = 13.37
VERSION = 13.42
QT += core \
gui \
@ -118,6 +118,8 @@ HEADERS += src/common/config.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 \
@ -346,6 +348,8 @@ SOURCES += src/main.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 \
@ -561,7 +565,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
}

View File

@ -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,101 @@
<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-yellow-white.png">icons/map/marine/buoy-white-yellow-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-yellow-black.png">icons/map/marine/buoy-black-yellow-black.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-yellow-white.png">icons/map/marine/beacon-white-yellow-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-yellow-black.png">icons/map/marine/beacon-black-yellow-black.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 +253,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>
@ -217,6 +309,8 @@
<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>
</qresource>
<!-- Patterns (Mapsforge) -->

View File

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

BIN
icons/formats/vkx.icns Normal file

Binary file not shown.

BIN
icons/formats/vkx.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 KiB

BIN
icons/formats/vtk.icns Normal file

Binary file not shown.

BIN
icons/formats/vtk.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 KiB

View File

@ -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>

After

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 328 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 326 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 324 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 352 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 343 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 340 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 341 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 324 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 324 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 B

After

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 305 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 630 B

After

Width:  |  Height:  |  Size: 617 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 335 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 361 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 345 B

Some files were not shown because too many files have changed in this diff Show More