root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-12 18:05:10 +02:00
Code Issues Projects Releases Activity

Merge branch 'master' into android-latest

Browse Source
This commit is contained in:
Martin Tůma
2025-07-10 08:45:18 +02:00
parent a204fc2bc0 5d2b818781
commit 2f5c87af53
13 changed files with 2741 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.appveyor.yml
View File

@ -1,4 +1,4 @@
version: 13.44.{build}
version: 13.45.{build}
configuration:
- Release
@ -10,10 +10,12 @@ environment:
NSISDIR: C:\Program Files (x86)\NSIS
JOMDIR: C:\Qt\Tools\QtCreator\bin\jom
matrix:
- QTDIR: C:\Qt\5.15\msvc2019_64
- job_name: Qt5
QTDIR: C:\Qt\5.15\msvc2019_64
OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
NSISDEF: /DOPENSSL /DANGLE
- QTDIR: C:\Qt\6.8\msvc2022_64
- job_name: Qt6
QTDIR: C:\Qt\6.8\msvc2022_64
NSISDEF: /DQT6
install:
@ -27,9 +29,12 @@ build_script:
qmake gpxsee.pro
jom release
after_build:
- cmd: |-
md installer
copy release\GPXSee.exe installer
windeployqt --release installer\GPXSee.exe
curl -L -o installer\imageformats\pbf4.dll https://ci.appveyor.com/api/projects/tumic0/QtPBFImagePlugin/artifacts/release/pbf4.dll?job=%APPVEYOR_JOB_NAME%
copy pkg\windows\gpxsee64.nsi installer
xcopy data\CRS installer\CRS /i
xcopy data\maps installer\maps /i
@ -38,7 +43,6 @@ build_script:
copy licence.txt installer
IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libcrypto-*-x64.dll installer)
IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libssl-*-x64.dll installer)
makensis.exe %NSISDEF% installer\gpxsee64.nsi
artifacts:

18
.github/workflows/android.yml vendored
View File

@ -38,10 +38,26 @@ jobs:
modules: qtimageformats qtpositioning qtserialport qt5compat
- name: Install Android OpenSSL
run: git clone https://github.com/KDAB/android_openssl.git
- name: Get latest QtPBFImagePlugin run-id
id: runid
run: echo "runid=$(gh run list --repo tumic0/QtPBFImagePlugin --workflow 'Android' --limit 1 --json databaseId -q '.[0].databaseId')" >> $GITHUB_OUTPUT
env:
GH_TOKEN: ${{ github.token }}
- name: Create the plugins dir
run: mkdir plugins
- name: Download QtPBFImagePlugin
uses: actions/download-artifact@v4
with:
name: libplugins_imageformats_libpbf_arm64-v8a.so
github-token: ${{ github.token }}
repository: tumic0/QtPBFImagePlugin
path: plugins
merge-multiple: true
run-id: ${{steps.runid.outputs.runid}}
- name: Create localization
run: lrelease gpxsee.pro
- name: Configure build
run: qmake gpxsee.pro OPENSSL_PATH=android_openssl
run: qmake gpxsee.pro OPENSSL_PATH=android_openssl ANDROID_EXTRA_PLUGINS=${{ github.workspace }}/plugins
- name: Build project
run: make -j4 apk
- name: Upload artifacts

16
.github/workflows/osx.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.8.2'
version: '6.9.1'
modules: qtpositioning qtserialport qtimageformats
- name: Create localization
run: lrelease gpxsee.pro
@ -23,6 +23,20 @@ jobs:
run: qmake gpxsee.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64"
- name: Build project
run: make -j3
- name: Get latest QtPBFImagePlugin run-id
id: runid
run: echo "runid=$(gh run list --repo tumic0/QtPBFImagePlugin --workflow 'OS X' --limit 1 --json databaseId -q '.[0].databaseId')" >> $GITHUB_OUTPUT
env:
GH_TOKEN: ${{ github.token }}
- name: Download QtPBFImagePlugin
uses: actions/download-artifact@v4
with:
name: libpbf.dylib
github-token: ${{ github.token }}
repository: tumic0/QtPBFImagePlugin
path: GPXSee.app/Contents/Plugins/imageformats
merge-multiple: true
run-id: ${{steps.runid.outputs.runid}}
- name: Create DMG
run: macdeployqt GPXSee.app -dmg -appstore-compliant
- name: Upload artifacts

14
data/style/style.xml
View File

@ -42,7 +42,7 @@
<rule e="way" closed="yes" k="landuse" v="comercial|residential|retail" zoom-min="10">
<area fill="#e6e2d9"/>
</rule>
<rule e="way" closed="yes" k="landuse" v="forest|wood" zoom-min="10">
<rule e="way" closed="yes" k="landuse" v="forest|wood" zoom-min="9">
<area fill="#cadfaf"/>
</rule>
<rule e="way" closed="yes" k="landuse" v="meadow|grass|greenfield|village_green" zoom-min="10">
@ -56,7 +56,7 @@
</rule>
<!-- Hillshading -->
<hillshading zoom-min="10" zoom-max="15"/>
<hillshading zoom-min="9" zoom-max="15"/>
<!-- Contour lines -->
<rule e="way" k="contour_ext" v="*">
@ -198,13 +198,13 @@
</rule>
<!-- Area overlays -->
<rule e="way" k="landuse" v="military" zoom-min="10">
<rule e="way" closed="yes" k="landuse" v="military" zoom-min="9">
<area src=":/patterns/military-area.svg" symbol-height="4"/>
<rule e="way" k="*" v="*" zoom-min="16">
<caption fill="#ff4040" font-size="10" font-style="italic" text-transform="uppercase" k="name" stroke="#ffffff" stroke-width="2"/>
</rule>
</rule>
<rule e="way" k="boundary" v="protected_area|national_park" zoom-min="10" zoom-max="14">
<rule e="way" closed="yes" k="boundary" v="protected_area|national_park" zoom-min="9" zoom-max="14">
<rule e="way" k="protect_class" v="pr_2">
<area src=":/patterns/nature-reserve.svg" symbol-height="4"/>
<rule e="way" k="*" v="*" zoom-max="11">
@ -214,17 +214,17 @@
</rule>
<!-- Buildings -->
<rule e="way" k="building" v="-|civic|office|cathedral|church|basilica">
<rule e="way" closed="yes" 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|office">
<rule e="way" closed="yes" 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"/>
</rule>
</rule>
<rule e="way" k="building" v="cathedral|church|basilica">
<rule e="way" closed="yes" k="building" v="cathedral|church|basilica">
<area fill="#a19d96" 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"/>

2
gpxsee.pro
View File

@ -3,7 +3,7 @@ unix:!macx:!android {
} else {
TARGET = GPXSee
}
VERSION = 13.44
VERSION = 13.45
QT += core \
gui \

2
lang/gpxsee_ca.ts
View File

@ -579,7 +579,7 @@
<message>
<location filename="../src/GUI/gui.cpp" line="451"/>
<source>Legend</source>
<translation type="unfinished"></translation>
<translation>Llegenda</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="459"/>

2681
lang/gpxsee_lv.ts Normal file
View File

File diff suppressed because it is too large Load Diff

6
lang/gpxsee_nb.ts
View File

@ -172,12 +172,12 @@
<message>
<location filename="../src/data/data.cpp" line="254"/>
<source>VKX files</source>
<translation type="unfinished"></translation>
<translation>VKX-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="255"/>
<source>VTK files</source>
<translation type="unfinished"></translation>
<translation>VTK-filer</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="256"/>
@ -579,7 +579,7 @@
<message>
<location filename="../src/GUI/gui.cpp" line="451"/>
<source>Legend</source>
<translation type="unfinished"></translation>
<translation>Forklaring</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="459"/>

4
lang/gpxsee_tr.ts
View File

@ -172,12 +172,12 @@
<message>
<location filename="../src/data/data.cpp" line="254"/>
<source>VKX files</source>
<translation type="unfinished"></translation>
<translation>VKX dosyaları</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="255"/>
<source>VTK files</source>
<translation type="unfinished"></translation>
<translation>VTK dosyaları</translation>
</message>
<message>
<location filename="../src/data/data.cpp" line="256"/>

2
lang/gpxsee_zh_CN.ts
View File

@ -579,7 +579,7 @@
<message>
<location filename="../src/GUI/gui.cpp" line="451"/>
<source>Legend</source>
<translation type="unfinished"></translation>
<translation>图例</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="459"/>

2
pkg/windows/gpxsee64.nsi
View File

@ -49,7 +49,7 @@ Unicode true
; The name of the installer
Name "GPXSee"
; Program version
!define VERSION "13.44"
!define VERSION "13.45"
; The file to write
OutFile "GPXSee-${VERSION}_x64.exe"

6
src/GUI/settings.cpp
View File

@ -250,12 +250,12 @@ SETTING(demURL, "demURL", DEM_TILES_URL );
SETTING(demAuthentication, "demAuthentication", false );
SETTING(demUsername, "demUsername", "" );
SETTING(demPassword, "demPassword", "" );
SETTING(hillshadingAlpha, "hillshadingAlpha", 102 );
SETTING(hillshadingLightening,"hillshadingLightening", 0.2 );
SETTING(hillshadingAlpha, "hillshadingAlpha", 85 );
SETTING(hillshadingLightening,"hillshadingLightening", 0.25 );
SETTING(hillshadingBlur, "hillshadingBlur", 3 );
SETTING(hillshadingAzimuth, "hillshadingAzimuth", 315 );
SETTING(hillshadingAltitude, "hillshadingAltitude", 45 );
SETTING(hillshadingZFactor, "hillshadingZFactor", 0.6 );
SETTING(hillshadingZFactor, "hillshadingZFactor", 0.8 );
SETTING(useOpenGL, "useOpenGL", false );
SETTING(enableHTTP2, "enableHTTP2", true );
SETTING(pixmapCache, "pixmapCache", PIXMAP_CACHE );

2
src/map/IMG/rastertile.cpp
View File

@ -652,7 +652,7 @@ MatrixD RasterTile::elevation(int extend) const
void RasterTile::drawHillShading(QPainter *painter) const
{
if (_hillShading && _zoom >= 18 && _zoom <= 24) {
if (_hillShading && _zoom >= 17 && _zoom <= 24) {
if (HillShading::blur()) {
MatrixD dem(Filter::blur(elevation(HillShading::blur() + 1),
HillShading::blur()));