Skip to content

Commit 16d2aac

Browse files
committed
Ruff-format fixes
1 parent d118d03 commit 16d2aac

File tree

4 files changed

+17
-20
lines changed

4 files changed

+17
-20
lines changed

arho_feature_template/core/create_land_use_plan.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from qgis.PyQt.QtGui import QStandardItemModel
33
from qgis.utils import iface
44

5-
from .feature_template_library import TemplateGeometryDigitizeMapTool
5+
from arho_feature_template.core.feature_template_library import TemplateGeometryDigitizeMapTool
66

77

88
class LandUsePlanTemplater:
@@ -21,24 +21,19 @@ def start_digitizing_for_layer(self, layer: QgsVectorLayer):
2121

2222
def create_feature(self, feature):
2323
"""Creates a new feature using stored dialog attributes."""
24-
print("create_feature called with feature:", feature)
2524

2625
if not self.plan_id or not self.plan_name or not self.plan_type:
27-
print("Plan information not available")
2826
return
2927

3028
layer = self.digitize_map_tool.layer()
3129

3230
if not layer:
33-
print("Layer is not set for digitizing.")
3431
return
3532

36-
print("Layer found:", layer.name(), "Editable:", layer.isEditable())
3733
new_feature = QgsFeature(layer.fields())
3834

3935
geometry = feature.geometry()
4036
if not isinstance(geometry, QgsGeometry):
41-
print("Expected geometry to be of type QgsGeometry, got:", type(geometry))
4237
return
4338

4439
new_feature.setGeometry(geometry)
@@ -58,8 +53,5 @@ def create_feature(self, feature):
5853
layer.startEditing()
5954

6055
layer.beginEditCommand("Create land use plan feature.")
61-
if layer.addFeature(new_feature):
62-
print(f"Feature with ID {self.plan_id}, name {self.plan_name}, and type {plan_type_value} created successfully.")
63-
else:
64-
print("Failed to add feature to the layer.")
56+
layer.addFeature(new_feature)
6557
layer.commitChanges()

arho_feature_template/core/update_plan.py

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from dataclasses import dataclass
2-
from typing import List
32

43
from qgis.core import QgsMapLayer, QgsProject, QgsVectorLayer
4+
from qgis.utils import iface
55

66

77
# To be extended and moved
@@ -10,18 +10,21 @@ class LandUsePlan:
1010
id: str
1111
name: str
1212

13+
1314
# To be replaced later
1415
LAYER_PLAN_ID_MAP = {
1516
"land_use_plan": "id",
1617
"land_use_area": "plan_id",
1718
"Osa-alue": "plan_id",
1819
}
1920

21+
2022
def update_selected_plan(new_plan: LandUsePlan):
2123
"""Update the project layers based on the selected land use plan."""
22-
id = new_plan.id
24+
plan_id = new_plan.id
2325
for layer_name, field_name in LAYER_PLAN_ID_MAP.items():
24-
set_filter_for_vector_layer(layer_name, field_name, id)
26+
set_filter_for_vector_layer(layer_name, field_name, plan_id)
27+
2528

2629
def set_filter_for_vector_layer(layer_name: str, field_name: str, field_value: str):
2730
# Get layer and perform checks
@@ -36,18 +39,20 @@ def set_filter_for_vector_layer(layer_name: str, field_name: str, field_value: s
3639
query = f"{field_name} = {field_value}"
3740
if not layer.setSubsetString(query):
3841
# TODO: Convert to log msg?
39-
print(f"ERROR: Failed to filter layer {layer_name} with query {query}")
42+
iface.messageBar().pushMessage("Error", f"Failed to filter layer {layer_name} with query {query}", level=3)
43+
4044

4145
def _check_layer_count(layers: list) -> bool:
4246
"""Check if any layers are returned."""
4347
if not layers:
44-
print("ERROR: No layers found with the specified name.")
48+
iface.messageBar().pushMessage("Error", "ERROR: No layers found with the specified name.", level=3)
4549
return False
4650
return True
4751

52+
4853
def _check_vector_layer(layer: QgsMapLayer) -> bool:
4954
"""Check if the given layer is a vector layer."""
5055
if not isinstance(layer, QgsVectorLayer):
51-
print(f"ERROR: Layer {layer.name()} is not a vector layer: {type(layer)}")
56+
iface.messageBar().pushMessage("Error", f"Layer {layer.name()} is not a vector layer: {type(layer)}", level=3)
5257
return False
5358
return True

arho_feature_template/gui/new_land_use_plan_form.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ def __init__(self, parent=None):
1717

1818
self.plan_widgets = defaultdict(dict)
1919

20-
self.plan_widgets['id'] = self.lineEdit_plan_id
21-
self.plan_widgets['name'] = self.lineEdit_plan_name
22-
self.plan_widgets['type'] = self.comboBox_plan_type
20+
self.plan_widgets["id"] = self.lineEdit_plan_id
21+
self.plan_widgets["name"] = self.lineEdit_plan_name
22+
self.plan_widgets["type"] = self.comboBox_plan_type
2323

2424
@property
2525
def plan_id(self):

arho_feature_template/gui/new_land_use_plan_form.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@
104104
<slot>reject()</slot>
105105
</connection>
106106
</connections>
107-
</ui>
107+
</ui>

0 commit comments

Comments
 (0)