Compare commits
107 Commits
11.7
...
1480f8ad02
Author | SHA1 | Date | |
---|---|---|---|
1480f8ad02 | |||
b73ad9772f | |||
e6bc548524 | |||
0d71e34665 | |||
f575e79a70 | |||
903b73d9a4 | |||
42f2f3377b | |||
3b798e627b | |||
be5291a6c6 | |||
7bb2c3a09d | |||
5467b55ff2 | |||
820350d60b | |||
3801ff7bcb | |||
3b6e6c03a7 | |||
a1a6fade92 | |||
c001235e91 | |||
c01b9da10c | |||
e4d42453a0 | |||
d6d316676c | |||
973abedf3e | |||
505f01a990 | |||
78b091fbbc | |||
80ec7f624e | |||
bfeb6d266e | |||
af3e5d41c2 | |||
51511a9bf9 | |||
2549204662 | |||
b826c856fc | |||
1afe74242a | |||
b43412b135 | |||
bbad4eb8d9 | |||
f6c128fbf6 | |||
b955c4d45e | |||
e26a776576 | |||
52c4e97be5 | |||
49bd2b9501 | |||
ab76521990 | |||
ee73908231 | |||
3af98b6785 | |||
05657ccdce | |||
a698aa96cd | |||
a7fef63461 | |||
83217d31a7 | |||
4191f5414f | |||
bf81994aa0 | |||
21c02010f7 | |||
c209e24db8 | |||
9ff7ecea97 | |||
78e3c78197 | |||
38cd871178 | |||
5594bf74b6 | |||
65515143eb | |||
29895420b6 | |||
88f7e13500 | |||
51335a0f84 | |||
077cc20934 | |||
ae49e9f2fd | |||
ca3e0eda49 | |||
d33716e3af | |||
ff2dd6cdec | |||
3dfb3caf40 | |||
7900e88907 | |||
9b90cf5783 | |||
ed8791a847 | |||
b7ea02bc44 | |||
07954b7d1a | |||
08dbb315cb | |||
82b8314b74 | |||
12b17487ac | |||
a05098f502 | |||
4cfb967e39 | |||
04f45013eb | |||
0c8a77a4ca | |||
03c9dbd2a7 | |||
2a2cd5ff59 | |||
3b134d52aa | |||
5fbc95f206 | |||
f47a5e50ad | |||
0c5076eaaf | |||
2438150679 | |||
d04c070fe1 | |||
ac5f4cafeb | |||
ccb0364e76 | |||
414bdead17 | |||
8cf09a68d1 | |||
e4c79d7275 | |||
a718f1e122 | |||
6507764545 | |||
bd2d66ecd3 | |||
c09525f306 | |||
5bc7487c3a | |||
9b73b0f70e | |||
4f1f3e569b | |||
e4847ac243 | |||
8b039cb9a7 | |||
37bff3d50c | |||
70941405ad | |||
c96a0fd8f4 | |||
5ad8f762f7 | |||
297f5f13fb | |||
985ccaf931 | |||
877d9331e4 | |||
9d8c23bc32 | |||
51dd85f973 | |||
af688314fb | |||
1946c3cc6f | |||
8ae8c3b0a3 |
@ -1,4 +1,4 @@
|
||||
version: 11.7.{build}
|
||||
version: 12.0.{build}
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
@ -28,9 +28,9 @@ build_script:
|
||||
md installer
|
||||
copy release\GPXSee.exe installer
|
||||
windeployqt --release installer\GPXSee.exe
|
||||
copy pkg\gpxsee64.nsi installer
|
||||
xcopy pkg\csv installer\csv /i
|
||||
xcopy pkg\maps installer\maps /i
|
||||
copy pkg\windows\gpxsee64.nsi installer
|
||||
xcopy data\csv installer\csv /i
|
||||
xcopy data\maps installer\maps /i
|
||||
xcopy lang\*.qm installer\translations\ /sy
|
||||
xcopy icons\symbols installer\symbols /i
|
||||
copy licence.txt installer
|
||||
|
8
.github/workflows/android.yml
vendored
@ -26,18 +26,18 @@ jobs:
|
||||
- name: Setup NDK path
|
||||
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
|
||||
- name: Install Qt (Desktop)
|
||||
uses: jurplel/install-qt-action@v2
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
aqtversion: '==2.1.0'
|
||||
version: '6.4.0'
|
||||
- name: Install Qt (Android)
|
||||
uses: jurplel/install-qt-action@v2
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
aqtversion: '==2.1.0'
|
||||
version: '6.4.0'
|
||||
target: 'android'
|
||||
arch: 'android_armv7'
|
||||
modules: qtpositioning qt5compat
|
||||
modules: qtpositioning qt5compat qtserialport
|
||||
- name: Install Android OpenSSL
|
||||
run: git clone https://github.com/KDAB/android_openssl.git
|
||||
- name: Create localization
|
||||
@ -47,7 +47,7 @@ jobs:
|
||||
- name: Build project
|
||||
run: make -j2 apk
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: GPXSee-armv7.apk
|
||||
path: android-build/build/outputs/apk/debug/android-build-debug.apk
|
||||
|
45
.github/workflows/codeql.yml
vendored
Normal file
@ -0,0 +1,45 @@
|
||||
name: "CodeQL"
|
||||
|
||||
on: [workflow_dispatch]
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
name: Analyze
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
actions: read
|
||||
contents: read
|
||||
security-events: write
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
language: [ 'cpp' ]
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev
|
||||
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v2
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
# By default, queries listed here will override any specified in a config file.
|
||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||
|
||||
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
|
||||
# queries: security-extended,security-and-quality
|
||||
|
||||
- name: Autobuild
|
||||
uses: github/codeql-action/autobuild@v2
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v2
|
||||
with:
|
||||
category: "/language:${{matrix.language}}"
|
4
.github/workflows/linux.yml
vendored
@ -11,11 +11,11 @@ jobs:
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev
|
||||
sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev libqt5serialport5-dev
|
||||
- name: Create localization
|
||||
run: lrelease gpxsee.pro
|
||||
- name: Configure build
|
||||
|
8
.github/workflows/osx.yml
vendored
@ -13,7 +13,7 @@ jobs:
|
||||
- name: Set environment variables
|
||||
run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: brew install qt5
|
||||
- name: Create localization
|
||||
@ -25,7 +25,7 @@ jobs:
|
||||
- name: Create DMG
|
||||
run: macdeployqt GPXSee.app -dmg
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: GPXSee-qt5.dmg
|
||||
path: GPXSee.dmg
|
||||
@ -37,7 +37,7 @@ jobs:
|
||||
- name: Set environment variables
|
||||
run: echo "PATH=/usr/local/opt/qt@6/bin:$PATH" >> $GITHUB_ENV
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: brew install qt6
|
||||
- name: Create localization
|
||||
@ -49,7 +49,7 @@ jobs:
|
||||
- name: Create DMG
|
||||
run: macdeployqt GPXSee.app -dmg
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: GPXSee-qt6.dmg
|
||||
path: GPXSee.dmg
|
||||
|
@ -10,7 +10,7 @@ GPS log file formats.
|
||||
QuadTiles).
|
||||
* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
|
||||
Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts,
|
||||
ENC charts KMZ maps, AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps,
|
||||
ENC charts, KMZ maps, AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps,
|
||||
Mapsforge vector maps, QCT maps, GEMF maps, Osmdroid SQLite maps, Orux maps,
|
||||
ESRI World-File georeferenced images).
|
||||
* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts
|
||||
@ -64,7 +64,7 @@ GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using
|
||||
different, GPL compatible, licenses:
|
||||
|
||||
* [Oxygen icons](icons/GUI) - LGPLv3
|
||||
* [Mapbox Maki icons](icons/map/IMG/POI) - CC0
|
||||
* [Mapbox Maki icons](icons/map/POI) - CC0
|
||||
* [Map Icons Collection](icons/symbols) - CC BY SA 3.0
|
||||
* [RTree implementation](src/common/rtree.h) - Public domain
|
||||
* [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp),
|
||||
|
Can't render this file because it is too large.
|
37
gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx:!android {
|
||||
} else {
|
||||
TARGET = GPXSee
|
||||
}
|
||||
VERSION = 11.7
|
||||
VERSION = 12.0
|
||||
|
||||
QT += core \
|
||||
gui \
|
||||
@ -14,7 +14,8 @@ QT += core \
|
||||
widgets \
|
||||
printsupport \
|
||||
positioning \
|
||||
svg
|
||||
svg \
|
||||
serialport
|
||||
greaterThan(QT_MAJOR_VERSION, 5) {
|
||||
QT += openglwidgets \
|
||||
core5compat
|
||||
@ -29,6 +30,8 @@ HEADERS += src/common/config.h \
|
||||
src/GUI/pluginparameters.h \
|
||||
src/common/garmin.h \
|
||||
src/common/coordinates.h \
|
||||
src/common/hash.h \
|
||||
src/common/linec.h \
|
||||
src/common/range.h \
|
||||
src/common/rectc.h \
|
||||
src/common/textcodec.h \
|
||||
@ -261,6 +264,7 @@ SOURCES += src/main.cpp \
|
||||
src/GUI/motioninfoitem.cpp \
|
||||
src/GUI/navigationwidget.cpp \
|
||||
src/GUI/pluginparameters.cpp \
|
||||
src/GUI/settings.cpp \
|
||||
src/common/coordinates.cpp \
|
||||
src/common/rectc.cpp \
|
||||
src/common/range.cpp \
|
||||
@ -471,23 +475,26 @@ TRANSLATIONS = lang/gpxsee_en.ts \
|
||||
lang/gpxsee_it.ts \
|
||||
lang/gpxsee_eo.ts \
|
||||
lang/gpxsee_zh.ts \
|
||||
lang/gpxsee_ca.ts
|
||||
lang/gpxsee_ca.ts \
|
||||
lang/gpxsee_ko.ts
|
||||
|
||||
macx {
|
||||
ICON = icons/app/gpxsee.icns
|
||||
QMAKE_INFO_PLIST = pkg/Info.plist
|
||||
QMAKE_INFO_PLIST = pkg/mac/Info.plist
|
||||
locale.path = Contents/Resources/translations
|
||||
locale.files = $$files(lang/*.qm)
|
||||
csv.path = Contents/Resources
|
||||
csv.files = pkg/csv
|
||||
csv.files = data/csv
|
||||
maps.path = Contents/Resources
|
||||
maps.files = pkg/maps
|
||||
maps.files = data/maps
|
||||
symbols.path = Contents/Resources/symbols
|
||||
symbols.files = $$files(icons/symbols/*.png)
|
||||
icons.path = Contents/Resources/icons
|
||||
icons.files = $$files(icons/formats/*.icns)
|
||||
lproj.path = Contents/Resources
|
||||
lproj.files = $$files(pkg/mac/lproj/*)
|
||||
|
||||
QMAKE_BUNDLE_DATA += locale maps symbols icons csv
|
||||
QMAKE_BUNDLE_DATA += locale maps symbols icons csv lproj
|
||||
}
|
||||
|
||||
win32 {
|
||||
@ -532,9 +539,9 @@ win32 {
|
||||
unix:!macx:!android {
|
||||
isEmpty(PREFIX):PREFIX = /usr/local
|
||||
|
||||
maps.files = $$files(pkg/maps/*)
|
||||
maps.files = $$files(data/maps/*)
|
||||
maps.path = $$PREFIX/share/gpxsee/maps
|
||||
csv.files = $$files(pkg/csv/*)
|
||||
csv.files = $$files(data/csv/*)
|
||||
csv.path = $$PREFIX/share/gpxsee/csv
|
||||
symbols.files = $$files(icons/symbols/*.png)
|
||||
symbols.path = $$PREFIX/share/gpxsee/symbols
|
||||
@ -542,12 +549,14 @@ unix:!macx:!android {
|
||||
locale.path = $$PREFIX/share/gpxsee/translations
|
||||
icon.files = $$files(icons/app/hicolor/*)
|
||||
icon.path = $$PREFIX/share/icons/hicolor
|
||||
desktop.files = pkg/gpxsee.desktop
|
||||
desktop.files = pkg/linux/gpxsee.desktop
|
||||
desktop.path = $$PREFIX/share/applications
|
||||
mime.files = pkg/gpxsee.xml
|
||||
mime.files = pkg/linux/gpxsee.xml
|
||||
mime.path = $$PREFIX/share/mime/packages
|
||||
appdata.files = pkg/linux/gpxsee.appdata.xml
|
||||
appdata.path = $$PREFIX/share/metainfo
|
||||
target.path = $$PREFIX/bin
|
||||
INSTALLS += target maps csv symbols locale icon desktop mime
|
||||
INSTALLS += target maps csv symbols locale icon desktop mime appdata
|
||||
}
|
||||
|
||||
android {
|
||||
@ -580,9 +589,9 @@ android {
|
||||
pkg/android/build.gradle \
|
||||
pkg/android/res/values/libs.xml
|
||||
|
||||
maps.files = $$files(pkg/maps/*)
|
||||
maps.files = $$files(data/maps/*)
|
||||
maps.path = /assets/maps
|
||||
csv.files = $$files(pkg/csv/*)
|
||||
csv.files = $$files(data/csv/*)
|
||||
csv.path = /assets/csv
|
||||
symbols.files = $$files(icons/symbols/*.png)
|
||||
symbols.path = /assets/symbols
|
||||
|
188
gpxsee.qrc
@ -55,85 +55,85 @@
|
||||
<file alias="transform-move_32@2x.png">icons/GUI/transform-move_32@2x.png</file>
|
||||
</qresource>
|
||||
|
||||
<!-- IMG map style -->
|
||||
<qresource prefix="/IMG">
|
||||
<file alias="airfield-11.png">icons/map/IMG/POI/airfield-11.png</file>
|
||||
<file alias="airport-11.png">icons/map/IMG/POI/airport-11.png</file>
|
||||
<file alias="amusement-park-11.png">icons/map/IMG/POI/amusement-park-11.png</file>
|
||||
<file alias="bakery-11.png">icons/map/IMG/POI/bakery-11.png</file>
|
||||
<file alias="bank-11.png">icons/map/IMG/POI/bank-11.png</file>
|
||||
<file alias="bar-11.png">icons/map/IMG/POI/bar-11.png</file>
|
||||
<file alias="bbq-11.png">icons/map/IMG/POI/bbq-11.png</file>
|
||||
<file alias="beach-11.png">icons/map/IMG/POI/beach-11.png</file>
|
||||
<file alias="bowling-alley-11.png">icons/map/IMG/POI/bowling-alley-11.png</file>
|
||||
<file alias="building-alt1-11.png">icons/map/IMG/POI/building-alt1-11.png</file>
|
||||
<file alias="bridge-11.png">icons/map/IMG/POI/bridge-11.png</file>
|
||||
<file alias="bus-11.png">icons/map/IMG/POI/bus-11.png</file>
|
||||
<file alias="cafe-11.png">icons/map/IMG/POI/cafe-11.png</file>
|
||||
<file alias="campsite-11.png">icons/map/IMG/POI/campsite-11.png</file>
|
||||
<file alias="car-11.png">icons/map/IMG/POI/car-11.png</file>
|
||||
<file alias="car-rental-11.png">icons/map/IMG/POI/car-rental-11.png</file>
|
||||
<file alias="car-repair-11.png">icons/map/IMG/POI/car-repair-11.png</file>
|
||||
<file alias="casino-11.png">icons/map/IMG/POI/casino-11.png</file>
|
||||
<file alias="cemetery-11.png">icons/map/IMG/POI/cemetery-11.png</file>
|
||||
<file alias="cinema-11.png">icons/map/IMG/POI/cinema-11.png</file>
|
||||
<file alias="clothing-store-11.png">icons/map/IMG/POI/clothing-store-11.png</file>
|
||||
<file alias="communications-tower-11.png">icons/map/IMG/POI/communications-tower-11.png</file>
|
||||
<file alias="convenience-11.png">icons/map/IMG/POI/convenience-11.png</file>
|
||||
<file alias="dam-11.png">icons/map/IMG/POI/dam-11.png</file>
|
||||
<file alias="danger-11.png">icons/map/IMG/POI/danger-11.png</file>
|
||||
<file alias="drinking-water-11.png">icons/map/IMG/POI/drinking-water-11.png</file>
|
||||
<file alias="fast-food-11.png">icons/map/IMG/POI/fast-food-11.png</file>
|
||||
<file alias="entrance-alt1-11.png">icons/map/IMG/POI/entrance-alt1-11.png</file>
|
||||
<file alias="fire-station-11.png">icons/map/IMG/POI/fire-station-11.png</file>
|
||||
<file alias="fitness-centre-11.png">icons/map/IMG/POI/fitness-centre-11.png</file>
|
||||
<file alias="fuel-11.png">icons/map/IMG/POI/fuel-11.png</file>
|
||||
<file alias="furniture-11.png">icons/map/IMG/POI/furniture-11.png</file>
|
||||
<file alias="garden-11.png">icons/map/IMG/POI/garden-11.png</file>
|
||||
<file alias="garden-centre-11.png">icons/map/IMG/POI/garden-centre-11.png</file>
|
||||
<file alias="golf-11.png">icons/map/IMG/POI/golf-11.png</file>
|
||||
<file alias="grocery-11.png">icons/map/IMG/POI/grocery-11.png</file>
|
||||
<file alias="hairdresser-11.png">icons/map/IMG/POI/hairdresser-11.png</file>
|
||||
<file alias="harbor-11.png">icons/map/IMG/POI/harbor-11.png</file>
|
||||
<file alias="hardware-11.png">icons/map/IMG/POI/hardware-11.png</file>
|
||||
<file alias="heliport-11.png">icons/map/IMG/POI/heliport-11.png</file>
|
||||
<file alias="hospital-11.png">icons/map/IMG/POI/hospital-11.png</file>
|
||||
<file alias="information-11.png">icons/map/IMG/POI/information-11.png</file>
|
||||
<file alias="landmark-11.png">icons/map/IMG/POI/landmark-11.png</file>
|
||||
<file alias="library-11.png">icons/map/IMG/POI/library-11.png</file>
|
||||
<file alias="lodging-11.png">icons/map/IMG/POI/lodging-11.png</file>
|
||||
<file alias="mountain-11.png">icons/map/IMG/POI/mountain-11.png</file>
|
||||
<file alias="museum-11.png">icons/map/IMG/POI/museum-11.png</file>
|
||||
<file alias="park-11.png">icons/map/IMG/POI/park-11.png</file>
|
||||
<file alias="parking-11.png">icons/map/IMG/POI/parking-11.png</file>
|
||||
<file alias="pharmacy-11.png">icons/map/IMG/POI/pharmacy-11.png</file>
|
||||
<file alias="picnic-site-11.png">icons/map/IMG/POI/picnic-site-11.png</file>
|
||||
<file alias="place-of-worship-11.png">icons/map/IMG/POI/place-of-worship-11.png</file>
|
||||
<file alias="police-11.png">icons/map/IMG/POI/police-11.png</file>
|
||||
<file alias="post-11.png">icons/map/IMG/POI/post-11.png</file>
|
||||
<file alias="religious-christian-11.png">icons/map/IMG/POI/religious-christian-11.png</file>
|
||||
<file alias="religious-jewish-11.png">icons/map/IMG/POI/religious-jewish-11.png</file>
|
||||
<file alias="religious-muslim-11.png">icons/map/IMG/POI/religious-muslim-11.png</file>
|
||||
<file alias="restaurant-11.png">icons/map/IMG/POI/restaurant-11.png</file>
|
||||
<file alias="restaurant-noodle-11.png">icons/map/IMG/POI/restaurant-noodle-11.png</file>
|
||||
<file alias="restaurant-pizza-11.png">icons/map/IMG/POI/restaurant-pizza-11.png</file>
|
||||
<file alias="restaurant-seafood-11.png">icons/map/IMG/POI/restaurant-seafood-11.png</file>
|
||||
<file alias="roadblock-11.png">icons/map/IMG/POI/roadblock-11.png</file>
|
||||
<file alias="school-11.png">icons/map/IMG/POI/school-11.png</file>
|
||||
<file alias="shelter-11.png">icons/map/IMG/POI/shelter-11.png</file>
|
||||
<file alias="shop-11.png">icons/map/IMG/POI/shop-11.png</file>
|
||||
<file alias="skiing-11.png">icons/map/IMG/POI/skiing-11.png</file>
|
||||
<file alias="soccer-11.png">icons/map/IMG/POI/soccer-11.png</file>
|
||||
<file alias="swimming-11.png">icons/map/IMG/POI/swimming-11.png</file>
|
||||
<file alias="theatre-11.png">icons/map/IMG/POI/theatre-11.png</file>
|
||||
<file alias="telephone-11.png">icons/map/IMG/POI/telephone-11.png</file>
|
||||
<file alias="toilet-11.png">icons/map/IMG/POI/toilet-11.png</file>
|
||||
<file alias="town-hall-11.png">icons/map/IMG/POI/town-hall-11.png</file>
|
||||
<file alias="viewpoint-11.png">icons/map/IMG/POI/viewpoint-11.png</file>
|
||||
<file alias="village-11.png">icons/map/IMG/POI/village-11.png</file>
|
||||
<file alias="waterfall-11.png">icons/map/IMG/POI/waterfall-11.png</file>
|
||||
<file alias="wetland-11.png">icons/map/IMG/POI/wetland-11.png</file>
|
||||
<file alias="zoo-11.png">icons/map/IMG/POI/zoo-11.png</file>
|
||||
<!-- POIs (IMG & ENC style) -->
|
||||
<qresource prefix="/POI">
|
||||
<file alias="airfield-11.png">icons/map/POI/airfield-11.png</file>
|
||||
<file alias="airport-11.png">icons/map/POI/airport-11.png</file>
|
||||
<file alias="amusement-park-11.png">icons/map/POI/amusement-park-11.png</file>
|
||||
<file alias="bakery-11.png">icons/map/POI/bakery-11.png</file>
|
||||
<file alias="bank-11.png">icons/map/POI/bank-11.png</file>
|
||||
<file alias="bar-11.png">icons/map/POI/bar-11.png</file>
|
||||
<file alias="bbq-11.png">icons/map/POI/bbq-11.png</file>
|
||||
<file alias="beach-11.png">icons/map/POI/beach-11.png</file>
|
||||
<file alias="bowling-alley-11.png">icons/map/POI/bowling-alley-11.png</file>
|
||||
<file alias="building-alt1-11.png">icons/map/POI/building-alt1-11.png</file>
|
||||
<file alias="bridge-11.png">icons/map/POI/bridge-11.png</file>
|
||||
<file alias="bus-11.png">icons/map/POI/bus-11.png</file>
|
||||
<file alias="cafe-11.png">icons/map/POI/cafe-11.png</file>
|
||||
<file alias="campsite-11.png">icons/map/POI/campsite-11.png</file>
|
||||
<file alias="car-11.png">icons/map/POI/car-11.png</file>
|
||||
<file alias="car-rental-11.png">icons/map/POI/car-rental-11.png</file>
|
||||
<file alias="car-repair-11.png">icons/map/POI/car-repair-11.png</file>
|
||||
<file alias="casino-11.png">icons/map/POI/casino-11.png</file>
|
||||
<file alias="cemetery-11.png">icons/map/POI/cemetery-11.png</file>
|
||||
<file alias="cinema-11.png">icons/map/POI/cinema-11.png</file>
|
||||
<file alias="clothing-store-11.png">icons/map/POI/clothing-store-11.png</file>
|
||||
<file alias="communications-tower-11.png">icons/map/POI/communications-tower-11.png</file>
|
||||
<file alias="convenience-11.png">icons/map/POI/convenience-11.png</file>
|
||||
<file alias="dam-11.png">icons/map/POI/dam-11.png</file>
|
||||
<file alias="danger-11.png">icons/map/POI/danger-11.png</file>
|
||||
<file alias="drinking-water-11.png">icons/map/POI/drinking-water-11.png</file>
|
||||
<file alias="fast-food-11.png">icons/map/POI/fast-food-11.png</file>
|
||||
<file alias="entrance-alt1-11.png">icons/map/POI/entrance-alt1-11.png</file>
|
||||
<file alias="fire-station-11.png">icons/map/POI/fire-station-11.png</file>
|
||||
<file alias="fitness-centre-11.png">icons/map/POI/fitness-centre-11.png</file>
|
||||
<file alias="fuel-11.png">icons/map/POI/fuel-11.png</file>
|
||||
<file alias="furniture-11.png">icons/map/POI/furniture-11.png</file>
|
||||
<file alias="garden-11.png">icons/map/POI/garden-11.png</file>
|
||||
<file alias="garden-centre-11.png">icons/map/POI/garden-centre-11.png</file>
|
||||
<file alias="golf-11.png">icons/map/POI/golf-11.png</file>
|
||||
<file alias="grocery-11.png">icons/map/POI/grocery-11.png</file>
|
||||
<file alias="hairdresser-11.png">icons/map/POI/hairdresser-11.png</file>
|
||||
<file alias="harbor-11.png">icons/map/POI/harbor-11.png</file>
|
||||
<file alias="hardware-11.png">icons/map/POI/hardware-11.png</file>
|
||||
<file alias="heliport-11.png">icons/map/POI/heliport-11.png</file>
|
||||
<file alias="hospital-11.png">icons/map/POI/hospital-11.png</file>
|
||||
<file alias="information-11.png">icons/map/POI/information-11.png</file>
|
||||
<file alias="landmark-11.png">icons/map/POI/landmark-11.png</file>
|
||||
<file alias="library-11.png">icons/map/POI/library-11.png</file>
|
||||
<file alias="lodging-11.png">icons/map/POI/lodging-11.png</file>
|
||||
<file alias="mountain-11.png">icons/map/POI/mountain-11.png</file>
|
||||
<file alias="museum-11.png">icons/map/POI/museum-11.png</file>
|
||||
<file alias="park-11.png">icons/map/POI/park-11.png</file>
|
||||
<file alias="parking-11.png">icons/map/POI/parking-11.png</file>
|
||||
<file alias="pharmacy-11.png">icons/map/POI/pharmacy-11.png</file>
|
||||
<file alias="picnic-site-11.png">icons/map/POI/picnic-site-11.png</file>
|
||||
<file alias="place-of-worship-11.png">icons/map/POI/place-of-worship-11.png</file>
|
||||
<file alias="police-11.png">icons/map/POI/police-11.png</file>
|
||||
<file alias="post-11.png">icons/map/POI/post-11.png</file>
|
||||
<file alias="religious-christian-11.png">icons/map/POI/religious-christian-11.png</file>
|
||||
<file alias="religious-jewish-11.png">icons/map/POI/religious-jewish-11.png</file>
|
||||
<file alias="religious-muslim-11.png">icons/map/POI/religious-muslim-11.png</file>
|
||||
<file alias="restaurant-11.png">icons/map/POI/restaurant-11.png</file>
|
||||
<file alias="restaurant-noodle-11.png">icons/map/POI/restaurant-noodle-11.png</file>
|
||||
<file alias="restaurant-pizza-11.png">icons/map/POI/restaurant-pizza-11.png</file>
|
||||
<file alias="restaurant-seafood-11.png">icons/map/POI/restaurant-seafood-11.png</file>
|
||||
<file alias="roadblock-11.png">icons/map/POI/roadblock-11.png</file>
|
||||
<file alias="school-11.png">icons/map/POI/school-11.png</file>
|
||||
<file alias="shelter-11.png">icons/map/POI/shelter-11.png</file>
|
||||
<file alias="shop-11.png">icons/map/POI/shop-11.png</file>
|
||||
<file alias="skiing-11.png">icons/map/POI/skiing-11.png</file>
|
||||
<file alias="soccer-11.png">icons/map/POI/soccer-11.png</file>
|
||||
<file alias="swimming-11.png">icons/map/POI/swimming-11.png</file>
|
||||
<file alias="theatre-11.png">icons/map/POI/theatre-11.png</file>
|
||||
<file alias="telephone-11.png">icons/map/POI/telephone-11.png</file>
|
||||
<file alias="toilet-11.png">icons/map/POI/toilet-11.png</file>
|
||||
<file alias="town-hall-11.png">icons/map/POI/town-hall-11.png</file>
|
||||
<file alias="viewpoint-11.png">icons/map/POI/viewpoint-11.png</file>
|
||||
<file alias="village-11.png">icons/map/POI/village-11.png</file>
|
||||
<file alias="waterfall-11.png">icons/map/POI/waterfall-11.png</file>
|
||||
<file alias="wetland-11.png">icons/map/POI/wetland-11.png</file>
|
||||
<file alias="zoo-11.png">icons/map/POI/zoo-11.png</file>
|
||||
</qresource>
|
||||
|
||||
<!-- marine stuff (IMG & ENC style) -->
|
||||
@ -165,6 +165,7 @@
|
||||
<file alias="church.png">icons/map/marine/church.png</file>
|
||||
<file alias="triangulation-point.png">icons/map/marine/triangulation-point.png</file>
|
||||
<file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
|
||||
<file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
|
||||
<file alias="pile.png">icons/map/marine/pile.png</file>
|
||||
<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
|
||||
<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
|
||||
@ -172,11 +173,38 @@
|
||||
<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>
|
||||
<file alias="crane.png">icons/map/marine/crane.png</file>
|
||||
<file alias="distance-mark.png">icons/map/marine/distance-mark.png</file>
|
||||
<file alias="distance-mark-land.png">icons/map/marine/distance-mark-land.png</file>
|
||||
<file alias="conveyor-line.png">icons/map/marine/conveyor-line.png</file>
|
||||
<file alias="pipeline-overhead.png">icons/map/marine/pipeline-overhead.png</file>
|
||||
<file alias="coast-guard.png">icons/map/marine/coast-guard.png</file>
|
||||
<file alias="monument.png">icons/map/marine/monument.png</file>
|
||||
<file alias="radio.png">icons/map/marine/radio.png</file>
|
||||
<file alias="radar.png">icons/map/marine/radar.png</file>
|
||||
<file alias="radar-transponder.png">icons/map/marine/radar-transponder.png</file>
|
||||
<file alias="silo.png">icons/map/marine/silo.png</file>
|
||||
<file alias="turning-basin.png">icons/map/marine/turning-basin.png</file>
|
||||
<file alias="entry-prohibited-line.png">icons/map/marine/entry-prohibited-line.png</file>
|
||||
<file alias="safety-zone-line.png">icons/map/marine/safety-zone-line.png</file>
|
||||
<file alias="cable-area-line.png">icons/map/marine/cable-area-line.png</file>
|
||||
<file alias="pipeline-area-line.png">icons/map/marine/pipeline-area-line.png</file>
|
||||
<file alias="windmotor.png">icons/map/marine/windmotor.png</file>
|
||||
<file alias="gauge.png">icons/map/marine/gauge.png</file>
|
||||
<file alias="fishing-farm-line.png">icons/map/marine/fishing-farm-line.png</file>
|
||||
<file alias="shipyard.png">icons/map/marine/shipyard.png</file>
|
||||
<file alias="pylon.png">icons/map/marine/pylon.png</file>
|
||||
<file alias="fleeting-area.png">icons/map/marine/fleeting-area.png</file>
|
||||
<file alias="breakers.png">icons/map/marine/breakers.png</file>
|
||||
<file alias="overfalls.png">icons/map/marine/overfalls.png</file>
|
||||
<file alias="boarding-place.png">icons/map/marine/boarding-place.png</file>
|
||||
</qresource>
|
||||
|
||||
<!-- Mapsforge rendertheme -->
|
||||
<qresource prefix="/mapsforge">
|
||||
<file alias="default.xml">data/default.xml</file>
|
||||
<file alias="default.xml">data/mapsforge/default.xml</file>
|
||||
|
||||
<file alias="patterns/hills.svg">icons/map/mapsforge/patterns/hills.svg</file>
|
||||
<file alias="patterns/farmland.svg">icons/map/mapsforge/patterns/farmland.svg</file>
|
||||
|
Before Width: | Height: | Size: 380 B After Width: | Height: | Size: 380 B |
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 428 B |
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 383 B |
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 363 B |
Before Width: | Height: | Size: 374 B After Width: | Height: | Size: 374 B |
Before Width: | Height: | Size: 393 B After Width: | Height: | Size: 393 B |
Before Width: | Height: | Size: 395 B After Width: | Height: | Size: 395 B |
Before Width: | Height: | Size: 386 B After Width: | Height: | Size: 386 B |
Before Width: | Height: | Size: 365 B After Width: | Height: | Size: 365 B |
Before Width: | Height: | Size: 343 B After Width: | Height: | Size: 343 B |
Before Width: | Height: | Size: 378 B After Width: | Height: | Size: 378 B |
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 351 B |
Before Width: | Height: | Size: 366 B After Width: | Height: | Size: 366 B |
Before Width: | Height: | Size: 368 B After Width: | Height: | Size: 368 B |
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 390 B |
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 381 B |
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 357 B After Width: | Height: | Size: 357 B |
Before Width: | Height: | Size: 356 B After Width: | Height: | Size: 356 B |
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 351 B |
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 650 B After Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 376 B After Width: | Height: | Size: 376 B |
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 421 B |
Before Width: | Height: | Size: 367 B After Width: | Height: | Size: 367 B |
Before Width: | Height: | Size: 611 B After Width: | Height: | Size: 611 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 344 B |
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 403 B |
Before Width: | Height: | Size: 326 B After Width: | Height: | Size: 326 B |
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 377 B |
Before Width: | Height: | Size: 348 B After Width: | Height: | Size: 348 B |
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 352 B |
Before Width: | Height: | Size: 394 B After Width: | Height: | Size: 394 B |
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 355 B |
Before Width: | Height: | Size: 380 B After Width: | Height: | Size: 380 B |
Before Width: | Height: | Size: 404 B After Width: | Height: | Size: 404 B |
Before Width: | Height: | Size: 366 B After Width: | Height: | Size: 366 B |
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 390 B |
Before Width: | Height: | Size: 326 B After Width: | Height: | Size: 326 B |
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 359 B |
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 341 B |
Before Width: | Height: | Size: 410 B After Width: | Height: | Size: 410 B |
@ -1,4 +1,4 @@
|
||||
The IMG style icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
|
||||
The POI icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
|
||||
licensed under CC0.
|
||||
|
||||
-----
|
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 345 B |
Before Width: | Height: | Size: 384 B After Width: | Height: | Size: 384 B |
Before Width: | Height: | Size: 366 B After Width: | Height: | Size: 366 B |
Before Width: | Height: | Size: 399 B After Width: | Height: | Size: 399 B |
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 364 B After Width: | Height: | Size: 364 B |
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 377 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 344 B |
Before Width: | Height: | Size: 394 B After Width: | Height: | Size: 394 B |
Before Width: | Height: | Size: 365 B After Width: | Height: | Size: 365 B |
Before Width: | Height: | Size: 311 B After Width: | Height: | Size: 311 B |
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 359 B |
Before Width: | Height: | Size: 401 B After Width: | Height: | Size: 401 B |
Before Width: | Height: | Size: 361 B After Width: | Height: | Size: 361 B |
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 407 B |
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 383 B |
Before Width: | Height: | Size: 333 B After Width: | Height: | Size: 333 B |
Before Width: | Height: | Size: 325 B After Width: | Height: | Size: 325 B |
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 381 B |
Before Width: | Height: | Size: 399 B After Width: | Height: | Size: 399 B |
Before Width: | Height: | Size: 397 B After Width: | Height: | Size: 397 B |
Before Width: | Height: | Size: 404 B After Width: | Height: | Size: 404 B |
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 377 B |
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 428 B |
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 407 B |
Before Width: | Height: | Size: 348 B After Width: | Height: | Size: 348 B |
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 383 B |
Before Width: | Height: | Size: 373 B After Width: | Height: | Size: 373 B |
Before Width: | Height: | Size: 392 B After Width: | Height: | Size: 392 B |
Before Width: | Height: | Size: 427 B After Width: | Height: | Size: 427 B |
Before Width: | Height: | Size: 382 B After Width: | Height: | Size: 382 B |
Before Width: | Height: | Size: 232 B After Width: | Height: | Size: 218 B |
BIN
icons/map/marine/boarding-place.png
Normal file
After Width: | Height: | Size: 234 B |
BIN
icons/map/marine/breakers.png
Normal file
After Width: | Height: | Size: 271 B |
BIN
icons/map/marine/cable-area-line.png
Normal file
After Width: | Height: | Size: 146 B |