Moved calculating image size before png to geotiff conversion.

Moved calculating image size before png to geotiff conversion. Renamed class and file.

Author: Mtk112

arho_feature_template/core/create_geotiff.py arho_feature_template/core/geotiff_creator.py

@@ -18,7 +18,7 @@
 from arho_feature_template.utils.misc_utils import get_active_plan_id, use_wait_cursor
 
 
-class CreateGeoTiff:
+class GeoTiffCreator:
     def __init__(self, desired_pixel_size=0.5):
         """Initialize the CreateGeoTiff class and fetch the required data."""
         self.desired_pixel_size = desired_pixel_size
@@ -71,6 +71,12 @@ def create_geotiff(self, geotiff_path):
             ]
         )
         settings.setBackgroundColor(QColor(255, 255, 255))
+        width = int(buffered_bbox.width() / self.desired_pixel_size) * self.desired_pixel_size
+        height = int(buffered_bbox.height() / self.desired_pixel_size) * self.desired_pixel_size
+        buffered_bbox.setXMinimum(int(buffered_bbox.xMinimum()))
+        buffered_bbox.setYMinimum(int(buffered_bbox.yMinimum()))
+        buffered_bbox.setXMaximum(buffered_bbox.xMinimum() + width)
+        buffered_bbox.setYMaximum(buffered_bbox.yMinimum() + height)
         settings.setExtent(buffered_bbox)
 
         # Calculate image size
@@ -107,24 +113,16 @@ def finished():
         render.finished.connect(finished)
         render.start()
 
-    def _create_geotiff_from_png(self, image_path, geotiff_path, pixels_x, pixels_y, buffered_bbox):
+    def _create_geotiff_from_png(self, image_path, geotiff_path, buffered_bbox):
         """Convert the rendered PNG to GeoTIFF."""
-        transform = [
-            buffered_bbox.xMinimum(),
-            self.desired_pixel_size,
-            0,
-            buffered_bbox.yMaximum(),
-            0,
-            -self.desired_pixel_size,
-        ]
 
         ds = gdal.Open(image_path)
 
         output_bounds = [
-            transform[0],
-            transform[3],
-            transform[0] + pixels_x * transform[1],
-            transform[3] + pixels_y * transform[5],
+            buffered_bbox.xMinimum(),
+            buffered_bbox.yMaximum(),
+            buffered_bbox.xMaximum(),
+            buffered_bbox.yMinimum(),
         ]
 
         # Convert the PNG to GeoTIFF

arho_feature_template/plugin.py

@@ -8,7 +8,7 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QAction, QWidget
 
-from arho_feature_template.core.create_geotiff import CreateGeoTiff
+from arho_feature_template.core.geotiff_creator import GeoTiffCreator
 from arho_feature_template.core.plan_manager import PlanManager
 from arho_feature_template.gui.dialogs.plugin_settings import PluginSettings
 from arho_feature_template.gui.docks.validation_dock import ValidationDock
@@ -292,8 +292,8 @@ def edit_lifecycles(self):
 
     def create_geotiff(self):
         """Create geotiff from currently active plan."""
-        create_geotiff = CreateGeoTiff()
-        create_geotiff.select_output_file()
+        geotiff_creator = GeoTiffCreator()
+        geotiff_creator.select_output_file()
 
     def unload(self) -> None:
         """Removes the plugin menu item and icon from QGIS GUI."""