define structure with utils submodule

algs/buildings2sewertAlgorithm.py

@@ -36,7 +36,8 @@
 import qgis.utils
 import processing
 import os
-from .common_functions import checkExtent, z_sampling
+from .utils.check_extent import check_extent
+from .utils.z_sampling import z_sampling
 
 pluginPath = os.path.dirname(__file__)
 
@@ -153,7 +154,7 @@ def processAlgorithm(self, parameters, context, feedback):
         nodes_o = self.parameterAsVectorLayer(parameters, 'MANHOLES', context)
         mde = self.parameterAsRasterLayer(parameters, 'DEM', context)
 
-        if not checkExtent(parcels_o, mde) or not checkExtent(nodes_o, mde):
+        if not check_extent(parcels_o, mde) or not check_extent(nodes_o, mde):
             feedback.reportError("Some of the layers are out of DEM")
             return {}
 

algs/catchmentAreasAlgorithm.py

@@ -36,7 +36,7 @@
 import qgis.utils
 import processing
 import os
-from .common_functions import checkExtent, z_sampling
+from .utils.z_sampling import z_sampling
 
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
 

algs/utils/check_extent.py

@@ -0,0 +1,15 @@
+def check_extent(layer, background):
+    xMaxL = layer.extent().xMaximum()
+    xMinL = layer.extent().xMinimum()
+    yMaxL = layer.extent().yMaximum()
+    yMinL = layer.extent().yMinimum()
+
+    xMaxB = background.extent().xMaximum()
+    xMinB = background.extent().xMinimum()
+    yMaxB = background.extent().yMaximum()
+    yMinB = background.extent().yMinimum()
+
+    if xMaxL > xMaxB or xMinL < xMinB or yMaxL > yMaxB or yMinL < yMinB:
+        return False
+    else:
+        return True

algs/common_functions.py → algs/utils/z_sampling.py

@@ -1,25 +1,5 @@
 from qgis.PyQt.QtCore import *
-from PyQt5.QtGui import QIcon
 from qgis.core import *
-import qgis.utils
-import processing
-
-def checkExtent(layer, background):
-    xMaxL = layer.extent().xMaximum()
-    xMinL = layer.extent().xMinimum()
-    yMaxL = layer.extent().yMaximum()
-    yMinL = layer.extent().yMinimum()
-
-    xMaxB = background.extent().xMaximum()
-    xMinB = background.extent().xMinimum()
-    yMaxB = background.extent().yMaximum()
-    yMinB = background.extent().yMinimum()
-
-    if xMaxL > xMaxB or xMinL < xMinB or yMaxL > yMaxB or yMinL < yMinB:
-        return False
-    else:
-        return True
-
 def z_sampling(points, mde, feedback):
 
     #set the progressbar
@@ -58,4 +38,4 @@ def z_sampling(points, mde, feedback):
 
             #update progressbar
             feedback.setProgress(int(current * total))
-    return mem_layer
+    return mem_layer