Merge pull request #28 from nens/improve-handling-multisurfaces

Improve handling multisurfaces

Author: PySjon

.gitignore

@@ -16,3 +16,4 @@ ArcGIS_plugin/bgt_inlooptool/rtree/lib/spatialindex_c-64.dll
 .vscode/settings.json
 .spyproject
 .bak
+plugin/bgtinlooptool/bgtinlooptool.zip

ArcGIS_plugin/bgt_inlooptool/bgt_inlooptool_ArcGIS.py

@@ -383,17 +383,17 @@ def execute(self, parameters, messages):
         tool = BGTInloopToolArcGIS()
         params = tool.getParameterInfo()
 
-        main_path = r"C:\Users\hsc\OneDrive - Tauw Group bv\ArcGIS\Projects\bgt_inlooptool\Vlaardingen"
+        main_path = r"C:\Users\vdi\OneDrive - TAUW Group bv\Werkzaamheden\BGT inlooptool\Testdata"
         # bgt_file
-        params[0].value = os.path.join(main_path, "bug1_bgt.zip")
+        params[0].value = os.path.join(main_path, "bgt.zip")
         # pipe_file
-        params[1].value = os.path.join(main_path, "gwsw_vlaardingen.gpkg")
+        params[1].value = os.path.join(main_path, "getGeoPackage_6376353cadf9d220ccd567eb.gpkg")
         # bag_file
-        params[2].value = os.path.join(main_path, "bag_Vlaardingen.gpkg")
+        params[2].value = None #os.path.join(main_path, "bag_Vlaardingen.gpkg")
         # kolken_file
         params[3].value = None
         # area_file
-        params[4].value = os.path.join(main_path, r"vlaardingen_bug_siebrand.gpkg\main.gebiedsgrens")
+        params[4].value = os.path.join(main_path, r"polyoon_centrum.gdb\Polygoon_centrum")
         # output_location
         params[5].value = os.path.join(main_path, "output.gpkg")
 

ArcGIS_plugin/bgt_inlooptool/cls_general_use.py

@@ -8,15 +8,15 @@ def __init__(self, logPrint=False, debug=False):
         logPrint = False voor logging zonder print functie"""
         import time
 
-        self.startTime = time.clock()
+        self.startTime = time.perf_counter()
         self.logPrint = logPrint
         self.debug = debug
 
     def StartAnalyse(self):
         """Reinitialise internal clock"""
         import time
 
-        self.startTime = time.clock()
+        self.startTime = time.perf_counter()
 
     def Traceback(self):
         """ "Returns error messages in ArcPy object and prints them."""
@@ -52,7 +52,7 @@ def AddTimeMessage(self, strMessage, urg=0):
 
         strTime = (
             "Elapsed time from start "
-            + str(round(time.clock() - self.startTime))
+            + str(round(time.perf_counter()- self.startTime))
             + " seconds on "
             + time.strftime("%H:%M:%S")
             + "."

ArcGIS_plugin/bgt_inlooptool/core/inlooptool.py

@@ -1,19 +1,22 @@
 # System imports
 import os
 import sys
-from pathlib import Path
 
 # Third-party imports
 from osgeo import osr
 from osgeo import gdal
 from osgeo import ogr
 from datetime import datetime
 
-# Rtree installation
+# Rtree should be installed by the plugin for QGIS
+# For ArcGIS Pro the following is needed
+import sys
+from pathlib import Path
 from .rtree_installer import unpack_rtree
+if not str(Path(__file__).parent) in sys.path:  # bgt_inlooptool\\core
+    rtree_path = unpack_rtree()
+    sys.path.append(str(rtree_path))
 
-unpack_rtree()
-sys.path.append(str(Path(__file__).parent.parent))
 import rtree
 
 # Local imports
@@ -744,60 +747,44 @@ def clean_surfaces(self):
         Multipolygons, multisurfaces, curved polygons are forced to polygon.
 
         """
-        for stype in ALL_USED_SURFACE_TYPES:
-            lyr = self.mem_database.GetLayerByName(stype)
-            if (
-                lyr is None
-            ):  # this happens if this particular layer in the bgt input has no features
+        for surface_type in ALL_USED_SURFACE_TYPES:
+            layer = self.mem_database.GetLayerByName(surface_type)
+            if layer is None:  # this happens if this particular layer in the bgt input has no features
                 continue
-            lyr.ResetReading()
+            layer.ResetReading()
             delete_fids = []
-            for f in lyr:
-                geom = f.GetGeometryRef()
+            for feature in layer:
+                geom = feature.GetGeometryRef()
                 geom_type = geom.GetGeometryType()
                 if geom_type == ogr.wkbPolygon:
                     pass
-                elif geom_type == ogr.wkbCurvePolygon:
+                elif geom_type in [ogr.wkbCurvePolygon, ogr.wkbMultiSurface]:
                     # print('Fixing Curve Polygon feature {}'.format(f.GetFID()))
                     geom_linear = geom.GetLinearGeometry()
-                    f.SetGeometry(geom_linear)
-                    lyr.SetFeature(f)
-                elif geom_type in [ogr.wkbMultiSurface, ogr.wkbMultiPolygon]:
-                    # print('Fixing MultiSurface or MultiPolygon feature {}'.format(f.GetFID()))
-                    geom_fixed = ogr.ForceToPolygon(geom)
-                    geom_fixed = geom_fixed.MakeValid()
-                    if geom_fixed.GetGeometryType() == ogr.wkbMultiPolygon:
-                        for subgeom in geom_fixed:
-                            if subgeom.GetGeometryType() == ogr.wkbPolygon:
-                                cf = f.Clone()
-                                cf.SetGeometry(subgeom)
-                                lyr.SetFeature(cf)
-                    else:
-                        f.SetGeometry(geom_fixed)
-                        lyr.SetFeature(f)
-
+                    feature.SetGeometry(geom_linear)
+                    layer.SetFeature(feature)
                 elif geom_type in (
                     ogr.wkbLineString,
                     ogr.wkbCompoundCurve,
                     ogr.wkbCircularString,
                 ):
                     # print('Deleting feature {} because it is a Linestring'.format(f.GetFID()))
-                    delete_fids.append(f.GetFID())
+                    delete_fids.append(feature.GetFID())
                 else:
                     print(
                         "Warning: Fixing feature {fid} in {stype} failed! No procedure defined to clean up geometry "
                         "type {geom_type}. Continuing anyway.".format(
-                            fid=f.GetFID(), stype=stype, geom_type=str(geom_type)
+                            fid=feature.GetFID(), stype=surface_type, geom_type=str(geom_type)
                         )
                     )
                     continue
             for fid in delete_fids:
-                lyr.DeleteFeature(fid)
+                layer.DeleteFeature(fid)
             print(
-                f"cleaned import of {stype} layer has {lyr.GetFeatureCount()} features"
+                f"cleaned import of {surface_type} layer has {layer.GetFeatureCount()} features"
             )
 
-            lyr = None
+            layer = None
 
     def classify_pipes(self, delete=True):
         """Assign pipe type based on GWSW pipe type. Optionally, delete pipes of type INTERNAL_PIPE_TYPE_IGNORE"""

ArcGIS_plugin/bgt_inlooptool/core/parameters.ini

@@ -66,15 +66,13 @@ def get_wheel_filename(
 
 
 def unpack_whl(whl_file, package_name, extract_dir):
-
     package_dir = extract_dir / package_name
     if not package_dir.is_dir():
         with ZipFile(whl_file, "r") as zipObj:
             zipObj.extractall(extract_dir)
 
 
 def unpack_rtree():
-
     plugin_path = Path(__file__).parent.parent
     search_path = Path(__file__).parent / "whls"
     wheel_fn = get_wheel_filename(
@@ -83,5 +81,5 @@ def unpack_rtree():
         python_tag_prefix="cp",
         abi_tag_suffix="m",
     )
-
     unpack_whl(wheel_fn, package_name="rtree", extract_dir=plugin_path)
+    return plugin_path

ArcGIS_plugin/bgt_inlooptool/core/rtree_installer.py

@@ -1,19 +1,22 @@
 # System imports
 import os
 import sys
-from pathlib import Path
 
 # Third-party imports
 from osgeo import osr
 from osgeo import gdal
 from osgeo import ogr
 from datetime import datetime
 
-# Rtree installation
+# Rtree should be installed by the plugin for QGIS
+# For ArcGIS Pro the following is needed
+import sys
+from pathlib import Path
 from .rtree_installer import unpack_rtree
+if not str(Path(__file__).parent) in sys.path:  # bgt_inlooptool\\core
+    rtree_path = unpack_rtree()
+    sys.path.append(str(rtree_path))
 
-unpack_rtree()
-sys.path.append(str(Path(__file__).parent.parent))
 import rtree
 
 # Local imports
@@ -744,60 +747,44 @@ def clean_surfaces(self):
         Multipolygons, multisurfaces, curved polygons are forced to polygon.
 
         """
-        for stype in ALL_USED_SURFACE_TYPES:
-            lyr = self.mem_database.GetLayerByName(stype)
-            if (
-                lyr is None
-            ):  # this happens if this particular layer in the bgt input has no features
+        for surface_type in ALL_USED_SURFACE_TYPES:
+            layer = self.mem_database.GetLayerByName(surface_type)
+            if layer is None:  # this happens if this particular layer in the bgt input has no features
                 continue
-            lyr.ResetReading()
+            layer.ResetReading()
             delete_fids = []
-            for f in lyr:
-                geom = f.GetGeometryRef()
+            for feature in layer:
+                geom = feature.GetGeometryRef()
                 geom_type = geom.GetGeometryType()
                 if geom_type == ogr.wkbPolygon:
                     pass
-                elif geom_type == ogr.wkbCurvePolygon:
+                elif geom_type in [ogr.wkbCurvePolygon, ogr.wkbMultiSurface]:
                     # print('Fixing Curve Polygon feature {}'.format(f.GetFID()))
                     geom_linear = geom.GetLinearGeometry()
-                    f.SetGeometry(geom_linear)
-                    lyr.SetFeature(f)
-                elif geom_type in [ogr.wkbMultiSurface, ogr.wkbMultiPolygon]:
-                    # print('Fixing MultiSurface or MultiPolygon feature {}'.format(f.GetFID()))
-                    geom_fixed = ogr.ForceToPolygon(geom)
-                    geom_fixed = geom_fixed.MakeValid()
-                    if geom_fixed.GetGeometryType() == ogr.wkbMultiPolygon:
-                        for subgeom in geom_fixed:
-                            if subgeom.GetGeometryType() == ogr.wkbPolygon:
-                                cf = f.Clone()
-                                cf.SetGeometry(subgeom)
-                                lyr.SetFeature(cf)
-                    else:
-                        f.SetGeometry(geom_fixed)
-                        lyr.SetFeature(f)
-
+                    feature.SetGeometry(geom_linear)
+                    layer.SetFeature(feature)
                 elif geom_type in (
                     ogr.wkbLineString,
                     ogr.wkbCompoundCurve,
                     ogr.wkbCircularString,
                 ):
                     # print('Deleting feature {} because it is a Linestring'.format(f.GetFID()))
-                    delete_fids.append(f.GetFID())
+                    delete_fids.append(feature.GetFID())
                 else:
                     print(
                         "Warning: Fixing feature {fid} in {stype} failed! No procedure defined to clean up geometry "
                         "type {geom_type}. Continuing anyway.".format(
-                            fid=f.GetFID(), stype=stype, geom_type=str(geom_type)
+                            fid=feature.GetFID(), stype=surface_type, geom_type=str(geom_type)
                         )
                     )
                     continue
             for fid in delete_fids:
-                lyr.DeleteFeature(fid)
+                layer.DeleteFeature(fid)
             print(
-                f"cleaned import of {stype} layer has {lyr.GetFeatureCount()} features"
+                f"cleaned import of {surface_type} layer has {layer.GetFeatureCount()} features"
             )
 
-            lyr = None
+            layer = None
 
     def classify_pipes(self, delete=True):
         """Assign pipe type based on GWSW pipe type. Optionally, delete pipes of type INTERNAL_PIPE_TYPE_IGNORE"""

core/inlooptool.py

@@ -66,15 +66,13 @@ def get_wheel_filename(
 
 
 def unpack_whl(whl_file, package_name, extract_dir):
-
     package_dir = extract_dir / package_name
     if not package_dir.is_dir():
         with ZipFile(whl_file, "r") as zipObj:
             zipObj.extractall(extract_dir)
 
 
 def unpack_rtree():
-
     plugin_path = Path(__file__).parent.parent
     search_path = Path(__file__).parent / "whls"
     wheel_fn = get_wheel_filename(
@@ -83,5 +81,5 @@ def unpack_rtree():
         python_tag_prefix="cp",
         abi_tag_suffix="m",
     )
-
     unpack_whl(wheel_fn, package_name="rtree", extract_dir=plugin_path)
+    return plugin_path

core/rtree_installer.py

@@ -57,7 +57,6 @@
 from core.inlooptool import *
 from core.constants import *
 from .ogr2qgis import *
-import rtree
 
 MESSAGE_CATEGORY = "BGT Inlooptool"
 BGT_API_URL = "https://api.pdok.nl/lv/bgt/download/v1_0/full/custom"
@@ -226,6 +225,7 @@ def finished(self, result):
                     level=Qgis.Critical,
                 )
             else:
+                print(str(self.exception))
                 message = "Bepalen afwateringskenmerken BGT mislukt"
                 if isinstance(self.exception, FileInputError):
                     message += ": " + str(self.exception)
@@ -275,40 +275,15 @@ def __init__(self, iface):
 
         # initialize plugin directory
         self.plugin_dir = os.path.dirname(__file__)
-        # initialize locale
-        locale = QSettings().value("locale/userLocale")[0:2]
-        locale_path = os.path.join(
-            self.plugin_dir, "i18n", "BGTInloopTool_{}.qm".format(locale)
-        )
-
-        if os.path.exists(locale_path):
-            self.translator = QTranslator()
-            self.translator.load(locale_path)
-            QCoreApplication.installTranslator(self.translator)
 
         # Declare instance attributes
         self.actions = []
-        self.menu = self.tr("&BGT Inlooptool")
+        self.menu = "&BGT Inlooptool"
 
         # Check if plugin was started the first time in current QGIS session
         # Must be set in initGui() to survive plugin reloads
         self.first_start = None
 
-    # noinspection PyMethodMayBeStatic
-    def tr(self, message):
-        """Get the translation for a string using Qt translation API.
-
-        We implement this ourselves since we do not inherit QObject.
-
-        :param message: String for translation.
-        :type message: str, QString
-
-        :returns: Translated version of message.
-        :rtype: QString
-        """
-        # noinspection PyTypeChecker,PyArgumentList,PyCallByClass
-        return QCoreApplication.translate("BGTInloopTool", message)
-
     def add_action(
         self,
         icon_path,
@@ -388,7 +363,7 @@ def initGui(self):
         icon_path = ":/plugins/BGTInloopTool/icon.png"
         self.add_action(
             icon_path,
-            text=self.tr("BGT Inlooptool"),
+            text="BGT Inlooptool",
             callback=self.run,
             parent=self.iface.mainWindow(),
         )
@@ -399,7 +374,7 @@ def initGui(self):
     def unload(self):
         """Removes the plugin menu item and icon from QGIS GUI."""
         for action in self.actions:
-            self.iface.removePluginMenu(self.tr("&BGT Inlooptool"), action)
+            self.iface.removePluginMenu("&BGT Inlooptool", action)
             self.iface.removeToolBarIcon(action)
 
     def validate_extent_layer(self, extent_layer):