From b17b93cbd2efe6f0112cf219c75fcd58925cbc54265fd943e5ed2d4f55576820 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 6 Aug 2017 06:44:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=142 --- ...and-political-map-showing-no-content.patch | 109 ------------------ marble.changes | 3 +- marble.spec | 3 - 3 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 Fix-plain-map-and-political-map-showing-no-content.patch diff --git a/Fix-plain-map-and-political-map-showing-no-content.patch b/Fix-plain-map-and-political-map-showing-no-content.patch deleted file mode 100644 index e5cfe5a..0000000 --- a/Fix-plain-map-and-political-map-showing-no-content.patch +++ /dev/null @@ -1,109 +0,0 @@ -From ce6cbb18b1483245ec2e43c84166f68cea60a26b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dennis=20Nienh=C3=BCser?= -Date: Mon, 26 Jun 2017 21:57:53 +0200 -Subject: Fix both plain map and political map showing no content at all - -Both have neither a texture nor a vector tile layer, and hence no -tile zoom level was set anymore in geometry layer after f847505. Now -a default tile zoom level is calculated in such scenarios. - -BUG: 379297 ---- - src/lib/marble/MarbleMap.cpp | 17 ++++++++++------- - src/lib/marble/layers/VectorTileLayer.cpp | 9 ++++++--- - 2 files changed, 16 insertions(+), 10 deletions(-) - -diff --git a/src/lib/marble/MarbleMap.cpp b/src/lib/marble/MarbleMap.cpp -index d41c0f1..d62642a 100644 ---- a/src/lib/marble/MarbleMap.cpp -+++ b/src/lib/marble/MarbleMap.cpp -@@ -22,6 +22,7 @@ - // Qt - #include - #include -+#include - - // Marble - #include "layers/FloatItemsLayer.h" -@@ -209,9 +210,6 @@ MarbleMapPrivate::MarbleMapPrivate( MarbleMap *parent, MarbleModel *model ) : - - QObject::connect( &m_geometryLayer, SIGNAL(repaintNeeded()), - parent, SIGNAL(repaintNeeded())); -- QObject::connect(&m_vectorTileLayer, SIGNAL(tileLevelChanged(int)), &m_geometryLayer, SLOT(setTileLevel(int))); -- QObject::connect(&m_vectorTileLayer, SIGNAL(tileLevelChanged(int)), &m_placemarkLayer, SLOT(setTileLevel(int))); -- QObject::connect(&m_textureLayer, SIGNAL(tileLevelChanged(int)), &m_placemarkLayer, SLOT(setTileLevel(int))); - - /* - * Slot handleHighlight finds all placemarks -@@ -239,9 +236,11 @@ MarbleMapPrivate::MarbleMapPrivate( MarbleMap *parent, MarbleModel *model ) : - parent, SLOT(updateTileLevel()) ); - QObject::connect( &m_vectorTileLayer, SIGNAL(tileLevelChanged(int)), - parent, SLOT(updateTileLevel()) ); -+ QObject::connect( parent, SIGNAL(radiusChanged(int)), -+ parent, SLOT(updateTileLevel()) ); -+ - QObject::connect( &m_textureLayer, SIGNAL(repaintNeeded()), - parent, SIGNAL(repaintNeeded()) ); -- - QObject::connect( parent, SIGNAL(visibleLatLonAltBoxChanged(GeoDataLatLonAltBox)), - parent, SIGNAL(repaintNeeded()) ); - -@@ -466,7 +465,8 @@ int MarbleMap::preferredRadiusFloor( int radius ) - - int MarbleMap::tileZoomLevel() const - { -- return qMax(d->m_textureLayer.tileZoomLevel(), d->m_vectorTileLayer.tileZoomLevel()); -+ auto const tileZoomLevel = qMax(d->m_textureLayer.tileZoomLevel(), d->m_vectorTileLayer.tileZoomLevel()); -+ return tileZoomLevel >= 0 ? tileZoomLevel : qMin(qMax(qLn(d->m_viewport.radius()*4/256)/qLn(2.0), 1), d->m_styleBuilder.maximumZoomLevel()); - } - - -@@ -828,7 +828,10 @@ void MarbleMapPrivate::setDocument( const QString& key ) - - void MarbleMapPrivate::updateTileLevel() - { -- emit q->tileLevelChanged(q->tileZoomLevel()); -+ auto const tileZoomLevel = q->tileZoomLevel(); -+ m_geometryLayer.setTileLevel(tileZoomLevel); -+ m_placemarkLayer.setTileLevel(tileZoomLevel); -+ emit q->tileLevelChanged(tileZoomLevel); - } - - // Used to be paintEvent() -diff --git a/src/lib/marble/layers/VectorTileLayer.cpp b/src/lib/marble/layers/VectorTileLayer.cpp -index 864dddf..505d7a6 100644 ---- a/src/lib/marble/layers/VectorTileLayer.cpp -+++ b/src/lib/marble/layers/VectorTileLayer.cpp -@@ -133,7 +133,7 @@ RenderState VectorTileLayer::renderState() const - - int VectorTileLayer::tileZoomLevel() const - { -- int level = 0; -+ int level = -1; - for (const auto *mapper: d->m_activeTileModels) { - level = qMax(level, mapper->tileZoomLevel()); - } -@@ -163,7 +163,7 @@ bool VectorTileLayer::render(GeoPainter *painter, ViewportParams *viewport, - mapper->setViewport(viewport->viewLatLonAltBox()); - level = qMax(level, mapper->tileZoomLevel()); - } -- if (oldLevel != level) { -+ if (oldLevel != level && level >= 0) { - emit tileLevelChanged(level); - } - -@@ -202,7 +202,10 @@ void VectorTileLayer::setMapTheme(const QVectorupdateLayerSettings(); -- emit tileLevelChanged(tileZoomLevel()); -+ auto const level = tileZoomLevel(); -+ if (level >= 0) { -+ emit tileLevelChanged(level); -+ } - } - - } --- -cgit v0.11.2 - diff --git a/marble.changes b/marble.changes index 8a8361e..f65bc2b 100644 --- a/marble.changes +++ b/marble.changes @@ -4,7 +4,8 @@ Sat Aug 5 18:19:34 UTC 2017 - christophe@krop.fr - Update to KDE Applications 17.07.90 * KDE Applications 17.07.90 * https://www.kde.org/announcements/announce-applications-17.07.90.php - +- Drop Fix-plain-map-and-political-map-showing-no-content.patch + (merged upstream) ------------------------------------------------------------------- Sun Jul 16 08:49:48 CEST 2017 - lbeltrame@kde.org diff --git a/marble.spec b/marble.spec index a327516..2e368ff 100644 --- a/marble.spec +++ b/marble.spec @@ -31,8 +31,6 @@ License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: marble-%{version}.tar.xz -# PATCH-FIX-UPSTREAM Fix-plain-map-and-political-map-showing-no-content.patch kde#379297 -- fix display of the plain map and the political map -Patch1: Fix-plain-map-and-political-map-showing-no-content.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: gpsd-devel @@ -158,7 +156,6 @@ The astronomy library for the satellites plugin. %prep %setup -q -n marble-%{version} -%patch1 -p1 %build export SUSE_ASNEEDED=0