Merge pull request #44072 from qgis/backport-43949-to-release-3_20

[Backport release-3_20] Take tile_buffer parameter into consideration when rendering labels
qgis · Jul 8, 2021 · 0ba3aee · 0ba3aee
2 parents f76f3a1 + 2ca76a6
commit 0ba3aee
Show file tree

Hide file tree

Showing 6 changed files with 1,141 additions and 94 deletions.
diff --git a/src/core/labeling/qgspallabeling.cpp b/src/core/labeling/qgspallabeling.cpp
@@ -456,7 +456,10 @@ bool QgsPalLayerSettings::prepare( QgsRenderContext &context, QSet<QString> &att
   ptOne = xform->toMapCoordinates( 1, 0 );
 
   // rect for clipping
-  extentGeom = QgsGeometry::fromRect( mapSettings.visibleExtent() );
+  QgsRectangle r1 = mapSettings.visibleExtent();
+  r1.grow( mapSettings.extentBuffer() );
+  extentGeom = QgsGeometry::fromRect( r1 );
+
   if ( !qgsDoubleNear( mapSettings.rotation(), 0.0 ) )
   {
     //PAL features are prerotated, so extent also needs to be unrotated

diff --git a/src/core/maprenderer/qgsmaprendererjob.cpp b/src/core/maprenderer/qgsmaprendererjob.cpp
@@ -688,7 +688,11 @@ LabelRenderJob QgsMapRendererJob::prepareLabelingJob( QPainter *painter, QgsLabe
   job.context = QgsRenderContext::fromMapSettings( mSettings );
   job.context.setPainter( painter );
   job.context.setLabelingEngine( labelingEngine2 );
+
+  QgsRectangle r1 = mSettings.visibleExtent();
+  r1.grow( mSettings.extentBuffer() );
   job.context.setExtent( mSettings.visibleExtent() );
+
   job.context.setFeatureFilterProvider( mFeatureFilterProvider );
   QgsCoordinateTransform ct;
   ct.setDestinationCrs( mSettings.destinationCrs() );

diff --git a/tests/src/python/test_qgsserver_wms_getmap.py b/tests/src/python/test_qgsserver_wms_getmap.py
@@ -1768,6 +1768,44 @@ def test_wms_getmap_tile_buffer(self):
         r, h = self._result(self._execute_request(qs))
         self._img_diff_error(r, h, "WMS_GetMap_Tiled_True")
 
+        # Check with labels and tiled=false
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(
+                os.path.join(self.testdata_path, 'wms_tile_buffer.qgs')),
+            "SERVICE": "WMS",
+            "VERSION": "1.3.0",
+            "REQUEST": "GetMap",
+            "BBOX": "310187,6163153,324347,6177313",
+            "CRS": "EPSG:3857",
+            "WIDTH": "512",
+            "HEIGHT": "512",
+            "LAYERS": "wms_tile_buffer_labels",
+            "FORMAT": "image/png",
+            "TILED": "false"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Tiled_Labels_False")
+
+        # Check with labels and tiled=true
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(
+                os.path.join(self.testdata_path, 'wms_tile_buffer.qgs')),
+            "SERVICE": "WMS",
+            "VERSION": "1.3.0",
+            "REQUEST": "GetMap",
+            "BBOX": "310187,6163153,324347,6177313",
+            "CRS": "EPSG:3857",
+            "WIDTH": "512",
+            "HEIGHT": "512",
+            "LAYERS": "wms_tile_buffer_labels",
+            "FORMAT": "image/png",
+            "TILED": "true"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Tiled_Labels_True")
+
     @unittest.skipIf(os.getenv('QGIS_CONTINUOUS_INTEGRATION_RUN'), "This tests fails on GH workflow")
     def test_mode8bit_with_transparency(self):
         # 8 bits

diff --git a/...ges/qgis_server/WMS_GetMap_Tiled_Labels_False/WMS_GetMap_Tiled_Labels_False.png b/...ges/qgis_server/WMS_GetMap_Tiled_Labels_False/WMS_GetMap_Tiled_Labels_False.png
diff --git a/...mages/qgis_server/WMS_GetMap_Tiled_Labels_True/WMS_GetMap_Tiled_Labels_True.png b/...mages/qgis_server/WMS_GetMap_Tiled_Labels_True/WMS_GetMap_Tiled_Labels_True.png