added remove funtion

QuantStack · Aug 7, 2024 · 9c643ca · 9c643ca
1 parent bb8679e
commit 9c643ca
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 14 deletions.
diff --git a/examples/RasterLayer.ipynb b/examples/RasterLayer.ipynb
@@ -13,7 +13,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from ipyopenlayers import Map, RasterTileLayer,SplitMapControl"
+    "from ipyopenlayers import Map, RasterTileLayer,SplitMapControl, ZoomSlider"
    ]
   },
   {
@@ -38,7 +38,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "0711a71bef6046faa26be5e90a5eb534",
+       "model_id": "118567532fa24b9bbfe23392434a10ff",
        "version_major": 2,
        "version_minor": 0
       },
@@ -92,7 +92,42 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 9,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "zoom=ZoomSlider()\n",
+    "m.add_control(zoom)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 10,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "118567532fa24b9bbfe23392434a10ff",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "Map(center=[0.0, 0.0], layers=[RasterTileLayer()], zoom=3.1446582428318823)"
+      ]
+     },
+     "execution_count": 10,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "m.remove(zoom)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 11,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -101,7 +136,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -110,16 +145,32 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 14,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "118567532fa24b9bbfe23392434a10ff",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "Map(center=[0.0, 0.0], layers=[RasterTileLayer()], zoom=3.1446582428318823)"
+      ]
+     },
+     "execution_count": 14,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
-    "m.remove_control(split)"
+    "m.remove(split)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -128,7 +179,7 @@
        "[]"
       ]
      },
-     "execution_count": 10,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }

diff --git a/ipyopenlayers/openlayers.py b/ipyopenlayers/openlayers.py
@@ -166,8 +166,31 @@ def add_control(self, control):
 
     def remove_control(self, control):
         self.controls = [x for x in self.controls if x != control]
-
 
+
+    def remove(self, item):
+        """Remove an item from the map : either a layer or a control.
+
+        Parameters
+        ----------
+        item: Layer or Control instance
+            The layer or control to remove.
+        """
+        if isinstance(item, Layer):
+            self.layers = tuple(
+                [layer for layer in self.layers if layer.model_id != item.model_id]
+            )
+
+        elif isinstance(item, BaseControl):
+            self.controls = tuple(
+                [
+                    control
+                    for control in self.controls
+                    if control.model_id != item.model_id
+                ]
+            )
+        return self
+
     def clear_layers(self):
         self.layers = []
 

diff --git a/src/splitcontrol.ts b/src/splitcontrol.ts
@@ -62,7 +62,9 @@ export default class SplitMapControl extends Control {
         const bottomLeft = getRenderPixel(event, [0, mapSize[1]]);
         const topRight = getRenderPixel(event, [mapSize[0], 0]);
 
-        const width = Math.round((topRight[0] - bottomLeft[0]) * (this._swipe_position / 100));
+        const width = Math.round(
+          (topRight[0] - bottomLeft[0]) * (this._swipe_position / 100),
+        );
         const height = topRight[1] - bottomLeft[1];
 
         gl.scissor(bottomLeft[0], bottomLeft[1], width, height);

diff --git a/src/splitmapcontrol.ts b/src/splitmapcontrol.ts
@@ -49,7 +49,9 @@ export class SplitMapControlView extends BaseControlView {
     this.map_view = this.options.map_view;
     this.map_view.layer_views = this.options.map_view.layerViews;
     if (this.map_view && !this.map_view.layerViews) {
-      console.warn('Layer views is not initialized. Ensure it is properly set.');
+      console.warn(
+        'Layer views is not initialized. Ensure it is properly set.',
+      );
     }
   }
 

diff --git a/src/widget.ts b/src/widget.ts
@@ -35,7 +35,6 @@ export * from './vectortilelayer';
 export * from './splitmapcontrol';
 export * from './splitcontrol';
 
-
 const DEFAULT_LOCATION = [0.0, 0.0];
 
 export class MapModel extends DOMWidgetModel {
@@ -192,7 +191,7 @@ export class MapView extends DOMWidgetView {
     this.map.removeControl(child_view.obj);
     child_view.remove();
   }
-  
+
   async addLayerModel(child_model: LayerModel) {
     const view = await this.create_child_view<LayerView>(child_model, {
       map_view: this,