Remove select interaction used to modify drawn features.

Author: HaudinFlorence

packages/base/src/mainview/mainView.tsx

@@ -94,8 +94,6 @@ import CollaboratorPointers, { ClientPointer } from './CollaboratorPointers';
 import { FollowIndicator } from './FollowIndicator';
 import TemporalSlider from './TemporalSlider';
 import { MainViewModel } from './mainviewmodel';
-//import Modify from 'ol/interaction/Modify.js';
-//import Snap from 'ol/interaction/Snap.js';
 
 
 const drawGeometries = ['Point', 'LineString', 'Polygon'];
@@ -409,18 +407,6 @@ export class MainView extends React.Component<IProps, IStates> {
         },
       }));
 
-      /* generate select, modify and snap interactions for features of layers already added to the Map */
-      this._select = new Select();
-      this._modify = new Modify({
-        features: this._select.getFeatures(),
-      });
-
-      this._Map.addInteraction(this._select);
-      this._Map.addInteraction(this._modify);
-
-      this._select.setActive(true);
-      this._modify.setActive(true);
-
       /* Track changes of selected layers 
       Get the vector source of the selected layer
       Edit the vector layer*/
@@ -2129,7 +2115,7 @@ export class MainView extends React.Component<IProps, IStates> {
     }));
   };
 
-  _getDrawSourceFromSelectedLayer = () => {
+  _setDrawSourceFromSelectedLayer = () => {
     const selectedLayers =
       this._model?.sharedModel.awareness.getLocalState()?.selected?.value;
     if (!selectedLayers) {
@@ -2190,9 +2176,6 @@ export class MainView extends React.Component<IProps, IStates> {
     if (this._draw) {
       this._removeDrawInteraction();
     }
-    if (this._select) {
-      this._removeSelectInteraction();
-    }
     if (this._modify) {
       this._removeModifyInteraction();
     }
@@ -2204,25 +2187,22 @@ export class MainView extends React.Component<IProps, IStates> {
       type: this._currentDrawGeometry,
       source: this._currentVectorSource,
     });
-    this._select = new Select();
     this._modify = new Modify({
-      features: this._select.getFeatures(),
+      source: this._currentVectorSource,
     });
     this._snap = new Snap({
       source: this._currentVectorSource,
     });
     this._Map.addInteraction(this._draw);
-    this._Map.addInteraction(this._select);
     this._Map.addInteraction(this._modify);
     this._Map.addInteraction(this._snap);
     this._draw.setActive(true);
-    this._select.setActive(false);
-    this._modify.setActive(false);
+    this._modify.setActive(true);
     this._snap.setActive(true);
   };
 
   _editVectorLayer = () => {
-    this._getDrawSourceFromSelectedLayer();
+    this._setDrawSourceFromSelectedLayer();
     if (this._currentDrawLayerID) {
       this._currentVectorSource = this._getVectorSourceFromLayerID(
         this._currentDrawLayerID,
@@ -2239,11 +2219,6 @@ export class MainView extends React.Component<IProps, IStates> {
     this._Map.removeInteraction(this._draw);
   };
 
-  private _removeSelectInteraction = () => {
-    this._select.setActive(false);
-    this._Map.removeInteraction(this._select);
-  };
-
   private _removeSnapInteraction = () => {
     this._snap.setActive(false);
     this._Map.removeInteraction(this._snap);
@@ -2393,7 +2368,6 @@ export class MainView extends React.Component<IProps, IStates> {
   private _draw: Draw;
   private _snap: Snap;
   private _modify: Modify;
-  private _select: Select;
   private _currentDrawLayerID: string | undefined;
   private _previousDrawLayerID: string | undefined;
   private _currentDrawSource: IJGISSource | undefined;