Use WGS84 crs in bounds, transform if necessary

Author: Joonalai

GemeindescanExporter/core/processing/algorithms.py

@@ -24,7 +24,7 @@
     QgsProcessingException,
     QgsFeatureSink, QgsProcessingParameterVectorLayer,
     QgsVectorLayer, QgsRectangle, QgsProcessingParameterExtent, QgsProcessingParameterString,
-    QgsProcessingParameterBoolean)
+    QgsProcessingParameterBoolean, QgsCoordinateReferenceSystem, QgsCoordinateTransform)
 
 from ..styles2attributes import StylesToAttributes
 from ...qgis_plugin_tools.tools.algorithm_processing import BaseProcessingAlgorithm
@@ -83,15 +83,23 @@ def processAlgorithm(self, parameters: Dict[str, Any], context: QgsProcessingCon
 
         wrkr = StylesToAttributes(source, output_name, feedback, primary_layer=primary_layer)
 
-        extent: QgsRectangle = self.parameterAsExtent(parameters, self.EXTENT, context, crs=source.sourceCrs())
+        extent_crs = QgsCoordinateReferenceSystem('EPSG:4326')
+        extent: QgsRectangle = self.parameterAsExtent(parameters, self.EXTENT, context,
+                                                      crs=extent_crs)
+
+        if extent_crs != source.crs() and extent is not None:
+            transform = QgsCoordinateTransform(extent_crs, source.crs(), context.project())
+            extent_transformed = transform.transformBoundingBox(extent)
+        else:
+            extent_transformed = extent
 
         sink: QgsFeatureSink
         (sink, dest_id) = self.parameterAsSink(parameters, self.OUTPUT, context,
                                                wrkr.fields, source.wkbType(), source.sourceCrs())
         if sink is None:
             raise QgsProcessingException(self.invalidSinkError(parameters, self.OUTPUT))
 
-        wrkr.extract_styles_to_layer(sink, extent)
+        wrkr.extract_styles_to_layer(sink, extent_transformed)
 
         ret_val = {self.OUTPUT: dest_id,
                    self.OUTPUT_LEGEND: wrkr.get_legend(),

GemeindescanExporter/test/test_utils.py

@@ -17,7 +17,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with GemeindescanExporter.  If not, see <https://www.gnu.org/licenses/>.
 import pytest
-from qgis.core import QgsRectangle
+from qgis.core import QgsRectangle, QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsProject
 
 from ..core.utils import extent_to_datapackage_bounds, datapackage_bounds_to_extent
 
@@ -32,6 +32,11 @@ def extent():
     return QgsRectangle(21.54003660, 59.59924232, 31.61838268, 61.02919460)
 
 
+@pytest.fixture
+def extent2():
+    return QgsRectangle(21.55787082699999857, 59.40132140899999769, 27.46496583600000108, 62.1826135000000022)
+
+
 @pytest.fixture
 def rounded_extent():
     return QgsRectangle(21.540037, 59.59924, 31.618383, 61.029195)
@@ -46,3 +51,11 @@ def test_extent_to_datapackage_bounds(extent, bounds):
 def test_datapackage_bounds_to_extent(bounds, rounded_extent):
     extent = datapackage_bounds_to_extent(bounds)
     assert extent == rounded_extent
+
+
+def test_transformations(extent):
+    extent_crs = QgsCoordinateReferenceSystem('EPSG:4326')
+    source_crs = QgsCoordinateReferenceSystem('EPSG:3067')
+    transform = QgsCoordinateTransform(extent_crs, source_crs, QgsProject.instance())
+    extent_transformed = transform.transformBoundingBox(extent)
+    assert not extent_transformed == extent

GemeindescanExporter/ui/dock_widget.py

@@ -23,9 +23,9 @@
 import os
 import tempfile
 import uuid
-from typing import Dict
+from typing import Dict, Optional
 
-from PyQt5.QtCore import pyqtSignal
+from PyQt5.QtCore import pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import QCheckBox, QGridLayout, QPushButton, QWidget, QLineEdit
 from qgis.PyQt import QtWidgets
 from qgis.core import (QgsProcessingContext, QgsVectorLayer, QgsProject,
@@ -62,7 +62,7 @@ def __init__(self, iface: QgisInterface, parent=None):
         self.config = load_config_from_template()
         self.snapshot_template = load_snapshot_template()
         self.writer = DatapackageWriter(self.config)
-        self.extent: QgsRectangle = self.iface.mapCanvas().extent()
+        self.extent: Optional[QgsRectangle] = None
         self.layer_grid: QGridLayout = self.layer_grid
         self.source_grid: QGridLayout = self.source_grid
         self.layer_rows: Dict = {}
@@ -72,7 +72,8 @@ def __init__(self, iface: QgisInterface, parent=None):
 
         self.sb_extent_precision.setValue(
             get_setting(Settings.extent_precision.name, Settings.extent_precision.value, int))
-        self.le_extent.setText(self.extent.toString(self.sb_extent_precision.value()))
+        self.le_extent.setText(
+            self.extent.toString(self.sb_extent_precision.value()) if self.extent is not None else '')
 
         self.btn_add_layer_row.setIcon(QgsApplication.getThemeIcon('/mActionAdd.svg'))
         self.btn_add_layer_row.clicked.connect(lambda _: self._add_layer_row(len(self.layer_rows) + 1))
@@ -259,6 +260,7 @@ def _remove_row(self, row_uuid: str, row_dict: Dict, grid: QGridLayout):
     def on_sb_extent_precision_valueChanged(self, new_val: int):
         set_setting(Settings.extent_precision.name, new_val)
 
+    @pyqtSlot()
     def on_btn_calculate_extent_clicked(self):
         canvas = self.iface.mapCanvas()
         rows = list(self.layer_rows.values())

GemeindescanExporter/ui/extent_dialog.py

@@ -38,7 +38,7 @@ def __init__(self, canvas: QgsMapCanvas, crs: QgsCoordinateReferenceSystem, pare
         extent_gb: QgsExtentGroupBox = self.gb_extent
         extent_gb.setOriginalExtent(canvas.extent(), crs)
         extent_gb.setCurrentExtent(canvas.extent(), crs)
-        extent_gb.setOutputCrs(crs)
+        extent_gb.setOutputCrs(QgsCoordinateReferenceSystem('EPSG:4326'))
         # TODO: fix bug - QGIS crashes when drawing from canvas
         # extent_gb.setMapCanvas(canvas)