style: some refactoring

Author: merydian

ORStools/gui/ORStoolsDialog.py

@@ -441,7 +441,8 @@ def __init__(self, iface: QgisInterface, parent=None) -> None:
 
         # Set things around the custom map tool
         self.line_tool = None
-        self.last_maptool = self._iface.mapCanvas().mapTool()
+        self.canvas = self._iface.mapCanvas()
+        self.last_maptool = self.canvas.mapTool()
         self.annotations = []
         self.rubber_band = None
 
@@ -494,8 +495,6 @@ def __init__(self, iface: QgisInterface, parent=None) -> None:
         self.routing_fromline_list.model().rowsMoved.connect(self._reindex_list_items)
         self.routing_fromline_list.model().rowsRemoved.connect(self._reindex_list_items)
 
-        self.annotation_canvas = self._iface.mapCanvas()
-
         self.moving = None
         self.moved_idxs = 0
         self.error_idxs = 0
@@ -522,7 +521,7 @@ def _save_vertices_to_layer(self) -> None:
 
                 point_layer.dataProvider().addFeature(feature)
             QgsProject.instance().addMapLayer(point_layer)
-            self._iface.mapCanvas().refresh()
+            self.canvas.refresh()
 
         self._iface.messageBar().pushMessage(
             "Success", "Vertices saved to layer.", level=Qgis.MessageLevel.Success
@@ -555,7 +554,7 @@ def _linetool_annotate_point(
         self, point: QgsPointXY, idx: int, crs: Optional[QgsCoordinateReferenceSystem] = None
     ) -> QgsAnnotation:
         if not crs:
-            crs = self._iface.mapCanvas().mapSettings().destinationCrs()
+            crs = self.canvas.mapSettings().destinationCrs()
 
         annotation = QgsTextAnnotation()
 
@@ -570,11 +569,11 @@ def _linetool_annotate_point(
         annotation.setMapPosition(point)
         annotation.setMapPositionCrs(crs)
 
-        return QgsMapCanvasAnnotationItem(annotation, self.annotation_canvas).annotation()
+        return QgsMapCanvasAnnotationItem(annotation, self.canvas).annotation()
 
     def _clear_annotations(self) -> None:
         """Clears annotations"""
-        for annotation_item in self.annotation_canvas.annotationItems():
+        for annotation_item in self.canvas.annotationItems():
             annotation = annotation_item.annotation()
             if annotation in self.project.annotationManager().annotations():
                 self.project.annotationManager().removeAnnotation(annotation)
@@ -587,8 +586,8 @@ def _on_linetool_init(self) -> None:
         self.hide()
         self._clear_annotations()
         self.routing_fromline_list.clear()
-        self.line_tool = maptools.LineTool(self._iface.mapCanvas())
-        self._iface.mapCanvas().setMapTool(self.line_tool)
+        self.line_tool = maptools.LineTool(self.canvas)
+        self.canvas.setMapTool(self.line_tool)
         self.line_tool.pointPressed.connect(lambda point: self._on_movetool_map_press(point))
         self.line_tool.pointReleased.connect(
             lambda point, idx: self._on_movetool_map_release(point, idx)
@@ -597,8 +596,8 @@ def _on_linetool_init(self) -> None:
         self.line_tool.mouseMoved.connect(lambda pos: self.change_cursor_on_hover(pos))
 
     def change_cursor_on_hover(self, pos):
-        idx = self.check_annotation_hover(pos)
-        if idx:
+        hovering = self.check_annotation_hover(pos)
+        if hovering:
             QApplication.setOverrideCursor(Qt.OpenHandCursor)
         else:
             if not self.moving:
@@ -609,13 +608,12 @@ def check_annotation_hover(self, pos):
         dists = {}
         for i, anno in enumerate(self.annotations):
             x, y = anno.mapPosition()
-            mapcanvas = self._iface.mapCanvas()
-            point = mapcanvas.getCoordinateTransform().transform(x, y)  # die ist es
+            point = self.canvas.getCoordinateTransform().transform(x, y)  # die ist es
             p = [point.x(), point.y()]
 
             distance = 0.0
-            for i in range(len(click)):
-                distance += (click[i] - p[i]) ** 2
+            for j in range(len(click)):
+                distance += (click[j] - p[j]) ** 2
             distance = math.sqrt(distance)
 
             if distance > 0:
@@ -625,13 +623,13 @@ def check_annotation_hover(self, pos):
             return idx
 
     def _on_movetool_map_press(self, pos):
-        idx = self.check_annotation_hover(pos)
-        if idx:
+        hovering = self.check_annotation_hover(pos)
+        if hovering:
             self.line_tool.mouseMoved.disconnect()
             QApplication.setOverrideCursor(Qt.ClosedHandCursor)
             if self.rubber_band:
                 self.rubber_band.reset()
-            self.move_i = self.annotations.index(idx)
+            self.move_i = self.annotations.index(hovering)
             self.project.annotationManager().removeAnnotation(self.annotations.pop(self.move_i))
             self.moving = True
 
@@ -640,7 +638,7 @@ def _on_movetool_map_release(self, point, idx):
             try:
                 self.moving = False
                 QApplication.restoreOverrideCursor()
-                crs = self._iface.mapCanvas().mapSettings().destinationCrs()
+                crs = self.canvas.mapSettings().destinationCrs()
 
                 annotation = self._linetool_annotate_point(point, self.move_i, crs=crs)
                 self.annotations.insert(self.move_i, annotation)
@@ -713,9 +711,7 @@ def _on_movetool_map_release(self, point, idx):
 
                     if num < 2:
                         self.routing_fromline_list.clear()
-                        for annotation in self.annotations:
-                            self.project.annotationManager().removeAnnotation(annotation)
-                        self.annotations = []
+                        self._clear_annotations()
                     else:
                         self.routing_fromline_list.takeItem(num)
                         self.create_rubber_band()
@@ -730,7 +726,7 @@ def _on_movetool_map_release(self, point, idx):
     def create_rubber_band(self):
         if self.rubber_band:
             self.rubber_band.reset()
-        self.rubber_band = QgsRubberBand(self._iface.mapCanvas(), QgsWkbTypes.LineGeometry)
+        self.rubber_band = QgsRubberBand(self.canvas, QgsWkbTypes.LineGeometry)
         color = QColor(ROUTE_COLOR)
         color.setAlpha(100)
         self.rubber_band.setStrokeColor(color)
@@ -741,11 +737,12 @@ def create_rubber_band(self):
                 feature = next(route_layer.getFeatures())
                 self.rubber_band.addGeometry(feature.geometry(), route_layer)
                 self.rubber_band.show()
+                print("debug1")
             else:
                 self._clear_annotations()
                 self._on_clear_listwidget_click()
         else:
-            dest_crs = self._iface.mapCanvas().mapSettings().destinationCrs()
+            dest_crs = self.canvas.mapSettings().destinationCrs()
             original_crs = QgsCoordinateReferenceSystem("EPSG:4326")
             transform = QgsCoordinateTransform(original_crs, dest_crs, QgsProject.instance())
             items = [
@@ -764,20 +761,20 @@ def create_rubber_band(self):
 
     def create_vertex(self, point, idx):
         """Adds an item to QgsListWidget and annotates the point in the map canvas"""
-        map_crs = self._iface.mapCanvas().mapSettings().destinationCrs()
+        map_crs = self.canvas.mapSettings().destinationCrs()
 
         transformer = transform.transformToWGS(map_crs)
         point_wgs = transformer.transform(point)
         self.routing_fromline_list.addItem(f"Point {idx}: {point_wgs.x():.6f}, {point_wgs.y():.6f}")
 
-        crs = self._iface.mapCanvas().mapSettings().destinationCrs()
+        crs = self.canvas.mapSettings().destinationCrs()
         annotation = self._linetool_annotate_point(point, idx, crs)
         self.annotations.append(annotation)
         self.project.annotationManager().addAnnotation(annotation)
 
     def _on_linetool_map_click(self, point: QgsPointXY, idx: int) -> None:
         """Adds an item to QgsListWidget and annotates the point in the map canvas"""
-        map_crs = self._iface.mapCanvas().mapSettings().destinationCrs()
+        map_crs = self.canvas.mapSettings().destinationCrs()
 
         transformer = transform.transformToWGS(map_crs)
         point_wgs = transformer.transform(point)
@@ -819,5 +816,5 @@ def _on_line_tool_map_doubleclick(self):
         self.line_tool.doubleClicked.disconnect()
         self.line_tool.pointReleased.disconnect()
         QApplication.restoreOverrideCursor()
-        self._iface.mapCanvas().setMapTool(self.last_maptool)
+        self.canvas.setMapTool(self.last_maptool)
         self.show()