diff --git a/data/maps/earth/vectorosm/vectorosm.dgml b/data/maps/earth/vectorosm/vectorosm.dgml --- a/data/maps/earth/vectorosm/vectorosm.dgml +++ b/data/maps/earth/vectorosm/vectorosm.dgml @@ -29,15 +29,12 @@ - earth/openstreetmap - - - - - - - - + earth/sentinel2 + + + + + earth/hillshading @@ -129,7 +126,7 @@
- OSM Bitmap Tiles + Satellite View
diff --git a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp --- a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp +++ b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp @@ -201,6 +201,18 @@ } } + GeoDataFeature::GeoDataVisualCategory const cat = feature()->visualCategory(); + if ((cat >= GeoDataFeature::LeisureGolfCourse && cat <= GeoDataFeature::LanduseVineyard) + ||cat == GeoDataFeature::Building + ||(cat >= GeoDataFeature::NaturalWater && cat <= GeoDataFeature::NaturalHeath) + ||(cat >= GeoDataFeature::HighwaySteps && cat <= GeoDataFeature::HighwayMotorway)) { + QPen pen = painter->pen(); + QColor color = pen.color(); + color.setAlpha(color.alpha()*0.25); + pen.setColor(color); + painter->setPen(pen); + } + return currentPen; } diff --git a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp --- a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp +++ b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp @@ -291,7 +291,8 @@ } } -void GeoPolygonGraphicsItem::paint( GeoPainter* painter, const ViewportParams* viewport, const QString &layer ) { +void GeoPolygonGraphicsItem::paint( GeoPainter* painter, const ViewportParams* viewport, const QString &layer ) +{ if (layer.endsWith("/frame")) { paintFrame(painter, viewport); } else if (layer.endsWith("/roof")) { @@ -575,7 +576,9 @@ if (m_cachedTexturePath != style()->polyStyle().texturePath() || m_cachedTextureColor != style()->polyStyle().paintedColor() ) { if (textureImage.hasAlphaChannel()) { m_cachedTexture = QImage ( textureImage.size(), QImage::Format_ARGB32_Premultiplied ); - m_cachedTexture.fill(style()->polyStyle().paintedColor()); + QColor fillColor = style()->polyStyle().paintedColor(); + fillColor.setAlpha(fillColor.alpha() * 0.25); + m_cachedTexture.fill(fillColor); QPainter imagePainter(&m_cachedTexture ); imagePainter.drawImage(0, 0, textureImage); } @@ -596,6 +599,18 @@ } } + GeoDataFeature::GeoDataVisualCategory const cat = feature()->visualCategory(); + if ((cat >= GeoDataFeature::LeisureGolfCourse && cat <= GeoDataFeature::LanduseVineyard) + ||cat == GeoDataFeature::Building + ||(cat >= GeoDataFeature::NaturalWater && cat <= GeoDataFeature::NaturalHeath) + ||(cat >= GeoDataFeature::HighwaySteps && cat <= GeoDataFeature::HighwayMotorway)) { + QBrush brush = painter->brush(); + QColor color = brush.color(); + color.setAlpha(color.alpha()*0.25); + brush.setColor(color); + painter->setBrush(brush); + } + return currentPen; }