Add logics to use the source of the currently selected layer in the _handleDrawGeometryTypeChange method of the MainView class.

Author: HaudinFlorence

packages/base/src/commands.ts

@@ -173,8 +173,6 @@ export function addCommands(
     },
     isEnabled: () => {
       const selectedLayer = getSingleSelectedLayer(tracker);
-      console.log('In Identify, selected Type:', selectedLayer?.type);
-
       if (!selectedLayer) {
         return false;
       }
@@ -887,6 +885,7 @@ export function addCommands(
       if (!selectedLayer) {
         return false;
       }
+
       const canDrawVectorLayer = ['VectorLayer'].includes(selectedLayer.type);
 
       if (
@@ -895,6 +894,12 @@ export function addCommands(
       ) {
         const model = tracker.currentWidget?.content.currentViewModel
           .jGISModel as IJupyterGISModel;
+        const parameters = selectedLayer.parameters;
+        if (parameters) {
+          const selectedvectorLayerSourceId = parameters?.source;
+          model.selectedVectorLayerSourceId = selectedvectorLayerSourceId;
+        }
+
         return model.isDrawVectorLayerEnabled;
       } else {
         return false;

packages/base/src/mainview/mainView.tsx

@@ -2037,19 +2037,31 @@ export class MainView extends React.Component<IProps, IStates> {
       if (this._currentDrawInteraction) {
         this._removeCurrentDrawInteraction();
       }
-      const source = new VectorSource();
+
+      const layers = this._Map.getLayers().getArray();
+      const matchingLayer = layers.find(layer => {
+        const layerSource = layer.get('source');
+        return (
+          layerSource.get('id') === this._model.selectedVectorLayerSourceId
+        );
+      });
+      let source;
+      if (matchingLayer) {
+        source = matchingLayer.get('source');
+      } else {
+        source = new VectorSource();
+      }
       const vectorLayer = new VectorLayer({
-        source: source,
-        style: {
+        source: source
+        /*style: {
           'fill-color': 'rgba(255, 255, 255, 0.2)',
           'stroke-color': '#ffcc33',
           'stroke-width': 2,
           'circle-radius': 7,
           'circle-fill-color': '#ffcc33'
-        }
+        }*/
       });
       this._Map.addLayer(vectorLayer);
-      console.log('vector layer:', vectorLayer.getSource()?.getFeatures());
       const modify = new Modify({ source: source });
       this._Map.addInteraction(modify);
       const draw = new Draw({

packages/schema/src/interfaces.ts

@@ -235,6 +235,7 @@ export interface IJupyterGISModel extends DocumentRegistry.IModel {
   disposed: ISignal<any, void>;
   isDrawVectorLayerEnabled: boolean;
   updateIsDrawVectorLayerEnabled(): void;
+  selectedVectorLayerSourceId: string;
 }
 
 export interface IUserData {

packages/schema/src/model.ts

@@ -735,7 +735,6 @@ export class JupyterGISModel implements IJupyterGISModel {
 
   updateIsDrawVectorLayerEnabled() {
     this.drawVectorLayerChanged.emit(this.isDrawVectorLayerEnabled);
-    console.log('Signal emitted');
   }
 
   get geolocation(): JgisCoordinates {
@@ -792,6 +791,7 @@ export class JupyterGISModel implements IJupyterGISModel {
 
   public isDrawVectorLayerEnabled: boolean;
   public drawVectorLayerChanged = new Signal<this, boolean>(this);
+  public selectedVectorLayerSourceId = '';
 }
 
 export namespace JupyterGISModel {