Add reorder topologies command #3296

LePetitTim · 2022-10-14T15:01:37Z

No description provided.

codecov · 2022-10-14T15:19:30Z

Codecov Report

Base: 98.13% // Head: 98.14% // Increases project coverage by +0.00% 🎉

Coverage data is based on head (18c4f91) compared to base (e8e2fd1).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #3296   +/-   ##
=======================================
  Coverage   98.13%   98.14%           
=======================================
  Files         273      274    +1     
  Lines       19890    19968   +78     
=======================================
+ Hits        19520    19598   +78     
  Misses        370      370

Impacted Files	Coverage Δ
...rek/core/management/commands/reorder_topologies.py	`100.00% <100.00%> (ø)`

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

cypress · 2022-10-14T15:27:22Z

Test summary

24 • 0 • 0 • 0

Run details


Project	Geotrek-admin
Status	Passed
Commit	`70d172e` ℹ️
Started	Nov 2, 2022 6:29 PM
Ended	Nov 2, 2022 6:34 PM
Duration	04:27 💡
OS	Linux Ubuntu - 20.04
Browser	Electron 94

View run in Cypress Dashboard ➡️

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

camillemonchicourt · 2022-10-19T08:19:22Z

Related to #2515

marcantoinedupre · 2022-10-25T14:19:16Z

geotrek/core/tests/test_commands.py

+        1 ⠞           ⠳ 2
+        ⠞               ⠳
+        """
+        self.path_1 = PathFactory.create(geom=LineString(Point(700000, 6600000), Point(700100, 6600100),


Only for your information, since python3.6, you can add '_' in numeric litterals to make them more readable (the '_' characters are ignored when parsing the numeric litterals).
For instance : LineString(Point(700_000, 6_600_000), Point(700_100, 6_600_100))

marcantoinedupre · 2022-10-25T14:22:01Z

geotrek/core/tests/test_commands.py

+        """
+        Part A
+
+        ⠳               🡥


No big deal because it has something to do with my setup : the up arrow character is not displayed neither on Github or PyCharm for me. What did you use?

https://unicode-table.com/fr/1F865/

marcantoinedupre · 2022-10-25T14:23:08Z

geotrek/core/tests/test_commands.py

+
+    def get_geometries(self):
+        geometries = []
+        for pathagg in PathAggregation.objects.all():


For consistency I would filter the queryset with the topology's ID in the same way you do in the tests.

marcantoinedupre · 2022-10-25T14:26:46Z

geotrek/core/tests/test_commands.py

+        call_command('reorder_topologies', stdout=output)
+        self.assertEqual(f'Topologies with errors :\nTREK id: {topo.pk}\n', output.getvalue())
+        geometries = self.get_geometries()
+        self.assertEqual(geometries, [LineString((700045, 6600045), (700050, 6600050), srid=2154),


You have added assertions that test bad values ;) IMHO I would stop the test after asserting the error.

marcantoinedupre

Good job 👍

camillemonchicourt · 2022-11-02T09:48:34Z

docs/changelog.rst

@@ -5,10 +5,14 @@ CHANGELOG
 2.89.1+dev (XXXX-XX-XX)
 -----------------------

+**New features**
+
+- Add new command to reorder pathaggregations of topologies


Can you specify the name of the command, as I am not sure to find its name...
Thanks.

I am adding documentation then is it necessary ?

Chatewgne · 2022-11-02T15:40:02Z

docs/install/import.rst

+                                        [--version] [-v {0,1,2,3}] [--settings SETTINGS] [--pythonpath PYTHONPATH] [--traceback] [--no-color] [--force-color] [--skip-checks]
+                                        point_layer
+
+    Load a layer with point geometries in te structure model


Suggested change

Load a layer with point geometries in te structure model

Load a layer with point geometries in the structure model

Chatewgne · 2022-11-02T15:40:27Z

docs/install/import.rst

+                                 [-v {0,1,2,3}] [--settings SETTINGS] [--pythonpath PYTHONPATH] [--traceback] [--no-color] [--force-color] [--skip-checks]
+                                 point_layer
+
+    Load a layer with point geometries in te structure model


Suggested change

Load a layer with point geometries in te structure model

Load a layer with point geometries in the signage model

Chatewgne · 2022-11-02T15:43:20Z

docs/install/import.rst

+Remove duplicate paths
+----------------------
+
+It can happens during additions of paths with commands or directly in the application to have duplicate paths.


Suggested change

It can happens during additions of paths with commands or directly in the application to have duplicate paths.

Duplicate paths can appear while adding paths with commands or directly in the application.

Chatewgne · 2022-11-02T15:45:04Z

docs/install/import.rst

+----------------------
+
+It can happens during additions of paths with commands or directly in the application to have duplicate paths.
+Duplicate paths can cause some problems of routing for topologies, it can generates topologies representing multilinestring.


Suggested change

Duplicate paths can cause some problems of routing for topologies, it can generates topologies representing multilinestring.

Duplicate paths can cause some problems of routing for topologies, it can generate corrupted topologies (that become MultiLineStrings instead of LineStrings).

Chatewgne · 2022-11-02T15:46:41Z

docs/install/import.rst

+
+You have to run ``sudo geotrek remove_duplicate_paths``
+
+During the process of the command every topologies on a duplicate path will be set on the original path and the duplicate path deleted.


Suggested change

During the process of the command every topologies on a duplicate path will be set on the original path and the duplicate path deleted.

During the process of the command, every topology on a duplicate path will be set on the original path, and the duplicate path will be deleted.

Chatewgne · 2022-11-02T15:53:11Z

docs/install/import.rst

+Reorder topologies
+------------------
+
+Every topologies have informations of which path they pass on and in which order.


Suggested change

Every topologies have informations of which path they pass on and in which order.

All topologies have information about which path they go through on and in which order.

Chatewgne · 2022-11-02T15:53:58Z

docs/install/import.rst

+------------------
+
+Every topologies have informations of which path they pass on and in which order.
+Actually, when an path is split in 2 by an other path, database add a new path.


Suggested change

Actually, when an path is split in 2 by an other path, database add a new path.

Actually, when a path is split in 2 by another path, a new path is added to the database.

Chatewgne · 2022-11-02T15:54:48Z

docs/install/import.rst

+
+Every topologies have informations of which path they pass on and in which order.
+Actually, when an path is split in 2 by an other path, database add a new path.
+We need to add informations for every topologies which need to pass on this new path.


Suggested change

We need to add informations for every topologies which need to pass on this new path.

We need to add information for all topologies that need to go through this new path.

Chatewgne · 2022-11-02T15:57:01Z

docs/install/import.rst

+This is badly managed at the moment, especially for the order of passage of the paths.
+``sudo geotrek reorder_topologies``
+
+It removes a lot of useless information which can accelerate the process of edition of topologies afterward.


Suggested change

It removes a lot of useless information which can accelerate the process of edition of topologies afterward.

It removes a lot of useless information which can accelerate the process of editing topologies afterward.

Chatewgne · 2022-11-02T15:57:37Z

docs/install/import.rst

+It removes a lot of useless information which can accelerate the process of edition of topologies afterward.
+
+
+During the process of this command, it tries to find a good order of passage on the paths which create


Suggested change

During the process of this command, it tries to find a good order of passage on the paths which create

During the process of this command, it tries to find a good order of passage on the paths which creates

Chatewgne · 2022-11-02T15:59:23Z

docs/install/import.rst

+
+
+During the process of this command, it tries to find a good order of passage on the paths which create
+only one Linestring from the start to the end. It uses the wrong orders as much as possible. This command use the same algorithm to generate one Linestring


Suggested change

only one Linestring from the start to the end. It uses the wrong orders as much as possible. This command use the same algorithm to generate one Linestring

only one Linestring from start to end. It stays as close as possible to the corrupted order. This command uses the same algorithm to generate one Linestring

Chatewgne · 2022-11-02T15:59:48Z

docs/install/import.rst

+
+.. danger::
+    It can happens that this algorithm can't find any solution and will genereate a MultiLineString.
+    This will be display at the end of the reorder


Suggested change

This will be display at the end of the reorder

This will be displayed at the end of the reorder

Chatewgne · 2022-11-02T16:00:44Z

docs/install/import.rst

+-----------------------
+
+
+You can set up automatic commands by creating a file ``/etc/cron.d/geotrek_command`` that contains:


Suggested change

You can set up automatic commands by creating a file ``/etc/cron.d/geotrek_command`` that contains:

You can set up automatic commands by creating a `cron` file under ``/etc/cron.d/geotrek_command`` that contains:

Chatewgne · 2022-11-02T16:05:52Z

docs/install/import.rst

+      --skip-checks         Skip system checks.
+
+.. danger::
+    You can't chose for each choice which set of category you want to unset structures. Every categories of each choice will


Suggested change

You can't chose for each choice which set of category you want to unset structures. Every categories of each choice will

You can't chose for each choice which set of category you want to unset structures, it will happen for all categories

Chatewgne · 2022-11-02T16:06:23Z

docs/install/import.rst

+
+
+Firstly, it creates (or finds) the category without structure associated.
+Secondly, every element with this category get this new category.


Suggested change

Secondly, every element with this category get this new category.

Secondly, every element with this old category gets assigned to this new category.

Chatewgne · 2022-11-02T16:07:17Z

docs/install/import.rst

+    You can't chose for each choice which set of category you want to unset structures. Every categories of each choice will
+
+
+Firstly, it creates (or finds) the category without structure associated.


Suggested change

Firstly, it creates (or finds) the category without structure associated.

Firstly, if a categroy is linked to a structure, it creates the same category but with no structure associated.

Chatewgne · 2022-11-02T16:10:03Z

docs/install/import.rst

+Unset structure on categories
+-----------------------------
+
+If you need to remove some similar categories with different structures you may need to remove the structure of all categories


Pas très clair

Suggested change

If you need to remove some similar categories with different structures you may need to remove the structure of all categories

Use this command if you wish to undo linking categories to structures for some models

LePetitTim force-pushed the add_command_reorder branch 2 times, most recently from de80d9b to aa27b77 Compare October 14, 2022 15:13

LePetitTim mentioned this pull request Oct 24, 2022

Modification non voulue des topologies #2515

Open

marcantoinedupre reviewed Oct 25, 2022

View reviewed changes

marcantoinedupre self-requested a review October 25, 2022 15:27

marcantoinedupre approved these changes Oct 25, 2022

View reviewed changes

LePetitTim force-pushed the add_command_reorder branch from 813e773 to b1cf7d2 Compare November 2, 2022 09:27

camillemonchicourt reviewed Nov 2, 2022

View reviewed changes

LePetitTim added 7 commits November 2, 2022 13:35

Add reorder topologies command

ff25df0

Fix smart makeline returns geometries

b92d105

Modify reorder command, add failed reorder, add tests limits

c4880db

Add topologies geoms tests, add informations reorder

8a6396c

Add consistency with command in tests

aa28eb9

Add changelog

b8da4ce

Add documentation reorder

2be6209

LePetitTim force-pushed the add_command_reorder branch from da6e01f to 2be6209 Compare November 2, 2022 12:39

LePetitTim requested review from marcantoinedupre and a team November 2, 2022 12:39

Chatewgne reviewed Nov 2, 2022

View reviewed changes

LePetitTim mentioned this pull request Nov 2, 2022

Change help text of commands #3316

Closed

Improve documentation

18c4f91

LePetitTim requested a review from Chatewgne November 3, 2022 10:56

LePetitTim merged commit 33c342b into master Nov 3, 2022

LePetitTim deleted the add_command_reorder branch November 3, 2022 11:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add reorder topologies command #3296

Add reorder topologies command #3296

LePetitTim commented Oct 14, 2022

codecov bot commented Oct 14, 2022 •

edited

Loading

cypress bot commented Oct 14, 2022 •

edited

Loading

camillemonchicourt commented Oct 19, 2022

marcantoinedupre Oct 25, 2022 •

edited

Loading

marcantoinedupre Oct 25, 2022

LePetitTim Oct 25, 2022

marcantoinedupre Oct 25, 2022

marcantoinedupre Oct 25, 2022

marcantoinedupre left a comment

camillemonchicourt Nov 2, 2022

LePetitTim Nov 2, 2022

camillemonchicourt Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

Chatewgne Nov 2, 2022

	Load a layer with point geometries in te structure model
	Load a layer with point geometries in the structure model

	It can happens during additions of paths with commands or directly in the application to have duplicate paths.
	Duplicate paths can appear while adding paths with commands or directly in the application.

	Duplicate paths can cause some problems of routing for topologies, it can generates topologies representing multilinestring.
	Duplicate paths can cause some problems of routing for topologies, it can generate corrupted topologies (that become MultiLineStrings instead of LineStrings).


		You have to run ``sudo geotrek remove_duplicate_paths``

		During the process of the command every topologies on a duplicate path will be set on the original path and the duplicate path deleted.

	During the process of the command every topologies on a duplicate path will be set on the original path and the duplicate path deleted.
	During the process of the command, every topology on a duplicate path will be set on the original path, and the duplicate path will be deleted.

	Every topologies have informations of which path they pass on and in which order.
	All topologies have information about which path they go through on and in which order.

	Actually, when an path is split in 2 by an other path, database add a new path.
	Actually, when a path is split in 2 by another path, a new path is added to the database.

	We need to add informations for every topologies which need to pass on this new path.
	We need to add information for all topologies that need to go through this new path.

	It removes a lot of useless information which can accelerate the process of edition of topologies afterward.
	It removes a lot of useless information which can accelerate the process of editing topologies afterward.

		It removes a lot of useless information which can accelerate the process of edition of topologies afterward.


		During the process of this command, it tries to find a good order of passage on the paths which create



		During the process of this command, it tries to find a good order of passage on the paths which create
		only one Linestring from the start to the end. It uses the wrong orders as much as possible. This command use the same algorithm to generate one Linestring

	only one Linestring from the start to the end. It uses the wrong orders as much as possible. This command use the same algorithm to generate one Linestring
	only one Linestring from start to end. It stays as close as possible to the corrupted order. This command uses the same algorithm to generate one Linestring

	This will be display at the end of the reorder
	This will be displayed at the end of the reorder

		-----------------------


		You can set up automatic commands by creating a file ``/etc/cron.d/geotrek_command`` that contains:

	You can't chose for each choice which set of category you want to unset structures. Every categories of each choice will
	You can't chose for each choice which set of category you want to unset structures, it will happen for all categories



		Firstly, it creates (or finds) the category without structure associated.
		Secondly, every element with this category get this new category.

	Secondly, every element with this category get this new category.
	Secondly, every element with this old category gets assigned to this new category.

	Firstly, it creates (or finds) the category without structure associated.
	Firstly, if a categroy is linked to a structure, it creates the same category but with no structure associated.

	If you need to remove some similar categories with different structures you may need to remove the structure of all categories
	Use this command if you wish to undo linking categories to structures for some models

Add reorder topologies command #3296

Add reorder topologies command #3296

Conversation

LePetitTim commented Oct 14, 2022

codecov bot commented Oct 14, 2022 • edited Loading

Codecov Report

cypress bot commented Oct 14, 2022 • edited Loading

Test summary

Run details

camillemonchicourt commented Oct 19, 2022

marcantoinedupre Oct 25, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcantoinedupre left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Oct 14, 2022 •

edited

Loading

cypress bot commented Oct 14, 2022 •

edited

Loading

marcantoinedupre Oct 25, 2022 •

edited

Loading