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

Map details & hillshading default parameters adjustements

Browse Source
This commit is contained in:
Martin Tůma
2025-06-28 10:41:39 +02:00
parent 732bae0e8f
commit 1054f2a330
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/style/style.xml
View File

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

6
src/GUI/settings.cpp
View File

@ -250,12 +250,12 @@ SETTING(demURL, "demURL", DEM_TILES_URL );
SETTING(demAuthentication, "demAuthentication", false ); SETTING(demAuthentication, "demAuthentication", false );
SETTING(demUsername, "demUsername", "" ); SETTING(demUsername, "demUsername", "" );
SETTING(demPassword, "demPassword", "" ); SETTING(demPassword, "demPassword", "" );
SETTING(hillshadingAlpha, "hillshadingAlpha", 102 ); SETTING(hillshadingAlpha, "hillshadingAlpha", 85 );
SETTING(hillshadingLightening,"hillshadingLightening", 0.2 ); SETTING(hillshadingLightening,"hillshadingLightening", 0.25 );
SETTING(hillshadingBlur, "hillshadingBlur", 3 ); SETTING(hillshadingBlur, "hillshadingBlur", 3 );
SETTING(hillshadingAzimuth, "hillshadingAzimuth", 315 ); SETTING(hillshadingAzimuth, "hillshadingAzimuth", 315 );
SETTING(hillshadingAltitude, "hillshadingAltitude", 45 ); SETTING(hillshadingAltitude, "hillshadingAltitude", 45 );
SETTING(hillshadingZFactor, "hillshadingZFactor", 0.6 ); SETTING(hillshadingZFactor, "hillshadingZFactor", 0.8 );
SETTING(useOpenGL, "useOpenGL", false ); SETTING(useOpenGL, "useOpenGL", false );
SETTING(enableHTTP2, "enableHTTP2", true ); SETTING(enableHTTP2, "enableHTTP2", true );
SETTING(pixmapCache, "pixmapCache", PIXMAP_CACHE ); 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 void RasterTile::drawHillShading(QPainter *painter) const
{ {
if (_hillShading && _zoom >= 18 && _zoom <= 24) { if (_hillShading && _zoom >= 17 && _zoom <= 24) {
if (HillShading::blur()) { if (HillShading::blur()) {
MatrixD dem(Filter::blur(elevation(HillShading::blur() + 1), MatrixD dem(Filter::blur(elevation(HillShading::blur() + 1),
HillShading::blur())); HillShading::blur()));