summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-09-11 18:58:40 (GMT)
committerBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-09-11 18:58:40 (GMT)
commita2b74101acf6e89ece07830952938eed9751189d (patch)
treea96b5b12b244e8ca8e50db11216dc73722f22637
parentdf9b850576a0d4b72b533ca4d6c454ca500a0758 (diff)
probably bring back photo rendering
-rw-r--r--src/lib/marble/StyleBuilder.cpp2
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index fb11ef4..247ae42 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -1557,6 +1557,8 @@ QStringList StyleBuilder::renderOrder() const
paintLayerOrder << QStringLiteral("Polygon/Building/frame");
paintLayerOrder << QStringLiteral("Polygon/Building/roof");
+ paintLayerOrder << QStringLiteral("Photo");
+
Q_ASSERT(QSet<QString>::fromList(paintLayerOrder).size() == paintLayerOrder.size());
}
diff --git a/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
index 1d3c56a..a74f4b1 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
@@ -25,7 +25,7 @@ GeoPhotoGraphicsItem::GeoPhotoGraphicsItem( const GeoDataFeature *feature )
: GeoGraphicsItem( feature )
{
if (feature) {
- QString const paintLayer = QLatin1String("Photo/") + StyleBuilder::visualCategoryName(feature->visualCategory());
+ QString const paintLayer = QStringLiteral("Photo");
setPaintLayers(QStringList() << paintLayer);
}
}