fix unloading the plugin

Author: nmaarnio

arho_feature_template/core/plan_manager.py

@@ -91,8 +91,8 @@ def __init__(self):
         self.new_feature_dock.hide()
 
         # Initialize digitize tools
-        self.digitize_map_tool = PlanDigitizeMapTool(iface.mapCanvas(), iface.cadDockWidget())
-        self.digitize_map_tool.digitizingCompleted.connect(self._plan_geom_digitized)
+        self.plan_digitize_map_tool = PlanDigitizeMapTool(iface.mapCanvas(), iface.cadDockWidget())
+        self.plan_digitize_map_tool.digitizingCompleted.connect(self._plan_geom_digitized)
 
         self.feature_digitize_map_tool = None
         self.initialize_feature_digitize_map_tool()
@@ -103,6 +103,10 @@ def __init__(self):
         )
         self.inspect_plan_feature_tool.edit_feature_requested.connect(self.edit_plan_feature)
 
+        # Initialize lambda service
+        self.lambda_service = LambdaService()
+        self.lambda_service.jsons_received.connect(self.save_plan_jsons)
+
     def toggle_identify_plan_features(self, activate: bool):  # noqa: FBT001
         if activate:
             self.previous_map_tool = iface.mapCanvas().mapTool()
@@ -152,8 +156,8 @@ def add_new_plan(self):
         self.set_active_plan(None)
 
         plan_layer.startEditing()
-        self.digitize_map_tool.setLayer(plan_layer)
-        iface.mapCanvas().setMapTool(self.digitize_map_tool)
+        self.plan_digitize_map_tool.setLayer(plan_layer)
+        iface.mapCanvas().setMapTool(self.plan_digitize_map_tool)
 
     def edit_plan(self):
         plan_layer = PlanLayer.get_from_project()
@@ -306,8 +310,6 @@ def get_plan_json(self):
                 QMessageBox.critical(None, "Virhe", "Ei aktiivista kaavaa.")
                 return
 
-            self.lambda_service = LambdaService()
-            self.lambda_service.jsons_received.connect(self.save_plan_jsons)
             self.lambda_service.serialize_plan(plan_id)
 
     def save_plan_jsons(self, plan_json, outline_json):
@@ -342,6 +344,30 @@ def create_new_regulation_group(self):
             else:
                 save_regulation_group(new_regulation_group_form.model)
 
+    def unload(self):
+        # Lambda service
+        self.lambda_service.jsons_received.disconnect(self.save_plan_jsons)
+        self.lambda_service.deleteLater()
+
+        # Feature digitize tool
+        if self.feature_digitize_map_tool:
+            self.feature_digitize_map_tool.digitizingCompleted.disconnect()
+            self.feature_digitize_map_tool.digitizingFinished.disconnect()
+            self.feature_digitize_map_tool.deleteLater()
+
+        # Plan digitize tool
+        self.plan_digitize_map_tool.digitizingCompleted.disconnect(self._plan_geom_digitized)
+        self.plan_digitize_map_tool.deleteLater()
+
+        # Inspect plan feature tool
+        self.inspect_plan_feature_tool.edit_feature_requested.disconnect(self.edit_plan_feature)
+        self.inspect_plan_feature_tool.deleteLater()
+
+        # New feature dock
+        self.new_feature_dock.tool_activated.disconnect(self.add_new_plan_feature)
+        iface.removeDockWidget(self.new_feature_dock)
+        self.new_feature_dock.deleteLater()
+
 
 def regulation_group_library_from_active_plan() -> RegulationGroupLibrary:
     category_features = list(PlanRegulationGroupTypeLayer.get_features())

arho_feature_template/plugin.py

@@ -134,7 +134,7 @@ def initGui(self) -> None:  # noqa N802
 
         self.plan_manager.new_feature_dock.visibilityChanged.connect(self.dock_visibility_changed)
 
-        iface.mapCanvas().mapToolSet.connect(self.plan_manager.digitize_map_tool.deactivate)
+        iface.mapCanvas().mapToolSet.connect(self.plan_manager.plan_digitize_map_tool.deactivate)
 
         self.validation_dock = ValidationDock()
         iface.addDockWidget(Qt.RightDockWidgetArea, self.validation_dock)
@@ -248,14 +248,30 @@ def open_settings(self):
 
     def unload(self) -> None:
         """Removes the plugin menu item and icon from QGIS GUI."""
+        # Handle signals
+        self.plan_manager.new_feature_dock.visibilityChanged.disconnect()
+        iface.mapCanvas().mapToolSet.disconnect()
+
+        # Handle actions
         for action in self.actions:
             iface.removePluginMenu(Plugin.name, action)
             iface.removeToolBarIcon(action)
+            action.deleteLater()
+        self.actions.clear()
+
+        # Handle toolbar
         iface.mainWindow().removeToolBar(self.toolbar)
-        teardown_logger(Plugin.name)
+        self.toolbar = None
 
-        self.plan_manager.new_feature_dock.close()
-        self.validation_dock.close()
+        # Handle plan manager
+        self.plan_manager.unload()
+
+        # Handle validation dock
+        iface.removeDockWidget(self.validation_dock)
+        self.validation_dock.deleteLater()
+
+        # Handle logger
+        teardown_logger(Plugin.name)
 
     def dock_visibility_changed(self, visible: bool) -> None:  # noqa: FBT001
         self.new_feature_dock_action.setChecked(visible)