draft swipe position

QuantStack · Jul 31, 2024 · 831b904 · 831b904
1 parent b397127
commit 831b904
Show file tree

Hide file tree

Showing 3 changed files with 228 additions and 16 deletions.
diff --git a/examples/RasterLayer.ipynb b/examples/RasterLayer.ipynb
@@ -9,7 +9,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -18,7 +18,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -30,23 +30,23 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 10,
    "metadata": {
     "scrolled": true
    },
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "bf54f7b270eb4c12ba2fbcaeea2583da",
+       "model_id": "77010bf2973f41d9a93c400f283857bd",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
        "Map(center=[4.299875503991089, 46.85012303279379], zoom=0.0)"
       ]
      },
-     "execution_count": 3,
+     "execution_count": 10,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -65,7 +65,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -74,7 +74,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -83,7 +83,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 26,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -94,6 +94,64 @@
     "m.add_layer(raster) "
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 14,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "f2b5931a98ee4e40b8b23f7e5f3ee8a1",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "IntSlider(value=0, description='Swipe Position:')"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "77010bf2973f41d9a93c400f283857bd",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "Map(center=[4.299875503991089, 46.85012303279379], layers=[RasterTileLayer(), RasterTileLayer(url='https://api…"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
+   "source": [
+    "import ipywidgets as widgets\n",
+    "# Création du slider\n",
+    "slider = widgets.IntSlider(\n",
+    "    value=0,\n",
+    "    min=0,\n",
+    "    max=100,\n",
+    "    step=1,\n",
+    "    description='Swipe Position:',\n",
+    "    continuous_update=True\n",
+    ")\n",
+    "\n",
+    "# Créez une fonction pour mettre à jour le modèle lorsque le slider change\n",
+    "def on_slider_change(change):\n",
+    "    m.swipe_position=change['new']\n",
+    "\n",
+    "# Lier la fonction de mise à jour au changement de valeur du slider\n",
+    "slider.observe(on_slider_change, names='value')\n",
+    "\n",
+    "# Affichez le slider dans le notebook\n",
+    "display(slider)\n",
+    "display(m)\n"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 8,
@@ -132,6 +190,13 @@
    "source": [
     "m.remove_layer(rasterlay)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

diff --git a/src/rastertilelayer.ts b/src/rastertilelayer.ts
@@ -1,12 +1,14 @@
-// Copyright (c) QuantStack
-// Distributed under the terms of the Modified BSD License.
 import { DOMWidgetModel, ISerializers } from '@jupyter-widgets/base';
-import TileLayer from 'ol/layer/WebGLTile.js';
+import WebGLTileLayer from 'ol/layer/WebGLTile.js';
 import XYZ from 'ol/source/XYZ.js';
 import { MODULE_NAME, MODULE_VERSION } from './version';
 import { MapView } from './widget';
 import { LayerModel, LayerView } from './layer';
 
+type WebGLEvent = {
+  context: WebGLRenderingContext;
+};
+
 export class RasterTileLayerModel extends LayerModel {
   defaults() {
     return {
@@ -28,7 +30,7 @@ export class RasterTileLayerModel extends LayerModel {
 
   static serializers: ISerializers = {
     ...DOMWidgetModel.serializers,
-    // Add any extra serializers here
+    // Add any extra serializers ici
   };
 
   static model_name = 'RasterTileLayerModel';
@@ -41,15 +43,36 @@ export class RasterTileLayerModel extends LayerModel {
 
 export class RasterTileLayerView extends LayerView {
   map_view: MapView;
+  tileLayer: WebGLTileLayer;
+
+  private prerenderListener: (event: WebGLEvent) => void;
+  private postrenderListener: (event: WebGLEvent) => void;
+  private previousSwipePosition: number | undefined;
+
+  constructor(options: any) {
+    super(options);
+    this.map_view = options.options.map_view;
+    this.prerenderListener = this.map_view.handlePrerender.bind(this.map_view);
+    this.postrenderListener = this.map_view.handlePostrender.bind(
+      this.map_view,
+    );
+    this.previousSwipePosition = undefined;
+  }
 
   render() {
     super.render();
     this.urlChanged();
     this.model.on('change:url', this.urlChanged, this);
+    this.model.on(
+      'change:swipe_position',
+      this.handleSwipePositionChanged,
+      this,
+    );
+    this.updateEventListeners();
   }
 
   create_obj() {
-    this.obj = this.tileLayer = new TileLayer({
+    this.obj = this.tileLayer = new WebGLTileLayer({
       source: new XYZ({
         url: this.model.get('url'),
         attributions: this.model.get('attributions'),
@@ -74,5 +97,27 @@ export class RasterTileLayerView extends LayerView {
     }
   }
 
-  tileLayer: TileLayer;
+  handleSwipePositionChanged() {
+    const swipePosition = this.model.get('swipe_position');
+    console.log('Swipe Position Changed:', swipePosition);
+
+    if (this.previousSwipePosition !== swipePosition) {
+      this.previousSwipePosition = swipePosition;
+      this.updateEventListeners();
+      this.map_view.map.render();
+    }
+  }
+
+  updateEventListeners() {
+    console.log('Updating event listeners');
+    const swipePosition = this.model.get('swipe_position');
+    (this.tileLayer as any).un('precompose', this.prerenderListener);
+    (this.tileLayer as any).un('postcompose', this.postrenderListener);
+
+    if (swipePosition >= 0) {
+      (this.tileLayer as any).on('precompose', this.prerenderListener);
+      (this.tileLayer as any).on('postcompose', this.postrenderListener);
+    }
+    console.log('Event listeners updated');
+  }
 }