11 filter plan layer and related layers with a selected plan

.gitignore

@@ -1,7 +1,162 @@
-arho-feature-template/i18n
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
 venv/
-.venv/
-start_ide.bat
-.vscode
-*/.pytest_cache
-__pycache__
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "arho_feature_template/qgis_plugin_tools"]
-	path = arho_feature_template/qgis_plugin_tools
+[submodule "src/arho_feature_template/qgis_plugin_tools"]
+	path = src/arho_feature_template/qgis_plugin_tools
 	url = https://github.com/GispoCoding/qgis_plugin_tools

README.md

@@ -13,7 +13,7 @@ Create a virtual environment activate it and install needed dependencies with th
 ```console
 python create_qgis_venv.py
 .venv\Scripts\activate # On Linux and macOS run `source .venv\bin\activate`
-pip install -r requirements-dev.txt
+pip install -r requirements-dev.txt -r requirements-test.txt
 ```
 
 For more detailed development instructions see [development](docs/development.md).
@@ -24,17 +24,17 @@ A symbolic link / directory junction should be made to the directory containing
 
 On Windows Command promt
 ```console
-mklink /J %AppData%\QGIS\QGIS3\profiles\default\python\plugins\arho_feature_template .\arho_feature_template
+mklink /J %AppData%\QGIS\QGIS3\profiles\default\python\plugins\arho_feature_template .\src\arho_feature_template
 ```
 
 On Windows PowerShell
 ```console
-New-Item -ItemType SymbolicLink -Path ${env:APPDATA}\QGIS\QGIS3\profiles\default\python\plugins\arho_feature_template -Value ${pwd}\arho_feature_template
+New-Item -ItemType SymbolicLink -Path ${env:APPDATA}\QGIS\QGIS3\profiles\default\python\plugins\arho_feature_template -Value ${pwd}\src\arho_feature_template
 ```
 
 On Linux
 ```console
-ln -s arho_feature_template/ ~/.local/share/QGIS/QGIS3/profiles/default/python/plugins/arho_feature_template
+ln -s src/arho_feature_template/ ~/.local/share/QGIS/QGIS3/profiles/default/python/plugins/arho_feature_template
 ```
 
 After that you should be able to enable the plugin in the QGIS Plugin Manager.

arho-feature-template.code-workspace

@@ -40,7 +40,7 @@
                 },
                 "pathMappings": [
                     {
-                        "localRoot": "${workspaceFolder}/arho_feature_template",
+                        "localRoot": "${workspaceFolder}/src/arho_feature_template",
                         "remoteRoot": "${env:APPDATA}/QGIS/QGIS3/profiles/default/python/plugins/arho_feature_template"
                     }
                 ]

pyproject.toml

@@ -8,6 +8,7 @@ version = "0.1.0"
 requires-python = ">= 3.8"
 
 [tool.setuptools]
+package-dir = {"" = "src"}
 packages = ["arho_feature_template"]
 
 [tool.pytest.ini_options]
@@ -20,12 +21,9 @@ omit = ["arho_feature_template/qgis_plugin_tools/*"]
 [tool.ruff]
 target-version = "py38"
 extend = "ruff_defaults.toml"
-
-
 exclude = ["arho_feature_template/qgis_plugin_tools"]
 
 [tool.ruff.lint]
-
 unfixable = [
     "F401", # unused imports
     "F841", # unused variables
@@ -38,3 +36,8 @@ ignore_errors = true
 [[tool.mypy.overrides]]
 module = ["qgis.*", "osgeo.*"]
 ignore_missing_imports = true
+
+[tool.qgis-plugin-ci]
+plugin_path = "src/arho_feature_template"
+github_organization_slug= "GispoCoding"
+project_slug = "arho-feature-template"

src/arho_feature_template/core/update_plan.py

@@ -0,0 +1,56 @@
+from dataclasses import dataclass
+
+from typing import List
+
+from qgis.core import QgsProject, QgsVectorLayer, QgsMapLayer
+
+
+@dataclass
+class LandUsePlan:
+    id: str
+    name: str
+
+
+LAYER_PLAN_ID_MAP = {
+    "Kaava": "id",
+    "Aluevaraus": "plan_id",
+    "Osa-alue": "plan_id",
+}
+
+
+def update_selected_plan(new_plan: LandUsePlan):
+    id = new_plan.id
+    for layer_name, field_name in LAYER_PLAN_ID_MAP.items():
+        set_filter_for_layer(layer_name, field_name, id)
+
+
+def set_filter_for_layer(layer_name: str, field_name: str, field_value: str):
+    # Get layer and perform checks
+    layers = QgsProject.instance().mapLayersByName(layer_name)
+    if not _check_layer_count(layers):
+        return
+    layer = layers[0]
+    if not _check_vector_layer(layer):
+        return
+
+    # Perform the filtering
+    query = f"{field_name} = {field_value}"
+    if not layer.setSubsetString(query):
+        # TODO: Convert to log msg?
+        print(f"ERROR: Failed to filter layer {layer_name} with query {query}")
+
+
+def _check_layer_count(layers: List[QgsMapLayer]) -> bool:
+    if len(layers) > 1:
+        # TODO: Convert to log msg?
+        print(f"ERROR: Found multiple layers ({len(layers)}) with same name ({layers[0].name()}).")
+        return False
+    return True
+
+
+def _check_vector_layer(layer: QgsMapLayer) -> bool:
+    if not isinstance(layer, QgsVectorLayer):
+        # TODO: Convert to log msg?
+        print(f"ERROR: Layer {layer.name()} is not a vector layer: f{type(layer)}")
+        return False
+    return True

arho_feature_template/core/forms/add_feature_form.py → src/arho_feature_template/gui/forms/add_feature_form.py

@@ -1,5 +1,5 @@
 from arho_feature_template.core.feature_template import FeatureTemplate
-from arho_feature_template.core.forms.feature_attribute_form import FeatureAttributeForm
+from arho_feature_template.gui.forms.feature_attribute_form import FeatureAttributeForm
 
 
 class AddFeatureForm(FeatureAttributeForm):

arho_feature_template/plugin.py → src/arho_feature_template/plugin.py

@@ -9,7 +9,7 @@
 from qgis.utils import iface
 
 from arho_feature_template.core.feature_template_library import FeatureTemplateLibrary
-from arho_feature_template.core.panels.template_library_panel import TemplateLibraryPanel
+from arho_feature_template.gui.panels.template_library_panel import TemplateLibraryPanel
 from arho_feature_template.qgis_plugin_tools.tools.custom_logging import setup_logger, teardown_logger
 from arho_feature_template.qgis_plugin_tools.tools.i18n import setup_translation
 from arho_feature_template.qgis_plugin_tools.tools.resources import plugin_name, resources_path