1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-01 05:19:15 +02:00

Compare commits

...

117 Commits
10.3 ... 11.1

Author SHA1 Message Date
306116dbde Fixed possible crash on map unload 2022-06-02 23:22:34 +02:00
ca1c576562 Fixed Android build 2022-06-02 22:08:40 +02:00
feb1650ed0 Allow tile cache sizes up to 2GB 2022-06-02 19:14:34 +02:00
e6e41c846c Increase the default tile image cache size
On big IMG maps that are "digitaly" zoomed out, the tile memory may not be
sufficient for the whole display area which leads to "cache ping-pong", image
artefacts and 100% CPU usage. 512MB RAM should be available for everyone on
the desktop these days...
2022-06-02 19:03:12 +02:00
20adecec89 Code cleanup 2022-06-02 19:02:46 +02:00
8cb08d05ca Version++ 2022-06-02 18:35:44 +02:00
7bd03494db Code cleanup 2022-06-02 18:35:27 +02:00
7ba19b8c0a Use asynchronous tiles rendering in IMG maps
On Android devices, the rendering is very slow so use the same approach as
already used in Mapsforge maps.
2022-06-02 18:31:40 +02:00
25869200db Fixed broken map zooming using the mouse wheel
(introduced in 11.0)
2022-06-02 18:30:19 +02:00
af0bb2e268 Updated features, build and download info 2022-05-30 19:13:12 +02:00
844607f6ce Added missing QT SVG devel package dependency 2022-05-28 14:14:59 +02:00
ba0b7c62a4 Android port 2022-05-28 14:05:14 +02:00
e701ad0ed0 Fixed broken PDF/PNG export of MApsforge maps 2022-05-25 23:04:20 +02:00
c3ba8f1f0d Fixed broken map plotting on systems with HiDpi displays 2022-05-25 23:03:30 +02:00
b98143ef8c Translated using Weblate (German)
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/de/
2022-05-25 09:08:09 +02:00
eb04666e38 Translated using Weblate (Czech)
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/cs/
2022-05-25 09:08:08 +02:00
d593748e1b Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2022-05-20 09:14:06 +02:00
a03aa81c0a Translated using Weblate (Esperanto)
Currently translated at 94.0% (414 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2022-05-20 09:14:05 +02:00
d56c748983 Translated using Weblate (Hungarian)
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-05-20 09:14:05 +02:00
d9de386c34 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2022-05-20 09:14:05 +02:00
dd038deddd Translated using Weblate (Turkish)
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2022-05-20 09:14:05 +02:00
3b20d00386 Translated using Weblate (Swedish)
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2022-05-20 09:14:04 +02:00
4583869e2b Translated using Weblate (Russian)
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2022-05-20 09:14:04 +02:00
b2c6a5807c Translated using Weblate (Finnish)
Currently translated at 97.9% (431 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2022-05-20 09:14:04 +02:00
e14fc6b204 Merge branch 'origin/master' into Weblate. 2022-05-18 00:00:58 +02:00
71a8affdeb Back to plurals-only #2 2022-05-18 00:00:53 +02:00
8ed9c7053b Merge branch 'origin/master' into Weblate. 2022-05-17 23:56:00 +02:00
53b8c1c846 Do not use the korean localization until it is translated 2022-05-17 23:55:59 +02:00
98a04cbafc Merge branch 'origin/master' into Weblate. 2022-05-17 23:54:46 +02:00
d51b97f586 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (439 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2022-05-17 23:54:45 +02:00
2304fb5350 Added (again...) korean localization stub
+ localization update
2022-05-17 23:54:16 +02:00
8ee21a8080 Added missing MG maps HiDPI displays support 2022-05-10 01:05:30 +02:00
2df916eb95 Fixed broken appveyor.yml file 2022-04-30 09:32:29 +02:00
0121381d18 Version++ 2022-04-29 23:18:01 +02:00
93aadb7e74 Do not depend on the file extension when loading the maps 2022-04-29 23:16:10 +02:00
40febb8c0e Use the correct super class 2022-04-28 22:36:04 +02:00
1e5b18d86a Added support for pinch zoom 2022-04-28 21:54:00 +02:00
8f9af0d973 Be more tolerant to broken TYP files
Where possible, only skip the point/line/polygon entry, not the whole TYP file.
2022-04-24 17:19:26 +02:00
208e31c6de Explicitly marking the basemaps is not required 2022-04-24 09:17:28 +02:00
959d08ba94 Removed broken coordinates adjustment 2022-04-22 22:26:47 +02:00
5f16f7b367 Fixed/improved IMG basemaps handling 2022-04-20 19:40:44 +02:00
baee8b3484 Version++ 2022-04-19 22:19:44 +02:00
c694c3e300 A (hopefully) complete path shape parsing fix
fixes #430
2022-04-19 22:17:19 +02:00
1458d66798 Fixed path shape parsing 2022-04-16 23:39:03 +02:00
62fa0cce36 Merge branch 'origin/master' into Weblate. 2022-04-14 23:33:26 +02:00
b115c041be Do not recompute the adjacency info offset as we are lready there 2022-04-14 23:32:50 +02:00
f63c1fee1c Translated using Weblate (Esperanto)
Currently translated at 94.0% (413 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2022-04-14 18:10:22 +02:00
88d9f10a78 Translated using Weblate (Ukrainian)
Currently translated at 92.4% (406 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2022-04-14 18:10:21 +02:00
ec06793a19 Code cleanup 2022-04-14 04:31:46 +02:00
53cdc86aa0 Improved error handling + code cleanup 2022-04-13 22:13:57 +02:00
82ea54cacc Added some more missing marine symbols 2022-04-12 23:44:57 +02:00
d8fb7cb41e Merge branch 'origin/master' into Weblate. 2022-04-11 00:58:36 +02:00
5041d935f0 Increase marinas rendering priority 2022-04-11 00:59:26 +02:00
98f9aab9d9 Translated using Weblate (Norwegian Bokmål)
Currently translated at 99.7% (438 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-04-10 13:07:16 +02:00
8bc91c760a Only read the node offset when it is actually present 2022-04-08 00:23:45 +02:00
e96400e564 Merge branch 'origin/master' into Weblate. 2022-04-08 00:23:17 +02:00
e088f03cf9 Translated using Weblate (Norwegian Bokmål)
Currently translated at 99.7% (438 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-04-06 18:06:33 +02:00
e3582cc5cf Added missing "Established direction of traffic flow" line 2022-04-04 23:17:46 +02:00
fc033826a1 Code cleanup 2022-04-04 22:27:57 +02:00
8cf4c474f2 Added missing buoy icons 2022-04-04 22:26:57 +02:00
351a969606 Properly center the beacon symbol 2022-04-04 22:25:42 +02:00
2234245e81 Extend obstruction info 2022-04-03 21:20:21 +02:00
681de81b1c Version++ 2022-04-03 18:52:33 +02:00
a5ae41f8ad Added pile symbol 2022-04-03 18:51:15 +02:00
576a063dcb Added support for depth points 2022-04-03 18:21:26 +02:00
c5e46957a8 Removed unused image metadata 2022-03-27 19:25:38 +02:00
a87838ea89 No-anchoring zone style 2022-03-27 16:21:52 +02:00
a4d68d85f9 Some more marine style stuff 2022-03-27 16:09:36 +02:00
77a3049d6d Extended marine style 2022-03-27 14:46:29 +02:00
d7a440f95d Some more missing marine style stuff 2022-03-27 00:43:52 +01:00
d58ec2377f Some more marine style improvements 2022-03-26 23:08:45 +01:00
81fe82d05f Extended nautical style 2022-03-26 20:36:48 +01:00
e1b3b36e4b Optimize the line bitmap 2022-03-26 17:29:49 +01:00
b2bcea5e78 Reintroduce the IMG icon padding
(but this time properly)
2022-03-26 17:20:16 +01:00
a6390bf8a5 Icons filesystem structure cleanup 2022-03-26 16:40:17 +01:00
1e5f9c4fa0 Added basic marine chart style 2022-03-26 16:24:37 +01:00
5d2f1205cc Removed the extra padding breaking item location/ propper positioning 2022-03-26 16:22:51 +01:00
1385482689 Code cleanup 2022-03-25 19:28:32 +01:00
80dbb99091 Merge branch 'origin/master' into Weblate. 2022-03-23 08:03:48 +01:00
4561c71922 Fixed broken handling of maps with basemaps 2022-03-23 08:04:05 +01:00
aa083d5a5d Translated using Weblate (Norwegian Bokmål)
Currently translated at 99.7% (438 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-03-23 08:03:48 +01:00
7b50a23f93 Translated using Weblate (Norwegian Bokmål)
Currently translated at 99.7% (438 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-03-21 18:57:31 +01:00
78703f3651 Fixed broken subdivs parsing 2022-03-20 16:43:18 +01:00
7c838331c2 Version++ 2022-03-19 17:36:19 +01:00
76b6daa02e Ifdef NSIS stuff not used in Qt6 builds 2022-03-19 14:21:19 +01:00
1728ec20d7 Merge branch 'origin/master' into Weblate. 2022-03-19 13:25:19 +01:00
fcfa03f771 Code cleanup 2022-03-19 13:25:47 +01:00
117b50b5ab Translated using Weblate (Norwegian Bokmål)
Currently translated at 97.2% (427 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-03-19 13:25:18 +01:00
d7030f266e Translated using Weblate (Norwegian Bokmål)
Currently translated at 92.9% (408 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-03-19 09:56:24 +01:00
14aef3556c Translated using Weblate (Turkish)
Currently translated at 100.0% (439 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2022-02-28 19:59:29 +01:00
5f7e1133cf Merge branch 'origin/master' into Weblate. 2022-02-21 21:04:57 +01:00
28a10ccb32 Use unbuffered I/O as we use our own buffering 2022-02-21 21:04:24 +01:00
f9dd3ea57d Merge branch 'origin/master' into Weblate. 2022-02-19 17:53:36 +01:00
22aa472dc3 Properly handle MBTiles maps with nonconsecutive zoom levels 2022-02-19 17:52:18 +01:00
043689b343 Merge branch 'origin/master' into Weblate. 2022-02-15 00:02:15 +01:00
e3d5fe2ec3 Fixed point text items bounds computation 2022-02-15 00:01:48 +01:00
b6d4b896e4 Merge branch 'origin/master' into Weblate. 2022-02-07 23:31:40 +01:00
b78a533080 Version++ 2022-02-07 23:31:32 +01:00
4381888ffd Removed the Korean translation stub
Noone is evidently going to do anything about it despite the Weblate request...
2022-02-07 23:29:04 +01:00
4890648992 Merge branch 'origin/master' into Weblate. 2022-02-07 01:00:06 +01:00
70f0e8982b Generate propper IDs for pints with class labels 2022-02-07 00:59:38 +01:00
d4cceb0859 Code cleanup 2022-02-07 00:59:12 +01:00
32a7e78176 Merge branch 'origin/master' into Weblate. 2022-02-06 11:53:59 +01:00
36220dbc9c Improved error handling 2022-02-06 11:53:43 +01:00
444b52a723 Merge branch 'origin/master' into Weblate. 2022-02-06 04:31:53 +01:00
6564c61b00 Yet another point class label parsing fix 2022-02-06 04:31:03 +01:00
03eceb272e Merge branch 'origin/master' into Weblate. 2022-02-06 04:18:02 +01:00
f1e9983a58 Fixed broken points(points labels) parsing 2022-02-06 04:17:08 +01:00
035d8ba5a2 Merge branch 'origin/master' into Weblate. 2022-02-06 02:43:59 +01:00
5d6970c7ee Read/display extended (class) point labels 2022-02-06 02:42:37 +01:00
a211915638 Merge branch 'origin/master' into Weblate. 2022-02-05 12:37:33 +01:00
21b258809d Code cleanup/optimization 2022-02-05 12:37:14 +01:00
f4b160c0fd Merge branch 'origin/master' into Weblate. 2022-02-03 23:06:54 +01:00
da763e7700 Added Mac Qt6 build 2022-02-03 23:06:29 +01:00
2f341746bc Merge branch 'origin/master' into Weblate. 2022-02-03 22:49:19 +01:00
956e02404f Fixed position/motion info output in exports/printing 2022-02-03 22:48:45 +01:00
b72acbfa39 Translated using Weblate (French)
Currently translated at 100.0% (439 of 439 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fr/
2022-02-03 14:57:32 +01:00
229 changed files with 4019 additions and 2481 deletions

View File

@ -1,4 +1,4 @@
version: 10.3.{build}
version: 11.1.{build}
configuration:
- Release

View File

@ -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
sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev
- name: Create localization
run: lrelease gpxsee.pro
- name: Configure build

View File

@ -6,8 +6,8 @@ on:
- master
jobs:
build:
name: GPXSee
qt5:
name: GPXSee Qt5 build
runs-on: macos-10.15
steps:
- name: Set environment variables
@ -27,5 +27,29 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: GPXSee.dmg
name: GPXSee-qt5.dmg
path: GPXSee.dmg
qt6:
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@v2
- name: Install dependencies
run: brew install qt6
- name: Create localization
run: lrelease gpxsee.pro
- name: Configure build
run: qmake gpxsee.pro
- name: Build project
run: make -j3
- name: Create DMG
run: macdeployqt GPXSee.app -dmg
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: GPXSee-qt6.dmg
path: GPXSee.dmg

View File

@ -21,13 +21,13 @@ GPS log file formats.
* Full-screen mode.
* HiDPI/Retina displays & maps support.
* Real-time GPS position.
* Native GUI for Windows, Mac OS X and Linux.
* Windows, macOS, Linux and Android builds.
![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)
## Build
Build requirements:
* Qt5 >= 5.11 or Qt 6.x*
* Qt5 >= 5.11 or Qt6* >= 6.2
* C++11 or newer compiler (tested: msvc2017, gcc 7.5.0, clang/Apple LLVM version
10.0.0)
@ -42,8 +42,9 @@ _* Qt6 builds do not support other encodings than UTF-X and iso8859-1 in XML
files as support for such files was dropped in Qt6._
## Download
* [Windows & OS X builds](http://sourceforge.net/projects/gpxsee)
* [Linux packages](http://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee)
* [Windows & OS X builds](https://sourceforge.net/projects/gpxsee)
* [Linux packages](https://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee)
* [Android APKs](https://play.google.com/store/apps/details?id=org.gpxsee.gpxsee)
## Changelog
[Changelog](https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes)
@ -63,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/IMG) - CC0
* [Mapbox Maki icons](icons/IMG/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),

View File

@ -1,9 +1,9 @@
unix:!macx {
unix:!macx:!android {
TARGET = gpxsee
} else {
TARGET = GPXSee
}
VERSION = 10.3
VERSION = 11.1
QT += core \
gui \
@ -13,7 +13,8 @@ QT += core \
concurrent \
widgets \
printsupport \
positioning
positioning \
svg
greaterThan(QT_MAJOR_VERSION, 5) {
QT += openglwidgets \
core5compat
@ -24,6 +25,7 @@ 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 \
@ -113,6 +115,7 @@ HEADERS += src/common/config.h \
src/GUI/timezoneinfo.h \
src/GUI/passwordedit.h \
src/data/twonavparser.h \
src/map/IMG/section.h \
src/map/proj/polyconic.h \
src/map/proj/webmercator.h \
src/map/proj/transversemercator.h \
@ -245,6 +248,7 @@ 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/common/coordinates.cpp \
src/common/rectc.cpp \
@ -503,7 +507,7 @@ win32 {
NOGDI
}
unix:!macx {
unix:!macx:!android {
isEmpty(PREFIX):PREFIX = /usr/local
maps.files = $$files(pkg/maps/*)
@ -523,3 +527,39 @@ unix:!macx {
target.path = $$PREFIX/bin
INSTALLS += target maps csv symbols locale icon desktop mime
}
android {
defineReplace(versionCode) {
segments = $$split(1, ".")
for (segment, segments): \
vCode = "$$first(vCode)$$format_number($$segment, width=3 zeropad)"
contains(ANDROID_TARGET_ARCH, armeabi-v7a): \
suffix = 0
contains(ANDROID_TARGET_ARCH, arm64-v8a): \
suffix = 1
contains(ANDROID_TARGET_ARCH, x86): \
suffix = 2
contains(ANDROID_TARGET_ARCH, x86_64): \
suffix = 3
return($$first(vCode)$$first(suffix))
}
include($$OPENSSL_PATH/openssl.pri)
ANDROID_VERSION_NAME = $$VERSION
ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME)
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android
DISTFILES += \
pkg/android/AndroidManifest.xml \
pkg/android/build.gradle \
pkg/android/res/values/libs.xml
maps.files = $$files(pkg/maps/*)
maps.path = /assets/maps
csv.files = $$files(pkg/csv/*)
csv.path = /assets/csv
symbols.files = $$files(icons/symbols/*.png)
symbols.path = /assets/symbols
INSTALLS += maps csv symbols
}

View File

@ -57,83 +57,109 @@
<!-- IMG map style -->
<qresource prefix="/IMG">
<file alias="airfield-11.png">icons/IMG/airfield-11.png</file>
<file alias="airport-11.png">icons/IMG/airport-11.png</file>
<file alias="amusement-park-11.png">icons/IMG/amusement-park-11.png</file>
<file alias="bakery-11.png">icons/IMG/bakery-11.png</file>
<file alias="bank-11.png">icons/IMG/bank-11.png</file>
<file alias="bar-11.png">icons/IMG/bar-11.png</file>
<file alias="bbq-11.png">icons/IMG/bbq-11.png</file>
<file alias="beach-11.png">icons/IMG/beach-11.png</file>
<file alias="bowling-alley-11.png">icons/IMG/bowling-alley-11.png</file>
<file alias="building-alt1-11.png">icons/IMG/building-alt1-11.png</file>
<file alias="bridge-11.png">icons/IMG/bridge-11.png</file>
<file alias="bus-11.png">icons/IMG/bus-11.png</file>
<file alias="cafe-11.png">icons/IMG/cafe-11.png</file>
<file alias="campsite-11.png">icons/IMG/campsite-11.png</file>
<file alias="car-11.png">icons/IMG/car-11.png</file>
<file alias="car-rental-11.png">icons/IMG/car-rental-11.png</file>
<file alias="car-repair-11.png">icons/IMG/car-repair-11.png</file>
<file alias="casino-11.png">icons/IMG/casino-11.png</file>
<file alias="cemetery-11.png">icons/IMG/cemetery-11.png</file>
<file alias="cinema-11.png">icons/IMG/cinema-11.png</file>
<file alias="clothing-store-11.png">icons/IMG/clothing-store-11.png</file>
<file alias="communications-tower-11.png">icons/IMG/communications-tower-11.png</file>
<file alias="convenience-11.png">icons/IMG/convenience-11.png</file>
<file alias="dam-11.png">icons/IMG/dam-11.png</file>
<file alias="danger-11.png">icons/IMG/danger-11.png</file>
<file alias="drinking-water-11.png">icons/IMG/drinking-water-11.png</file>
<file alias="fast-food-11.png">icons/IMG/fast-food-11.png</file>
<file alias="entrance-alt1-11.png">icons/IMG/entrance-alt1-11.png</file>
<file alias="fire-station-11.png">icons/IMG/fire-station-11.png</file>
<file alias="fitness-centre-11.png">icons/IMG/fitness-centre-11.png</file>
<file alias="fuel-11.png">icons/IMG/fuel-11.png</file>
<file alias="furniture-11.png">icons/IMG/furniture-11.png</file>
<file alias="garden-11.png">icons/IMG/garden-11.png</file>
<file alias="garden-centre-11.png">icons/IMG/garden-centre-11.png</file>
<file alias="golf-11.png">icons/IMG/golf-11.png</file>
<file alias="grocery-11.png">icons/IMG/grocery-11.png</file>
<file alias="hairdresser-11.png">icons/IMG/hairdresser-11.png</file>
<file alias="harbor-11.png">icons/IMG/harbor-11.png</file>
<file alias="hardware-11.png">icons/IMG/hardware-11.png</file>
<file alias="heliport-11.png">icons/IMG/heliport-11.png</file>
<file alias="hospital-11.png">icons/IMG/hospital-11.png</file>
<file alias="information-11.png">icons/IMG/information-11.png</file>
<file alias="landmark-11.png">icons/IMG/landmark-11.png</file>
<file alias="library-11.png">icons/IMG/library-11.png</file>
<file alias="lodging-11.png">icons/IMG/lodging-11.png</file>
<file alias="mountain-11.png">icons/IMG/mountain-11.png</file>
<file alias="museum-11.png">icons/IMG/museum-11.png</file>
<file alias="park-11.png">icons/IMG/park-11.png</file>
<file alias="parking-11.png">icons/IMG/parking-11.png</file>
<file alias="pharmacy-11.png">icons/IMG/pharmacy-11.png</file>
<file alias="picnic-site-11.png">icons/IMG/picnic-site-11.png</file>
<file alias="place-of-worship-11.png">icons/IMG/place-of-worship-11.png</file>
<file alias="police-11.png">icons/IMG/police-11.png</file>
<file alias="post-11.png">icons/IMG/post-11.png</file>
<file alias="religious-christian-11.png">icons/IMG/religious-christian-11.png</file>
<file alias="religious-jewish-11.png">icons/IMG/religious-jewish-11.png</file>
<file alias="religious-muslim-11.png">icons/IMG/religious-muslim-11.png</file>
<file alias="restaurant-11.png">icons/IMG/restaurant-11.png</file>
<file alias="restaurant-noodle-11.png">icons/IMG/restaurant-noodle-11.png</file>
<file alias="restaurant-pizza-11.png">icons/IMG/restaurant-pizza-11.png</file>
<file alias="restaurant-seafood-11.png">icons/IMG/restaurant-seafood-11.png</file>
<file alias="roadblock-11.png">icons/IMG/roadblock-11.png</file>
<file alias="school-11.png">icons/IMG/school-11.png</file>
<file alias="shelter-11.png">icons/IMG/shelter-11.png</file>
<file alias="shop-11.png">icons/IMG/shop-11.png</file>
<file alias="skiing-11.png">icons/IMG/skiing-11.png</file>
<file alias="soccer-11.png">icons/IMG/soccer-11.png</file>
<file alias="swimming-11.png">icons/IMG/swimming-11.png</file>
<file alias="theatre-11.png">icons/IMG/theatre-11.png</file>
<file alias="telephone-11.png">icons/IMG/telephone-11.png</file>
<file alias="toilet-11.png">icons/IMG/toilet-11.png</file>
<file alias="town-hall-11.png">icons/IMG/town-hall-11.png</file>
<file alias="viewpoint-11.png">icons/IMG/viewpoint-11.png</file>
<file alias="village-11.png">icons/IMG/village-11.png</file>
<file alias="waterfall-11.png">icons/IMG/waterfall-11.png</file>
<file alias="wetland-11.png">icons/IMG/wetland-11.png</file>
<file alias="zoo-11.png">icons/IMG/zoo-11.png</file>
<file alias="airfield-11.png">icons/IMG/POI/airfield-11.png</file>
<file alias="airport-11.png">icons/IMG/POI/airport-11.png</file>
<file alias="amusement-park-11.png">icons/IMG/POI/amusement-park-11.png</file>
<file alias="bakery-11.png">icons/IMG/POI/bakery-11.png</file>
<file alias="bank-11.png">icons/IMG/POI/bank-11.png</file>
<file alias="bar-11.png">icons/IMG/POI/bar-11.png</file>
<file alias="bbq-11.png">icons/IMG/POI/bbq-11.png</file>
<file alias="beach-11.png">icons/IMG/POI/beach-11.png</file>
<file alias="bowling-alley-11.png">icons/IMG/POI/bowling-alley-11.png</file>
<file alias="building-alt1-11.png">icons/IMG/POI/building-alt1-11.png</file>
<file alias="bridge-11.png">icons/IMG/POI/bridge-11.png</file>
<file alias="bus-11.png">icons/IMG/POI/bus-11.png</file>
<file alias="cafe-11.png">icons/IMG/POI/cafe-11.png</file>
<file alias="campsite-11.png">icons/IMG/POI/campsite-11.png</file>
<file alias="car-11.png">icons/IMG/POI/car-11.png</file>
<file alias="car-rental-11.png">icons/IMG/POI/car-rental-11.png</file>
<file alias="car-repair-11.png">icons/IMG/POI/car-repair-11.png</file>
<file alias="casino-11.png">icons/IMG/POI/casino-11.png</file>
<file alias="cemetery-11.png">icons/IMG/POI/cemetery-11.png</file>
<file alias="cinema-11.png">icons/IMG/POI/cinema-11.png</file>
<file alias="clothing-store-11.png">icons/IMG/POI/clothing-store-11.png</file>
<file alias="communications-tower-11.png">icons/IMG/POI/communications-tower-11.png</file>
<file alias="convenience-11.png">icons/IMG/POI/convenience-11.png</file>
<file alias="dam-11.png">icons/IMG/POI/dam-11.png</file>
<file alias="danger-11.png">icons/IMG/POI/danger-11.png</file>
<file alias="drinking-water-11.png">icons/IMG/POI/drinking-water-11.png</file>
<file alias="fast-food-11.png">icons/IMG/POI/fast-food-11.png</file>
<file alias="entrance-alt1-11.png">icons/IMG/POI/entrance-alt1-11.png</file>
<file alias="fire-station-11.png">icons/IMG/POI/fire-station-11.png</file>
<file alias="fitness-centre-11.png">icons/IMG/POI/fitness-centre-11.png</file>
<file alias="fuel-11.png">icons/IMG/POI/fuel-11.png</file>
<file alias="furniture-11.png">icons/IMG/POI/furniture-11.png</file>
<file alias="garden-11.png">icons/IMG/POI/garden-11.png</file>
<file alias="garden-centre-11.png">icons/IMG/POI/garden-centre-11.png</file>
<file alias="golf-11.png">icons/IMG/POI/golf-11.png</file>
<file alias="grocery-11.png">icons/IMG/POI/grocery-11.png</file>
<file alias="hairdresser-11.png">icons/IMG/POI/hairdresser-11.png</file>
<file alias="harbor-11.png">icons/IMG/POI/harbor-11.png</file>
<file alias="hardware-11.png">icons/IMG/POI/hardware-11.png</file>
<file alias="heliport-11.png">icons/IMG/POI/heliport-11.png</file>
<file alias="hospital-11.png">icons/IMG/POI/hospital-11.png</file>
<file alias="information-11.png">icons/IMG/POI/information-11.png</file>
<file alias="landmark-11.png">icons/IMG/POI/landmark-11.png</file>
<file alias="library-11.png">icons/IMG/POI/library-11.png</file>
<file alias="lodging-11.png">icons/IMG/POI/lodging-11.png</file>
<file alias="mountain-11.png">icons/IMG/POI/mountain-11.png</file>
<file alias="museum-11.png">icons/IMG/POI/museum-11.png</file>
<file alias="park-11.png">icons/IMG/POI/park-11.png</file>
<file alias="parking-11.png">icons/IMG/POI/parking-11.png</file>
<file alias="pharmacy-11.png">icons/IMG/POI/pharmacy-11.png</file>
<file alias="picnic-site-11.png">icons/IMG/POI/picnic-site-11.png</file>
<file alias="place-of-worship-11.png">icons/IMG/POI/place-of-worship-11.png</file>
<file alias="police-11.png">icons/IMG/POI/police-11.png</file>
<file alias="post-11.png">icons/IMG/POI/post-11.png</file>
<file alias="religious-christian-11.png">icons/IMG/POI/religious-christian-11.png</file>
<file alias="religious-jewish-11.png">icons/IMG/POI/religious-jewish-11.png</file>
<file alias="religious-muslim-11.png">icons/IMG/POI/religious-muslim-11.png</file>
<file alias="restaurant-11.png">icons/IMG/POI/restaurant-11.png</file>
<file alias="restaurant-noodle-11.png">icons/IMG/POI/restaurant-noodle-11.png</file>
<file alias="restaurant-pizza-11.png">icons/IMG/POI/restaurant-pizza-11.png</file>
<file alias="restaurant-seafood-11.png">icons/IMG/POI/restaurant-seafood-11.png</file>
<file alias="roadblock-11.png">icons/IMG/POI/roadblock-11.png</file>
<file alias="school-11.png">icons/IMG/POI/school-11.png</file>
<file alias="shelter-11.png">icons/IMG/POI/shelter-11.png</file>
<file alias="shop-11.png">icons/IMG/POI/shop-11.png</file>
<file alias="skiing-11.png">icons/IMG/POI/skiing-11.png</file>
<file alias="soccer-11.png">icons/IMG/POI/soccer-11.png</file>
<file alias="swimming-11.png">icons/IMG/POI/swimming-11.png</file>
<file alias="theatre-11.png">icons/IMG/POI/theatre-11.png</file>
<file alias="telephone-11.png">icons/IMG/POI/telephone-11.png</file>
<file alias="toilet-11.png">icons/IMG/POI/toilet-11.png</file>
<file alias="town-hall-11.png">icons/IMG/POI/town-hall-11.png</file>
<file alias="viewpoint-11.png">icons/IMG/POI/viewpoint-11.png</file>
<file alias="village-11.png">icons/IMG/POI/village-11.png</file>
<file alias="waterfall-11.png">icons/IMG/POI/waterfall-11.png</file>
<file alias="wetland-11.png">icons/IMG/POI/wetland-11.png</file>
<file alias="zoo-11.png">icons/IMG/POI/zoo-11.png</file>
<file alias="light-major.png">icons/IMG/marine/light-major.png</file>
<file alias="light-platform.png">icons/IMG/marine/light-platform.png</file>
<file alias="buoy.png">icons/IMG/marine/buoy.png</file>
<file alias="beacon.png">icons/IMG/marine/beacon.png</file>
<file alias="rock-exposed.png">icons/IMG/marine/rock-exposed.png</file>
<file alias="rock-dangerous.png">icons/IMG/marine/rock-dangerous.png</file>
<file alias="wreck.png">icons/IMG/marine/wreck.png</file>
<file alias="wreck-exposed.png">icons/IMG/marine/wreck-exposed.png</file>
<file alias="obstruction.png">icons/IMG/marine/obstruction.png</file>
<file alias="obstruction-covers.png">icons/IMG/marine/obstruction-covers.png</file>
<file alias="anchor-line.png">icons/IMG/marine/anchor-line.png</file>
<file alias="noanchor-line.png">icons/IMG/marine/noanchor-line.png</file>
<file alias="cable-line.png">icons/IMG/marine/cable-line.png</file>
<file alias="pipeline.png">icons/IMG/marine/pipeline.png</file>
<file alias="cable.png">icons/IMG/marine/cable.png</file>
<file alias="anchorage.png">icons/IMG/marine/anchorage.png</file>
<file alias="anchoring-prohibited.png">icons/IMG/marine/anchoring-prohibited.png</file>
<file alias="church.png">icons/IMG/marine/church.png</file>
<file alias="triangulation-point.png">icons/IMG/marine/triangulation-point.png</file>
<file alias="yacht-harbor.png">icons/IMG/marine/yacht-harbor.png</file>
<file alias="pile.png">icons/IMG/marine/pile.png</file>
<file alias="spar-buoy.png">icons/IMG/marine/spar-buoy.png</file>
<file alias="mooring-buoy.png">icons/IMG/marine/mooring-buoy.png</file>
<file alias="tower.png">icons/IMG/marine/tower.png</file>
<file alias="chimney.png">icons/IMG/marine/chimney.png</file>
</qresource>
<!-- Mapsforge rendertheme -->

View File

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 380 B

View File

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

View File

Before

Width:  |  Height:  |  Size: 428 B

After

Width:  |  Height:  |  Size: 428 B

View File

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

View File

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 363 B

View File

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

View File

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 393 B

View File

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 395 B

View File

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 386 B

View File

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

View File

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 343 B

View File

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 378 B

View File

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 351 B

View File

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

View File

Before

Width:  |  Height:  |  Size: 368 B

After

Width:  |  Height:  |  Size: 368 B

View File

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 390 B

View File

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 381 B

View File

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

View File

Before

Width:  |  Height:  |  Size: 357 B

After

Width:  |  Height:  |  Size: 357 B

View File

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 356 B

View File

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 351 B

View File

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

View File

Before

Width:  |  Height:  |  Size: 650 B

After

Width:  |  Height:  |  Size: 650 B

View File

Before

Width:  |  Height:  |  Size: 376 B

After

Width:  |  Height:  |  Size: 376 B

View File

Before

Width:  |  Height:  |  Size: 421 B

After

Width:  |  Height:  |  Size: 421 B

View File

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

View File

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

View File

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

View File

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

View File

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

View File

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 377 B

View File

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 348 B

View File

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

View File

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

View File

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 394 B

View File

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 355 B

View File

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 380 B

View File

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

View File

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

View File

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 390 B

View File

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

View File

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 359 B

View File

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 341 B

View File

Before

Width:  |  Height:  |  Size: 410 B

After

Width:  |  Height:  |  Size: 410 B

View File

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 345 B

View File

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 384 B

View File

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

View File

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 399 B

View File

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

View File

Before

Width:  |  Height:  |  Size: 364 B

After

Width:  |  Height:  |  Size: 364 B

View File

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 377 B

View File

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

View File

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 394 B

View File

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

View File

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

View File

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 359 B

View File

Before

Width:  |  Height:  |  Size: 401 B

After

Width:  |  Height:  |  Size: 401 B

View File

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 361 B

View File

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 396 B

View File

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 396 B

View File

Before

Width:  |  Height:  |  Size: 407 B

After

Width:  |  Height:  |  Size: 407 B

View File

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

View File

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 333 B

View File

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 325 B

View File

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 381 B

View File

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 399 B

View File

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 397 B

View File

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

View File

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 377 B

View File

Before

Width:  |  Height:  |  Size: 428 B

After

Width:  |  Height:  |  Size: 428 B

View File

Before

Width:  |  Height:  |  Size: 407 B

After

Width:  |  Height:  |  Size: 407 B

View File

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 348 B

View File

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

View File

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 373 B

View File

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 392 B

View File

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

View File

Before

Width:  |  Height:  |  Size: 382 B

After

Width:  |  Height:  |  Size: 382 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 367 B

BIN
icons/IMG/marine/beacon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

BIN
icons/IMG/marine/buoy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 B

BIN
icons/IMG/marine/cable.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 B

BIN
icons/IMG/marine/church.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 555 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 B

BIN
icons/IMG/marine/pile.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 B

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