Compare commits
171 Commits
a9572d05fe
...
13.44
Author | SHA1 | Date | |
---|---|---|---|
ece1fdbbd3 | |||
7ed154b662 | |||
2efc7a3d2c | |||
f07f3de19f | |||
1c468740a0 | |||
ea76a8939d | |||
66776e8233 | |||
05eb750f65 | |||
21e1b94322 | |||
c23c4470a7 | |||
73a60f5046 | |||
1466de5ddf | |||
466c538e17 | |||
01ad0552d9 | |||
cee68671c2 | |||
d3daa17bf7 | |||
92b9f4958f | |||
35f00078bf | |||
8e60ab4490 | |||
399023184c | |||
e19fbb53b7 | |||
c1937d9f08 | |||
7c4316f32a | |||
74e3ecbd90 | |||
6b3c6a7738 | |||
77716927a3 | |||
b3bb97f4cf | |||
3e62e1eaf6 | |||
bb75af0c61 | |||
d0c51a225a | |||
ef1525bce8 | |||
c15a599f5d | |||
5e540a88fa | |||
cd34f90b22 | |||
8fa7b63763 | |||
84ef9824d7 | |||
23e293f39a | |||
f588bad785 | |||
8ba97e65f5 | |||
93fc190748 | |||
744cfde08f | |||
7f491330b1 | |||
b2a123a731 | |||
a19188f58c | |||
fc96d4e88c | |||
2fec4dafda | |||
d9e4d6c519 | |||
7c3a7c1973 | |||
7e1d0dfb22 | |||
10555723cd | |||
018ec28339 | |||
cebe4cde69 | |||
4f25835281 | |||
53ace440c5 | |||
46375cdee2 | |||
2bde41f09e | |||
3d4d0c7155 | |||
408a671279 | |||
7f591cb2c2 | |||
f3b97cb71f | |||
ab3940d445 | |||
6bb0c72361 | |||
4d33631844 | |||
535f4c0752 | |||
77d4cd0a6e | |||
d95cc654fc | |||
42837bc2ca | |||
dea0e019a1 | |||
73ba181356 | |||
e43c4b44f4 | |||
16d5e656bf | |||
ca3ea08b99 | |||
70acdd3d96 | |||
226162eca1 | |||
8323694f64 | |||
42f785d14b | |||
87e259a7a1 | |||
c070aa062b | |||
a8473fa039 | |||
bdd60ed816 | |||
08f9486315 | |||
cdc9aa1e50 | |||
15767decfc | |||
5178b8732f | |||
f5553377f9 | |||
415962b583 | |||
0d65affd4b | |||
31a3463c9b | |||
46a9fffb8a | |||
f4765d0c48 | |||
0d9daf8b4f | |||
ed7fc5fba3 | |||
ed4c18b773 | |||
ba50e67380 | |||
eb81ee9aaa | |||
0c0d5dd273 | |||
7059eafc81 | |||
b4497aaa3e | |||
f90ac6a37e | |||
28caeef105 | |||
e2988d4621 | |||
285ffd680e | |||
50100b02dc | |||
6f7a90fb15 | |||
04091f21d5 | |||
89219a7948 | |||
d0ca202520 | |||
fafabef792 | |||
0da16199f8 | |||
7d7d62c786 | |||
d6a4e237d6 | |||
b6c7fe9cd1 | |||
b9396e6bbd | |||
372f2966bb | |||
1aa0fa4be4 | |||
f4e19d0917 | |||
91376fd609 | |||
92b2fbaf04 | |||
a21096a0a9 | |||
920cf03d1b | |||
72155beb6b | |||
88acc78e1c | |||
1583794329 | |||
beb2f6d70c | |||
afd3a09f50 | |||
2a247a2a38 | |||
44af6eea4d | |||
40c396a8c8 | |||
5018aecb42 | |||
a2d56236b6 | |||
b20a6cd479 | |||
7bbf6fba97 | |||
d2ac9f2ee6 | |||
fa344e94e4 | |||
dd53293229 | |||
355f451e5c | |||
0b61fb0470 | |||
af18c98a03 | |||
e9a8112196 | |||
bca335d4b2 | |||
f3b1fa8eb7 | |||
fac377e746 | |||
7184c691d3 | |||
381ab1516d | |||
cf84680bc6 | |||
74e322860f | |||
38abffda17 | |||
304d4f770e | |||
739564955e | |||
4e45cf6d40 | |||
644e14947d | |||
c171e8088c | |||
431357b08d | |||
af03a85fdb | |||
003bdd8814 | |||
91c0e2a83d | |||
496a474bd2 | |||
f1b7d57027 | |||
2e4e702640 | |||
9d3cdbbd42 | |||
0e329f4b22 | |||
2041cc7ff5 | |||
8169015f70 | |||
28f55b7e0d | |||
912a00c80e | |||
8de6bbe4fb | |||
f34d6b0540 | |||
2eb527f2f3 | |||
94785ee2ec | |||
a2f1ef7572 | |||
7731cfaa4f |
@ -1,4 +1,4 @@
|
||||
version: 13.37.{build}
|
||||
version: 13.44.{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
|
||||
|
2
.github/workflows/android.yml
vendored
@ -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:
|
||||
|
2
.github/workflows/linux.yml
vendored
@ -24,4 +24,4 @@ jobs:
|
||||
- name: Configure build
|
||||
run: qmake CONFIG+=${{ matrix.config }} gpxsee.pro
|
||||
- name: Build project
|
||||
run: make -j2
|
||||
run: make -j4
|
||||
|
@ -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).
|
||||
|
8
data/maps/OpenFreeMap.xml
Normal file
@ -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>
|
@ -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">
|
||||
|
14
gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx:!android {
|
||||
} else {
|
||||
TARGET = GPXSee
|
||||
}
|
||||
VERSION = 13.37
|
||||
VERSION = 13.44
|
||||
|
||||
QT += core \
|
||||
gui \
|
||||
@ -23,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 +120,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 \
|
||||
@ -274,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 \
|
||||
@ -346,6 +352,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 +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
|
||||
}
|
||||
|
124
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>
|
||||
@ -217,6 +323,18 @@
|
||||
<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) -->
|
||||
|
@ -32,3 +32,5 @@ trk:#cccccc
|
||||
gemf:#147085
|
||||
000:#000000
|
||||
031:#000000
|
||||
vtk:#632433
|
||||
vkx:#00ccff
|
||||
|
BIN
icons/formats/vkx.icns
Normal file
BIN
icons/formats/vkx.ico
Normal file
After Width: | Height: | Size: 331 KiB |
BIN
icons/formats/vtk.icns
Normal file
BIN
icons/formats/vtk.ico
Normal file
After Width: | Height: | Size: 331 KiB |
4
icons/map/POI/charging-station-11.svg
Normal 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
	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
	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
	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 |
Before Width: | Height: | Size: 170 B After Width: | Height: | Size: 295 B |
BIN
icons/map/marine/beacon-black-green.png
Normal file
After Width: | Height: | Size: 282 B |
BIN
icons/map/marine/beacon-black-orange.png
Normal file
After Width: | Height: | Size: 283 B |
BIN
icons/map/marine/beacon-black-red-black.png
Normal file
After Width: | Height: | Size: 273 B |
BIN
icons/map/marine/beacon-black-red.png
Normal file
After Width: | Height: | Size: 277 B |
BIN
icons/map/marine/beacon-black-white-black.png
Normal file
After Width: | Height: | Size: 275 B |
BIN
icons/map/marine/beacon-black-white.png
Normal file
After Width: | Height: | Size: 278 B |
BIN
icons/map/marine/beacon-black-yellow-black.png
Normal file
After Width: | Height: | Size: 274 B |
BIN
icons/map/marine/beacon-black-yellow.png
Normal file
After Width: | Height: | Size: 278 B |
BIN
icons/map/marine/beacon-green-black.png
Normal file
After Width: | Height: | Size: 283 B |
BIN
icons/map/marine/beacon-green-red-green-red.png
Normal file
After Width: | Height: | Size: 294 B |
BIN
icons/map/marine/beacon-green-red-green.png
Normal file
After Width: | Height: | Size: 295 B |
BIN
icons/map/marine/beacon-green-red.png
Normal file
After Width: | Height: | Size: 290 B |
BIN
icons/map/marine/beacon-green-white-green-white.png
Normal file
After Width: | Height: | Size: 295 B |
BIN
icons/map/marine/beacon-green-white.png
Normal file
After Width: | Height: | Size: 286 B |
BIN
icons/map/marine/beacon-green.png
Normal file
After Width: | Height: | Size: 281 B |
BIN
icons/map/marine/beacon-grey.png
Normal file
After Width: | Height: | Size: 283 B |
BIN
icons/map/marine/beacon-orange-black.png
Normal file
After Width: | Height: | Size: 284 B |
BIN
icons/map/marine/beacon-orange-white.png
Normal file
After Width: | Height: | Size: 286 B |
BIN
icons/map/marine/beacon-orange.png
Normal file
After Width: | Height: | Size: 281 B |
BIN
icons/map/marine/beacon-red-black.png
Normal file
After Width: | Height: | Size: 277 B |
BIN
icons/map/marine/beacon-red-green-red-green.png
Normal file
After Width: | Height: | Size: 300 B |
BIN
icons/map/marine/beacon-red-green-red.png
Normal file
After Width: | Height: | Size: 293 B |
BIN
icons/map/marine/beacon-red-green.png
Normal file
After Width: | Height: | Size: 289 B |
BIN
icons/map/marine/beacon-red-white-red-white.png
Normal file
After Width: | Height: | Size: 288 B |
BIN
icons/map/marine/beacon-red-white.png
Normal file
After Width: | Height: | Size: 284 B |
BIN
icons/map/marine/beacon-red-yellow.png
Normal file
After Width: | Height: | Size: 283 B |
BIN
icons/map/marine/beacon-red.png
Normal file
After Width: | Height: | Size: 278 B |
BIN
icons/map/marine/beacon-white-black.png
Normal file
After Width: | Height: | Size: 277 B |
BIN
icons/map/marine/beacon-white-green.png
Normal file
After Width: | Height: | Size: 285 B |
BIN
icons/map/marine/beacon-white-orange-white.png
Normal file
After Width: | Height: | Size: 290 B |
BIN
icons/map/marine/beacon-white-orange.png
Normal file
After Width: | Height: | Size: 285 B |
BIN
icons/map/marine/beacon-white-red.png
Normal file
After Width: | Height: | Size: 281 B |
BIN
icons/map/marine/beacon-white-yellow-white.png
Normal file
After Width: | Height: | Size: 285 B |
BIN
icons/map/marine/beacon-white-yellow.png
Normal file
After Width: | Height: | Size: 279 B |
BIN
icons/map/marine/beacon-white.png
Normal file
After Width: | Height: | Size: 275 B |
BIN
icons/map/marine/beacon-yellow-black-yellow.png
Normal file
After Width: | Height: | Size: 282 B |
BIN
icons/map/marine/beacon-yellow-black.png
Normal file
After Width: | Height: | Size: 276 B |
BIN
icons/map/marine/beacon-yellow-red-yellow.png
Normal file
After Width: | Height: | Size: 286 B |
BIN
icons/map/marine/beacon-yellow-white-yellow.png
Normal file
After Width: | Height: | Size: 280 B |
BIN
icons/map/marine/beacon-yellow-white.png
Normal file
After Width: | Height: | Size: 280 B |
BIN
icons/map/marine/beacon-yellow.png
Normal file
After Width: | Height: | Size: 275 B |
Before Width: | Height: | Size: 202 B After Width: | Height: | Size: 266 B |
BIN
icons/map/marine/buoy-black-green.png
Normal file
After Width: | Height: | Size: 327 B |
BIN
icons/map/marine/buoy-black-orange.png
Normal file
After Width: | Height: | Size: 330 B |
BIN
icons/map/marine/buoy-black-red-black.png
Normal file
After Width: | Height: | Size: 330 B |
BIN
icons/map/marine/buoy-black-red.png
Normal file
After Width: | Height: | Size: 328 B |
BIN
icons/map/marine/buoy-black-white-black.png
Normal file
After Width: | Height: | Size: 320 B |
BIN
icons/map/marine/buoy-black-white.png
Normal file
After Width: | Height: | Size: 291 B |
BIN
icons/map/marine/buoy-black-yellow-black.png
Normal file
After Width: | Height: | Size: 326 B |
BIN
icons/map/marine/buoy-black-yellow.png
Normal file
After Width: | Height: | Size: 324 B |
BIN
icons/map/marine/buoy-green-black.png
Normal file
After Width: | Height: | Size: 336 B |
BIN
icons/map/marine/buoy-green-red-green-red.png
Normal file
After Width: | Height: | Size: 357 B |
BIN
icons/map/marine/buoy-green-red-green.png
Normal file
After Width: | Height: | Size: 351 B |
BIN
icons/map/marine/buoy-green-red.png
Normal file
After Width: | Height: | Size: 352 B |
BIN
icons/map/marine/buoy-green-white-green-white.png
Normal file
After Width: | Height: | Size: 353 B |
BIN
icons/map/marine/buoy-green-white.png
Normal file
After Width: | Height: | Size: 349 B |
BIN
icons/map/marine/buoy-green.png
Normal file
After Width: | Height: | Size: 332 B |
BIN
icons/map/marine/buoy-grey.png
Normal file
After Width: | Height: | Size: 339 B |
BIN
icons/map/marine/buoy-orange-black.png
Normal file
After Width: | Height: | Size: 334 B |
BIN
icons/map/marine/buoy-orange-white.png
Normal file
After Width: | Height: | Size: 348 B |
BIN
icons/map/marine/buoy-orange.png
Normal file
After Width: | Height: | Size: 336 B |
BIN
icons/map/marine/buoy-red-black.png
Normal file
After Width: | Height: | Size: 330 B |
BIN
icons/map/marine/buoy-red-green-red-green.png
Normal file
After Width: | Height: | Size: 353 B |
BIN
icons/map/marine/buoy-red-green-red.png
Normal file
After Width: | Height: | Size: 351 B |
BIN
icons/map/marine/buoy-red-green.png
Normal file
After Width: | Height: | Size: 343 B |
BIN
icons/map/marine/buoy-red-white-red-white.png
Normal file
After Width: | Height: | Size: 348 B |
BIN
icons/map/marine/buoy-red-white.png
Normal file
After Width: | Height: | Size: 338 B |
BIN
icons/map/marine/buoy-red-yellow.png
Normal file
After Width: | Height: | Size: 340 B |
BIN
icons/map/marine/buoy-red.png
Normal file
After Width: | Height: | Size: 332 B |
BIN
icons/map/marine/buoy-white-black.png
Normal file
After Width: | Height: | Size: 320 B |
BIN
icons/map/marine/buoy-white-green.png
Normal file
After Width: | Height: | Size: 338 B |
BIN
icons/map/marine/buoy-white-orange-white.png
Normal file
After Width: | Height: | Size: 341 B |
BIN
icons/map/marine/buoy-white-orange.png
Normal file
After Width: | Height: | Size: 340 B |
BIN
icons/map/marine/buoy-white-red.png
Normal file
After Width: | Height: | Size: 341 B |
BIN
icons/map/marine/buoy-white-yellow-white.png
Normal file
After Width: | Height: | Size: 331 B |
BIN
icons/map/marine/buoy-white-yellow.png
Normal file
After Width: | Height: | Size: 331 B |
BIN
icons/map/marine/buoy-white.png
Normal file
After Width: | Height: | Size: 324 B |
BIN
icons/map/marine/buoy-yellow-black-yellow.png
Normal file
After Width: | Height: | Size: 330 B |
BIN
icons/map/marine/buoy-yellow-black.png
Normal file
After Width: | Height: | Size: 324 B |
BIN
icons/map/marine/buoy-yellow-red-yellow.png
Normal file
After Width: | Height: | Size: 348 B |
BIN
icons/map/marine/buoy-yellow-white-yellow.png
Normal file
After Width: | Height: | Size: 337 B |
BIN
icons/map/marine/buoy-yellow-white.png
Normal file
After Width: | Height: | Size: 331 B |
BIN
icons/map/marine/buoy-yellow.png
Normal file
After Width: | Height: | Size: 330 B |
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 225 B |
BIN
icons/map/marine/degaussing-line.png
Normal file
After Width: | Height: | Size: 273 B |