feat(geo): manage layers and groups #1697

alecarn · 2024-09-13T16:14:15Z

Breaking changes: This is a major refactor of the way we manage layer in IGO

New class 'LayerController' to manage layers and offer 3 types of layers, 'systemLayers', 'baseLayers', 'treeLayers'. The systemLayers is the drawing layer, measurement layer and other vital layers for the library. Note that a systemLayer can also be found in the treeLayers. The treeLayers is the hierarchical representation for the LayerViewer. The list of treeLayers can also be accessed under the flattened variant. Finally these three types of layers are aggregated to provide a unified list names 'all' which allows to have the 'baseLayers', 'systemLayers' and the flattened list of the 'treeLayers'
The way we access the layers has also changed, we must go through the LayerController

~~- The LayerViewer does not allow to display the baseLayer, the 'excludeBaselayers' is removed~~

alecarn · 2024-09-13T16:35:26Z

Je l'ai identifié comme DRAFT parce qu'on est en mode test de notre côté. Ça serait bien que tu jette un oeil en code review tout de même voir si la structure/design vous convient.

Breaking changes: This is a major refactor of the way we manage layer in IGO - New class 'LayerController' to manage layers and offer 3 types of layers, 'systemLayers', 'baseLayers', 'treeLayers'. The systemLayers is the drawing layer, measurement layer and other vital layers for the library. Note that a systemLayer can also be found in the treeLayers. The treeLayers is the hierarchical representation for the LayerViewer. The list of treeLayers can also be accessed under the flattened variant. Finally these three types of layers are aggregated to provide a unified list names 'all' which allows to have the 'baseLayers', 'systemLayers' and the flattened list of the 'treeLayers' - The way we access the layers has also changed, we must go through the LayerController - The LayerViewer does not allow to display the baseLayer, the 'excludeBaselayers' is removed (cherry picked from commit 5ed250d6ca2b27d904de8d3354c11a981c64bf67) fix: lint fix(geo): remove duplicate layer from all (cherry picked from commit 42e4fa9b739c555f3c0f5b3a098ab14307aaae67) fix(build): circular dependency revert compilationMode to full fix(geo): circular dependencies - refactor Layer/LayerGroup fix(geo): time-filter-list remove BaseLayer fix(geo): layer - project custom action in the bottom panel refactor: change label for group fix(geo): move layer with linkedLayers add system layer in tree fix: any chore: update packages chore: update packages fix: test chore: fix path for build

- fix(geo): find by source id - fix(geo): raise/lower layer

- fix(geo): save expandable

- fix(geo): unhandled layer is added in the system layers

- fix: circular dependencies

(cherry picked from commit 760475bbbbe06b6fd1eadbf98e04cc210cc4e7bd)

(cherry picked from commit 27e87389de78721f5f0f0086bdd0673424967771)

(cherry picked from commit ec30c113e21d742e2a4b8ca38803973e38188f1c)

(cherry picked from commit d12325f64f0877df8d684f30e1e2555eddeca4e3)

(cherry picked from commit e4e7fb570d031c7fb65a6d34fea328c4299edb46)

(cherry picked from commit 1f955f6b2c53f192d87425330665fb3c35409853)

pelord

Globalement, faire le tour pour ne plus conserver aucune mention du map.addLayer ou autre. Gerer tous les cas deprecated. Il me reste certains trucs a valider, dans le geo/...layer donc d'autres commentaires a suivre.

packages/common/drag-drop/src/tree-drag-drop/tree-drag-drop.directive.ts

packages/common/form/src/form-field/form-field-text.component.html

pelord · 2024-11-05T21:25:29Z

packages/common/form/src/shared/form.interfaces.ts

@@ -56,6 +56,7 @@ export interface FormField<T extends FormFieldInputs = FormFieldInputs>
 }

 export interface FormFieldOptions {
+  initialValue?: unknown;


Pas possible de gérer via un observable | async comme dans igo-form?

Notre besoin était différent.

mais justement, le data sert a provider les initialvalues

Faudrait que tu me donnes un exemple parce que moi ça ne fonctionnait pas de mon côté

packages/common/form/src/shared/form.service.ts

projects/demo/src/app/geo/spatial-filter/spatial-filter.component.ts

pelord

Globalement, faire le tour pour ne plus conserver aucune mention du map.addLayer ou autre. Gerer tous les cas deprecated. Il me reste certains trucs a valider, dans le geo/...layer donc d'autres commentaires a suivre.

…ra-geo-ouverte/igo2-lib into feature/layer-group-from-msp

packages/geo/src/lib/geometry/shared/controls/modify.ts

packages/geo/src/lib/layer/shared/layers/linked/linked-layer.utils.ts

(cherry picked from commit 71ca8e8bc569884ec3b5239559c4ea1de370ea5c)

…detection

packages/geo/src/lib/layer/layer-legend-item/layer-legend-item.component.scss

packages/geo/src/lib/layer/layer-list/layer-list.component.ts

packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.service.spec.ts

pelord · 2024-11-08T19:04:35Z

.../lib/layer/layer-unavailable/layer-unavailable-list/layer-unavailable-list.component.spec.ts

@@ -0,0 +1,23 @@
+// import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+// import { TEST_CONFIG } from '../../../../test-config';


packages/geo/src/lib/layer/layer-legend-item/layer-legend-item.component.scss

pelord

voir commentaires.

pelord · 2024-11-13T18:31:47Z

packages/geo/src/lib/layer/shared/layers/layer.interface.ts


-export interface LayerOptions {
+export interface LayerOptions extends BaseLayerOptions {


sémantique, baselayerOption OU base layer option?

C'est le Base class du LayerOptions, donc je dirais le BaseLayerOptions?

ca porte a confusion ;(

LayerBaseOptions ou LayerOptionsBase?

pelord · 2024-11-13T19:03:29Z

packages/geo/src/lib/layer/shared/layers/layer-base.ts

+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  add(parent?: LayerGroupBase, _soft?: boolean): void {


a quoi sert le _soft, aussi pour le remove

Je vais revisiter cette partie, c'est un flag pour le softRemove lorsqu'on déplace un layer dans un groupe... Mais c'est un anti-pattern d'avoir une méthode avec un flag comme ça.

packages/geo/src/lib/map/shared/map.ts

pelord · 2024-11-15T13:48:32Z

packages/geo/src/lib/map/shared/map.abstract.ts

-  abstract lowerLayer(layer: Layer): void;
-  abstract lowerLayers(layers: Layer[]): void;
-  abstract moveLayer(layer: Layer, from: number, to: number): void;
+  /** @deprecated find a way to remove this method. For now we discourage to use it until we find the way to remove it */


pourquoi deprecated?

alecarn requested a review from pelord September 13, 2024 16:14

alecarn self-assigned this Sep 13, 2024

alecarn marked this pull request as draft September 13, 2024 16:15

alecarn force-pushed the feature/layer-group-from-msp branch from fc83bfa to b774742 Compare September 13, 2024 16:34

alecarn force-pushed the feature/layer-group-from-msp branch from 5c8b79d to 9945103 Compare September 13, 2024 20:15

alecarn force-pushed the feature/layer-group-from-msp branch from 9945103 to a765ddb Compare September 13, 2024 20:26

alecarn added 22 commits September 17, 2024 14:43

fix(geo): ignore children when moving a group

c8ca0fc

fix(geo): unavailable layer title

3ec0f39

fix(geo): catalog layer visivility, use displayed

a850801

- fix(geo): find by source id - fix(geo): raise/lower layer

fix(geo): style adjustment

e3266a9

fix(geo): circular dependencies

00e71af

fix(geo): remove undefined from group children

f72c7c0

- fix(geo): save expandable

fix(geo): adjust style and label

5ed44df

fix(demo): test add style preprocessor options for node_modules

ff8aefd

fix(geo): clear selection when leaving the LayerViewer

cc1bd47

chore: update lock file

a646264

fix: adjustement design

965907c

fix(geo): clean LayerController on context change

f2d7a1b

- fix(geo): unhandled layer is added in the system layers

fix(geo): only send to context saveable layer

5195388

fix(geo): add button primary

5af6c7d

- fix: circular dependencies

fix: adjust design and imports

187c054

fix(context): remove null from layers

eca19c6

fix(geo): adjust desktop vs mobile style

0bcf900

fix(common): tree-drag-drop, validate max level

9f16c3f

fix(geo): layer-controller notify only at the end of clear

bf8bf2c

fix(geo): adjust config for layer group

fad3e33

fix: imports

5d8f39d

fix(geo): define datasource early

6b2c818

alecarn added 5 commits October 30, 2024 13:04

fix(geo): replace layer legend without extra padding

8c2fbdd

(cherry picked from commit 760475bbbbe06b6fd1eadbf98e04cc210cc4e7bd)

chore: remove unused code

f78aea2

(cherry picked from commit 27e87389de78721f5f0f0086bdd0673424967771)

fix(geo): layer indentation

f138a32

(cherry picked from commit ec30c113e21d742e2a4b8ca38803973e38188f1c)

fix(geo): directions init and deletion of linked layer

1c2fad4

(cherry picked from commit d12325f64f0877df8d684f30e1e2555eddeca4e3)

fix(geo): remove circular dependency and add check in CI

4e575b5

(cherry picked from commit e4e7fb570d031c7fb65a6d34fea328c4299edb46)

alecarn marked this pull request as ready for review October 30, 2024 18:02

alecarn added 4 commits October 30, 2024 14:05

fix: audit

25eaf32

fix: style

7cb12bf

fix: build

614b5a4

fix(geo): layer notify early the layer added change

27ba536

(cherry picked from commit 1f955f6b2c53f192d87425330665fb3c35409853)

pelord reviewed Nov 6, 2024

View reviewed changes

pelord requested changes Nov 6, 2024

View reviewed changes

alecarn and others added 4 commits November 6, 2024 14:11

fix: code review adjustment

c533933

fix: map service type

e6cadaa

refactor(*): some type definition

366767b

Merge branch 'feature/layer-group-from-msp' of https://github.com/inf…

fda185f

…ra-geo-ouverte/igo2-lib into feature/layer-group-from-msp

pelord reviewed Nov 7, 2024

View reviewed changes

packages/geo/src/lib/geometry/shared/controls/modify.ts Outdated Show resolved Hide resolved

pelord reviewed Nov 7, 2024

View reviewed changes

packages/geo/src/lib/layer/shared/layers/linked/linked-layer.utils.ts Outdated Show resolved Hide resolved

alecarn added 3 commits November 7, 2024 11:42

fix(geo): search-result save datasoutce id and find by sourceId

dcfde83

(cherry picked from commit 71ca8e8bc569884ec3b5239559c4ea1de370ea5c)

fix(geo): linked-layer reword and fix bug

df9dc64

fix(geo): layer-visibility subscribe to visibility change for better …

e1ee741

…detection

pelord reviewed Nov 8, 2024

View reviewed changes

packages/geo/src/lib/layer/layer-legend-item/layer-legend-item.component.scss Show resolved Hide resolved

pelord reviewed Nov 8, 2024

View reviewed changes

packages/geo/src/lib/layer/layer-list/layer-list.component.ts Show resolved Hide resolved

pelord reviewed Nov 8, 2024

View reviewed changes

packages/geo/src/lib/layer/layer-list/layer-list.component.ts Show resolved Hide resolved

pelord reviewed Nov 8, 2024

View reviewed changes

packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.service.spec.ts Show resolved Hide resolved

pelord reviewed Nov 13, 2024

View reviewed changes

pelord requested changes Nov 13, 2024

View reviewed changes

pelord reviewed Nov 13, 2024

View reviewed changes

packages/geo/src/lib/map/shared/map.ts Show resolved Hide resolved

pelord reviewed Nov 15, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(geo): manage layers and groups #1697

feat(geo): manage layers and groups #1697

alecarn commented Sep 13, 2024 •

edited

Loading

alecarn commented Sep 13, 2024

pelord left a comment

pelord Nov 5, 2024

alecarn Nov 6, 2024

pelord Nov 6, 2024

alecarn Nov 6, 2024

pelord left a comment

pelord Nov 8, 2024

pelord left a comment

pelord Nov 13, 2024

alecarn Nov 14, 2024

pelord Nov 14, 2024

alecarn Nov 15, 2024

pelord Nov 13, 2024

alecarn Nov 15, 2024

pelord Nov 15, 2024

		@@ -0,0 +1,23 @@
		// import { ComponentFixture, TestBed } from '@angular/core/testing';

		// import { TEST_CONFIG } from '../../../../test-config';


		export interface LayerOptions {
		export interface LayerOptions extends BaseLayerOptions {

feat(geo): manage layers and groups #1697

Are you sure you want to change the base?

feat(geo): manage layers and groups #1697

Conversation

alecarn commented Sep 13, 2024 • edited Loading

alecarn commented Sep 13, 2024

pelord 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

pelord left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pelord 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

alecarn commented Sep 13, 2024 •

edited

Loading