Fix/qgis plugin fixes #243

lachlangrose · 2026-01-18T23:53:18Z

Description

📝 Thanks for contributing to map2loop!
Please describe the issue that this pull request addresses and summarize the changes you are implementing.
Include relevant motivation and context, if appropriate.
List any new dependencies that are required for this change.

Fixes #(issue)

Type of change

Documentation update
Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Test improvement

How Has This Been Tested?

Please describe any tests that you ran to verify your changes.
Provide branch name so we can reproduce.

Checklist:

This branch is up-to-date with master
All gh-action checks are passing
I have performed a self-review of my own code
My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have added tests that prove my fix is effective or that my feature works
My tests run with pytest from the map2loop folder
New and existing tests pass locally with my changes

Checklist continued (if PR includes changes to documentation)

I have built the documentation locally with make.bat
I have built this documentation in docker, following the docker configuration in map2loop/docs
I have checked my spelling and grammar

…uired

…contacts

…ontacts

Makes passing handler from qgis to python possible

…lity

Copilot

Pull request overview

This pull request implements fixes and improvements for QGIS plugin integration and general code quality enhancements. The changes focus on improving configurability of column names, adding defensive programming practices, and implementing callable interfaces for key classes.

Changes:

Enhanced column name configurability across sorter classes to support different data schemas
Added __call__ methods to Sampler, Sorter, and ThicknessCalculator for callable interface pattern
Improved handling of empty data and edge cases in thickness calculations and sorting algorithms
Fixed type hints and added explicit import paths

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 12 comments.

Show a summary per file

File	Description
tests/project/test_thickness_calculations.py	Updated import to use explicit module path for Project class
map2loop/utils/utility_functions.py	Enhanced type hints to accept Union types for numeric parameters and added GeometryCollection return type
map2loop/topology.py	Added configurable id_field parameter for fault identification
map2loop/thickness_calculator.py	Improved location_tracking handling for empty data, added LineString import, fixed indentation, added call method, and removed duplicate UNITNAME column before spatial join
map2loop/sorter.py	Added unit_name_column, unitname1_column, and unitname2_column configurability, imported networkx at module level, enhanced length column handling, and added call method
map2loop/sampler.py	Added call method for callable interface
map2loop/project.py	Added automatic configuration of min_age_column and max_age_column for sorters
map2loop/logging.py	Added new setLogging function for flexible logging configuration

Comments suppressed due to low confidence (2)

map2loop/topology.py:50

The new id_field parameter is missing documentation in the docstring. The Args section should be updated to include this parameter and explain its purpose.

        """
        The initialiser for the map2model wrapper

        Args:
            map_data (MapData):
                The project map data structure to reference
            verbose_level (VerboseLevel, optional):
                How much console output is sent. Defaults to VerboseLevel.ALL.
        """

map2loop/logging.py:49

This assignment to 'logger' is unnecessary as it is redefined before this value is used.

logger = getLogger(__name__)

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-19T00:03:16Z

map2loop/sorter.py

-    required_arguments = ['min_age_column','max_age_column']
-    def __init__(self,*, min_age_column:Optional[str]='minAge', max_age_column:Optional[str]='maxAge'):
+    required_arguments = ['min_age_column','max_age_column','unit_name_column']
+    def __init__(self,*, unit_name_column:Optional[str]='name',min_age_column:Optional[str]='minAge', max_age_column:Optional[str]='maxAge'):


Type hint parameter should have spaces around the equals sign for consistency with Python style guidelines. Should be 'unit_name_column: Optional[str] = 'name'' instead of 'unit_name_column:Optional[str]='name''.

Suggested change

def __init__(self,*, unit_name_column:Optional[str]='name',min_age_column:Optional[str]='minAge', max_age_column:Optional[str]='maxAge'):

def __init__(

self,

*,

unit_name_column: Optional[str] = 'name',

min_age_column: Optional[str] = 'minAge',

max_age_column: Optional[str] = 'maxAge',

):

Copilot · 2026-01-19T00:03:16Z

map2loop/sorter.py

        self,
        *,
        contacts: Optional[geopandas.GeoDataFrame] = None,
+        unit_name_column:Optional[str]='name',


Type hint parameter should have spaces around the equals sign for consistency with Python style guidelines. Should be 'unit_name_column: Optional[str] = 'name'' instead of 'unit_name_column:Optional[str]='name''.

map2loop/logging.py

Copilot · 2026-01-19T00:03:17Z

map2loop/utils/utility_functions.py

-    start_point: shapely.geometry.Point, azimuth_deg: float, distance: int, bbox: pandas.DataFrame
-) -> shapely.geometry.LineString:
+    start_point: shapely.geometry.Point, azimuth_deg: Union[float,int], distance: Union[float,int], bbox: pandas.DataFrame
+) -> Union[shapely.geometry.LineString,shapely.geometry.GeometryCollection]:


Type hints should have spaces after commas for consistency with Python style guidelines. Should be 'Union[shapely.geometry.LineString, shapely.geometry.GeometryCollection]' instead of 'Union[shapely.geometry.LineString,shapely.geometry.GeometryCollection]'.

Suggested change

) -> Union[shapely.geometry.LineString,shapely.geometry.GeometryCollection]:

) -> Union[shapely.geometry.LineString, shapely.geometry.GeometryCollection]:

Copilot · 2026-01-19T00:03:17Z

map2loop/sorter.py

        *,
        contacts: Optional[geopandas.GeoDataFrame] = None,
+        unit_name_column:Optional[str]='name',
+        unitname1_column:Optional[str]='UNITNAME_1',


Type hint parameter should have spaces around the equals sign for consistency with Python style guidelines. Should be 'unitname1_column: Optional[str] = 'UNITNAME_1'' instead of 'unitname1_column:Optional[str]='UNITNAME_1''.

Copilot · 2026-01-19T00:03:18Z

map2loop/sorter.py

-    required_arguments = ['min_age_column','max_age_column']
-    def __init__(self,*, min_age_column:Optional[str]='minAge', max_age_column:Optional[str]='maxAge'):
+    required_arguments = ['min_age_column','max_age_column','unit_name_column']
+    def __init__(self,*, unit_name_column:Optional[str]='name',min_age_column:Optional[str]='minAge', max_age_column:Optional[str]='maxAge'):


Parameters should have spaces after commas and around equals signs for consistency with Python style guidelines. Should be 'unit_name_column: Optional[str] = 'name', min_age_column: Optional[str] = 'minAge', max_age_column: Optional[str] = 'maxAge''.

Suggested change

def __init__(self,*, unit_name_column:Optional[str]='name',min_age_column:Optional[str]='minAge', max_age_column:Optional[str]='maxAge'):

def __init__(self, *, unit_name_column: Optional[str] = 'name', min_age_column: Optional[str] = 'minAge', max_age_column: Optional[str] = 'maxAge'):

map2loop/utils/utility_functions.py

Copilot · 2026-01-19T00:03:18Z

map2loop/sorter.py

        df = pandas.DataFrame(0, index=unit_names, columns=unit_names)
        for younger, older in ordered_unit_observations:
            df.loc[younger, older] += 1
+        print(df, df.max())


Debug print statement should be removed before merging to production code.

Copilot · 2026-01-19T00:03:18Z

map2loop/utils/utility_functions.py

+    start_point: shapely.geometry.Point, azimuth_deg: Union[float,int], distance: Union[float,int], bbox: pandas.DataFrame
+) -> Union[shapely.geometry.LineString,shapely.geometry.GeometryCollection]:


Type hints should have spaces after commas for consistency with Python style guidelines. Should be 'Union[float, int]' instead of 'Union[float,int]'.

Suggested change

start_point: shapely.geometry.Point, azimuth_deg: Union[float,int], distance: Union[float,int], bbox: pandas.DataFrame

) -> Union[shapely.geometry.LineString,shapely.geometry.GeometryCollection]:

start_point: shapely.geometry.Point, azimuth_deg: Union[float, int], distance: Union[float, int], bbox: pandas.DataFrame

) -> Union[shapely.geometry.LineString, shapely.geometry.GeometryCollection]:

Copilot · 2026-01-19T00:03:18Z

map2loop/sorter.py

    def __init__(
        self,
        *,
+        unit_name_column:Optional[str]='name',


Type hint parameter should have spaces around the equals sign for consistency with Python style guidelines. Should be 'unit_name_column: Optional[str] = 'name'' instead of 'unit_name_column:Optional[str]='name''.

Suggested change

unit_name_column:Optional[str]='name',

unit_name_column: Optional[str] = 'name',

…to fix/qgis-plugin-fixes

lachlangrose added 15 commits December 2, 2025 10:48

fix: change to no default arguments and add unit_name_column as a req…

65a7b86

…uired

fix: set age based sorter args

5226b49

fix: project import for test

6eb1518

fix: updating requirements for alpha sorter plus add check for empty …

b0f12b6

…contacts

fix: update maximise contacts to compute length and check for empty c…

f2cf211

…ontacts

fix: add option to set logger level and handler.

5fb0720

Makes passing handler from qgis to python possible

fix: updating incorrect type hints

71f473c

fix: adding safeguarding and fixing merge

a675be2

fix: save location tracking as a line geodataframe for qgis compatibi…

17e14ca

…lity

fix: only store geodataframe if layer is not empty

46fade8

fix: updating logic

86b658c

fix: beartype issues

6e2ee69

fix: add ability to specify fault field to topoloy

92f754b

fix: add call methods to allow for generic debug exporting

3c0e0e0

fix: replace args for kwargs

e1cb1e6

lachlangrose requested a review from Copilot January 18, 2026 23:57

Copilot started reviewing on behalf of lachlangrose January 18, 2026 23:58 View session

Enable auto-update for conda in workflow

48711c3

Copilot AI reviewed Jan 19, 2026

View reviewed changes

lachlangrose added 3 commits January 19, 2026 11:08

fix: applying copilot suggestions

4021640

Merge branch 'fix/qgis-plugin-fixes' of github.com:Loop3D/map2loop in…

ec269dd

…to fix/qgis-plugin-fixes

style: formatting

1febaa9

lachlangrose requested a review from rabii-chaarani January 19, 2026 00:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix/qgis plugin fixes #243

Fix/qgis plugin fixes #243

Uh oh!

lachlangrose commented Jan 18, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 19, 2026

Uh oh!

Copilot AI Jan 19, 2026

Uh oh!

Uh oh!

Copilot AI Jan 19, 2026

Uh oh!

Copilot AI Jan 19, 2026

Uh oh!

Copilot AI Jan 19, 2026

Uh oh!

Uh oh!

Copilot AI Jan 19, 2026

Uh oh!

Copilot AI Jan 19, 2026

Uh oh!

Copilot AI Jan 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

-    def __init__(self,*, unit_name_column:Optional[str]='name',min_age_column:Optional[str]='minAge', max_age_column:Optional[str]='maxAge'):
+    def __init__(
+        self,
+        *,
+        unit_name_column: Optional[str] = 'name',
+        min_age_column: Optional[str] = 'minAge',
+        max_age_column: Optional[str] = 'maxAge',
+    ):

	) -> Union[shapely.geometry.LineString,shapely.geometry.GeometryCollection]:
	) -> Union[shapely.geometry.LineString, shapely.geometry.GeometryCollection]:

	def __init__(self,*, unit_name_column:Optional[str]='name',min_age_column:Optional[str]='minAge', max_age_column:Optional[str]='maxAge'):
	def __init__(self, *, unit_name_column: Optional[str] = 'name', min_age_column: Optional[str] = 'minAge', max_age_column: Optional[str] = 'maxAge'):

		start_point: shapely.geometry.Point, azimuth_deg: Union[float,int], distance: Union[float,int], bbox: pandas.DataFrame
		) -> Union[shapely.geometry.LineString,shapely.geometry.GeometryCollection]:

	unit_name_column:Optional[str]='name',
	unit_name_column: Optional[str] = 'name',

Fix/qgis plugin fixes #243

Are you sure you want to change the base?

Fix/qgis plugin fixes #243

Uh oh!

Conversation

lachlangrose commented Jan 18, 2026

Description

Type of change

How Has This Been Tested?

Checklist:

Checklist continued (if PR includes changes to documentation)

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants