summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-10-09 14:09:37 (GMT)
committerBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-10-09 14:09:40 (GMT)
commitdf10d176d238d70fb40b828257e8d43376811741 (patch)
tree62b8d9508fbd72ec15ec3e287ebd3d49b94c315c
parent5c1022d13a3b68fd3251cf0b57d03087957dc9eb (diff)
avoid adjusting style when it can be done during construction
-rw-r--r--src/lib/marble/StyleBuilder.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 8d0878d..bd0e7be 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -683,6 +683,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataPlacemark::HighwayPath] = createHighwayStyle("#dddde8", "#999999", osmFont, "000000", 0, 1, Qt::DotLine, Qt::SquareCap, true);
m_defaultStyle[GeoDataPlacemark::HighwayTrack] = createHighwayStyle("#996600", QColor(Qt::white), osmFont, "000000", 1, 1, Qt::DashLine, Qt::SquareCap, true);
m_defaultStyle[GeoDataPlacemark::HighwayPedestrian] = createHighwayStyle("#dddde8", "#999999", osmFont, "000000", 0, 2);
+ m_defaultStyle[GeoDataPlacemark::HighwayPedestrian]->polyStyle().setOutline(false);
m_defaultStyle[GeoDataPlacemark::HighwayFootway] = createHighwayStyle("#fa8072", QColor(Qt::white), osmFont, "000000", 0, 2, Qt::DotLine, Qt::SquareCap, true);
m_defaultStyle[GeoDataPlacemark::HighwayCycleway] = createHighwayStyle(QColor(Qt::blue), QColor(Qt::white), osmFont, "000000", 0, 2, Qt::DotLine, Qt::SquareCap, true);
m_defaultStyle[GeoDataPlacemark::HighwayService] = createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 1, 6);
@@ -1279,9 +1280,6 @@ GeoDataStyle::ConstPtr StyleBuilder::createStyle(const StyleParameters &paramete
adjustStyle = true;
}
}
- } else if (visualCategory == GeoDataPlacemark::HighwayPedestrian) {
- polyStyle.setOutline(false);
- adjustStyle = true;
}
if (adjustStyle) {
@@ -1410,9 +1408,6 @@ GeoDataStyle::ConstPtr StyleBuilder::createStyle(const StyleParameters &paramete
adjustStyle = true;
}
}
- } else if (visualCategory == GeoDataPlacemark::HighwayPedestrian) {
- polyStyle.setOutline(false);
- adjustStyle = true;
}
if (adjustStyle) {