Add the LayerSwitcher control.

Author: HaudinFlorence

examples/GeoportalControls.ipynb

@@ -0,0 +1,66 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "id": "6bb0dd68-f96d-45c5-b3de-48c2092f2690",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "72c6852ad1be48459976e5b4c009a77a",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "Map(center=[44.799999, 2.26667], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', '…"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
+   "source": [
+    "from ipyleaflet import *\n",
+    "from ipyleaflet.geoportal import GeoportalWMTS, GeoportalLayerSwitcher\n",
+    "m = Map(center=(44.799999, 2.26667), zoom=10, zoom_control=True)\n",
+    "layer1 = GeoportalWMTS() #default\n",
+    "layer2 = GeoportalWMTS(layer = 'ELEVATION.SLOPES', api_key = 'altimetrie')\n",
+    "m.add(layer1)\n",
+    "m.add(layer2)\n",
+    "layer_control = GeoportalLayerSwitcher()\n",
+    "m.add(layer_control)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "57062455-fe86-4e3b-8eaf-94e996b44830",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.10.5"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

examples/Geoportal.ipynb renamed to examples/GeoportalLayers.ipynb

@@ -17,10 +17,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "id": "68a99b3b-58f1-4251-a724-f5135ac72be1",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "abe319d952074d1c8517503b7c05313b",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "Map(center=[44.799999, 2.26667], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', '…"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
    "source": [
     "from ipyleaflet import *\n",
     "from ipyleaflet.geoportal import GeoportalWMTS\n",
@@ -64,14 +79,6 @@
     "layer4 = GeoportalWMTS(layer = 'HYDROGRAPHY.BCAE.LATEST', api_key = 'agriculture', format = 'image/png')\n",
     "m4.add(layer4)"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b6edf13b-f9a1-45c4-b28a-7e9028d4f89f",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

ipyleaflet/geoportal.py

@@ -3,8 +3,8 @@
 #
 
 
-from traitlets import Unicode
-from .leaflet import TileLayer
+from traitlets import Unicode, Dict
+from .leaflet import TileLayer, Control
 
 
 class GeoportalWMTS(TileLayer):
@@ -25,4 +25,15 @@ class GeoportalWMTS(TileLayer):
     _model_name = Unicode('LeafletGeoportalWMTSModel').tag(sync=True)
     layer = Unicode('ORTHOIMAGERY.ORTHOPHOTOS').tag(sync=True, o=True)
     api_key = Unicode('essentiels').tag(sync=True, o=True)
-    format = Unicode('image/jpeg').tag(sync=True, o=True)
+    format = Unicode('image/jpeg').tag(sync=True, o=True)
+
+
+class GeoportalLayerSwitcher(Control):
+    """GeoportalLayerSwitcher class, with Control as parent class
+
+    Attributes
+        ----------
+    """
+
+    _view_name = Unicode('LeafletGeoportalLayerSwitcherView').tag(sync=True)
+    _model_name = Unicode('LeafletGeoportalLayerSwitcherModel').tag(sync=True)

js/src/layers/Geoportal.js

@@ -3,6 +3,7 @@
 
 const L = require('../leaflet.js');
 const layer = require('./TileLayer.js');
+const control = require('../controls/Control.js');
 const utils = require('../utils');
 
 export class LeafletGeoportalWMTSModel extends layer.LeafletTileLayerModel {
@@ -20,6 +21,28 @@ export class LeafletGeoportalWMTSModel extends layer.LeafletTileLayerModel {
 
 export class LeafletGeoportalWMTSView extends layer.LeafletTileLayerView {
   create_obj() {
+    console.log('this.get_options():', this.get_options())
     this.obj = L.geoportalLayer.WMTS(this.get_options(), {format : this.model.get('format')})
   }
 }
+
+export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlModel {
+  defaults() {
+    return {
+      ...super.defaults(),
+     _view_name: 'LeafletGeoportalLayerSwitcherView',
+      _model_name: 'LeafletGeoportalLayerSwitcherModel'
+      };
+    }
+  }
+
+  export class LeafletGeoportalLayerSwitcherView extends control.LeafletControlView {
+    initialize(parameters) {
+      super.initialize(parameters);
+      this.map_view = this.options.map_view;
+    }
+    create_obj() {
+      this.obj = L.geoportalControl.LayerSwitcher()
+    }
+  }
+