summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-09-19 19:48:45 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-09-19 19:48:45 (GMT)
commitcbf676abb19a10ecf022e123df7b9c05860be98b (patch)
tree916d4a4cb470bb15e293a9ddbaabcc652a904ecc
parent66b09fb977008844906c332796221e3681b7dc6a (diff)
Replace gray background with blue water background
- fixes water background color for lower level tiles - at the same time breaks background color for medium and high level tiles on landmass that don't have their own background areas, but this will be fixed soon with proper landmass backdrops - darker bathymetry 200 / 4000 fill color to distinguish them from plain water
-rw-r--r--data/maps/earth/vectorosm/vectorosm.dgml2
-rw-r--r--src/lib/marble/StyleBuilder.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/earth/vectorosm/vectorosm.dgml b/data/maps/earth/vectorosm/vectorosm.dgml
index bf2a7c5..128bcda 100644
--- a/data/maps/earth/vectorosm/vectorosm.dgml
+++ b/data/maps/earth/vectorosm/vectorosm.dgml
@@ -22,7 +22,7 @@
<discrete> false </discrete>
</zoom>
</head>
- <map bgcolor="#dadada">
+ <map bgcolor="#b5d0d0">
<canvas/>
<target/>
<layer name="openstreetmap" backend="texture">
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 4eb72b5..aba318d 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -772,7 +772,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataFeature::Landmass] = createWayStyle("#F1EEE8", "#F1EEE8", true, true);
m_defaultStyle[GeoDataFeature::UrbanArea] = createWayStyle("#E6E3DD", "#E6E3DD", true, true);
m_defaultStyle[GeoDataFeature::InternationalDateLine] = createStyle(1.0, 0.0, "#000000", "#000000", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::Bathymetry] = createWayStyle(waterColor, waterColor, true, true);
+ m_defaultStyle[GeoDataFeature::Bathymetry] = createWayStyle("#a5c9c9", "#a5c9c9", true, true);
m_defaultStyle[GeoDataFeature::AdminLevel1] = createStyle(0.0, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
m_defaultStyle[GeoDataFeature::AdminLevel2] = createStyle(2.0, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
@@ -1257,8 +1257,8 @@ GeoDataStyle::ConstPtr StyleBuilder::createStyle(const StyleParameters &paramete
if (tagIter != osmData.tagsEnd()) {
const QString& elevation = tagIter.value();
if (elevation == QLatin1String("4000")) {
- polyStyle.setColor("#a5c9c9");
- lineStyle.setColor("#a5c9c9");
+ polyStyle.setColor("#94c2c2");
+ lineStyle.setColor("#94c2c2");
adjustStyle = true;
}
}