Separarate Geoportal.js between 2 separate files for layers and controls, and update the SearchEngine, MousePosition and Route controls.

HaudinFlorence · HaudinFlorence · commit d2f4b69d859c · 2022-09-12T17:50:30.000+02:00
diff --git a/examples/GeoportalControls.ipynb b/examples/GeoportalControls.ipynb
@@ -2,13 +2,13 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "id": "6bb0dd68-f96d-45c5-b3de-48c2092f2690",
    "metadata": {},
    "outputs": [],
    "source": [
     "from ipyleaflet import *\n",
-    "from ipyleaflet.geoportal import GeoportalWMTS, GeoportalLayerSwitcher, GeoportalSearchEngine, GeoportalRoute, GeoportalMousePosition, GeoportalElevationPath, GeoportalIsocurve"
+    "from ipyleaflet.geoportal import GeoportalLayerSwitcher, GeoportalSearchEngine, GeoportalRoute, GeoportalMousePosition, GeoportalElevationPath, GeoportalIsocurve"
    ]
   },
   {
@@ -19,7 +19,7 @@
    "outputs": [],
    "source": [
     "#Route control for itinerary calculation\n",
-    "layer = GeoportalWMTS(layer = 'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2', api_key = 'cartes', format = 'image/png')\n",
+    "layer = basemap_to_tiles(basemaps.GeoportailFrance.plan)\n",
     "m = Map(center=(44.799999, 2.26667), zoom=10, zoom_control=True)\n",
     "m.add(layer)\n",
     "route_control = GeoportalRoute()\n",
@@ -28,21 +28,33 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "id": "3a686d99-c3ca-4596-81aa-24442564bea2",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "47bf5fd8b8aa413fb0eacad5627beee6",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "Map(center=[44.799999, 2.26667], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', '…"
+      ]
+     },
+     "execution_count": 2,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "#LayerSwitcher control\n",
     "m1 = 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",
-    "layer3 = GeoportalWMTS(layer = 'HYDROGRAPHY.BCAE.LATEST', api_key = 'agriculture', format = 'image/png')\n",
-    "layer4 = GeoportalWMTS(layer = 'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2', api_key = 'cartes', format = 'image/png')\n",
+    "layer1 = basemap_to_tiles(basemaps.GeoportailFrance.plan)\n",
+    "layer2 = basemap_to_tiles(basemaps.GeoportailFrance.orthos)\n",
     "m1.add(layer1)\n",
     "m1.add(layer2)\n",
-    "m1.add(layer3)\n",
-    "m1.add(layer4)\n",
     "layer_control = GeoportalLayerSwitcher()\n",
     "m1.add(layer_control)"
    ]
diff --git a/ipyleaflet/geoportal.py b/ipyleaflet/geoportal.py
@@ -3,7 +3,7 @@
 #
 
 
-from traitlets import Unicode
+from traitlets import Unicode, Bool, List, Dict
 from .leaflet import TileLayer, Control
 
 
@@ -48,6 +48,19 @@ class GeoportalSearchEngine(Control):
 
     _view_name = Unicode('LeafletGeoportalSearchEngineView').tag(sync=True)
     _model_name = Unicode('LeafletGeoportalSearchEngineModel').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)
+    position = Unicode('topleft').tag(sync=True, o=True)
+    collapsed = Bool(True).tag(sync=True, o=True)
+    zoomTo = Unicode('auto').tag(sync=True, o=True)
+    displayInfo = Bool(True).tag(sync=True, o=True)
+    apiKey = Unicode('cartes').tag(sync=True, o=True)
+    displayAdvancedSearch = Bool(True).tag(sync=True, o=True)
+    resources = List( ["PositionOfInterest", "StreetAddress"]).tag(sync=True, o=True)
+    advancedSearch = Dict({}).tag(sync=True, o=True)
+    geocodeOptions = Dict({}).tag(sync=True, o=True)
+    autocompleteOptions = Dict({}).tag(sync=True, o=True)
 
 
 class GeoportalRoute(Control):
@@ -59,6 +72,14 @@ class GeoportalRoute(Control):
 
     _view_name = Unicode('LeafletGeoportalRouteView').tag(sync=True)
     _model_name = Unicode('LeafletGeoportalRouteModel').tag(sync=True)
+    position = Unicode("bottomleft").tag(sync=True)
+    collapsed = Bool(True).tag(sync=True)
+    exclusions = Dict ({"toll" : True,
+                        "bridge" : False,
+                        "tunnel" : True}).tag(sync=True)
+    graphs = List( ['Pieton', 'Voiture']).tag(sync=True)
+    autocompleteOptions = Dict({}).tag(sync=True)
+    routeOptions = Dict({}).tag(sync=True)
 
 
 class GeoportalMousePosition(Control):
@@ -70,6 +91,19 @@ class GeoportalMousePosition(Control):
 
     _view_name = Unicode('LeafletGeoportalMousePositionView').tag(sync=True)
     _model_name = Unicode('LeafletGeoportalMousePositionModel').tag(sync=True)
+    position = Unicode('bottomleft').tag(sync=True)
+    collapsed = Bool(False).tag(sync=True)
+    displayAltitude = Bool(True).tag(sync=True)
+    displayCoordinates  = Bool(True).tag(sync=True)
+    editCoordinates = Bool(False).tag(sync=True)
+    altitude = Dict({}).tag(sync=True)
+    serviceOptions = Dict({})
+    crs = Unicode().tag(sync=True)
+    label = Unicode().tag(sync=True)
+    selectedtype = Unicode().tag(sync=True)
+    systems = List([{crs : '', label : "Lon,Lat", selectedtype : "Geographical"},
+          {crs :'', label : "Lambert 93",selectedtype : "Metric"}]).tag(sync=True),
+    units = List (["DEC", "DMS"]).tag(sync=True)
 
 
 class GeoportalElevationPath(Control):
diff --git a/js/src/controls/GeoportalControls.js b/js/src/controls/GeoportalControls.js
@@ -2,28 +2,8 @@
 // Distributed under the terms of the Modified BSD License.
 
 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 {
-  defaults() {
-    return {
-      ...super.defaults(),
-      _view_name: 'LeafletGeoportalWMTSView',
-      _model_name: 'LeafletGeoportalWMTSModel',
-      layer : 'ORTHOIMAGERY.ORTHOPHOTOS',
-      apiKey : 'essentiels',
-      format : 'image/jpeg'
-    };
-  }
-}
-
-export class LeafletGeoportalWMTSView extends layer.LeafletTileLayerView {
-  create_obj() {
-    this.obj = L.geoportalLayer.WMTS({layer : this.model.get('layer'), apiKey : this.model.get('api_key')}, {format : this.model.get('format')})
-  }
-}
 
 export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlModel {
   defaults() {
@@ -49,8 +29,18 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
     defaults() {
       return {
         ...super.defaults(),
-       _view_name: 'LeafletGeoportalSearchEngineView',
-        _model_name: 'LeafletGeoportalSearchEngineModel'
+        _view_name: 'LeafletGeoportalSearchEngineView',
+        _model_name: 'LeafletGeoportalSearchEngineModel',
+        position : 'topleft',
+        collapsed : true,
+        zoomTo : 'auto',
+        displayInfo : true,
+        apiKey : 'cartes',
+        displayAdvancedSearch : true,
+        resources : ["PositionOfInterest", "StreetAddress"],
+        advancedSearch : {},
+        geocodeOptions : {},
+        autocompleteOptions : {}
         };
       }
     }
@@ -61,31 +51,25 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
         this.map_view = this.options.map_view;
       }
       create_obj() {
-        this.obj = L.geoportalControl.SearchEngine({
-                position : "topleft",
-                collapsed : true,
-                zoomTo : "auto",
-                displayInfo : true,
-                displayAdvancedSearch : true,
-                resources : ["PositionOfInterest", "StreetAddress"],
-                advancedSearch : {
-                    PositionOfInterest : [{name : "municipality", title : "Ville"}],
-                    StreetAddress : [{}],
-                    CadastralParcel : null,
-                },
-                apiKey : "cartes",
-                geocodeOptions : {},
-                autocompleteOptions : {}
-           })
+        this.obj = L.geoportalControl.SearchEngine(this.get_options())
       }
     }
 
     export class LeafletGeoportalRouteModel extends control.LeafletControlModel {
       defaults() {
         return {
           ...super.defaults(),
-         _view_name: 'LeafletGeoportalLayerSwitcherView',
-          _model_name: 'LeafletGeoportalLayerSwitcherModel'
+          _view_name: 'LeafletGeoportalRouteView',
+          _model_name: 'LeafletGeoportalRouteModel',
+          position : "bottomleft",
+          collapsed : true,
+          exclusions : {"toll" : true,
+                        "bridge" : false,
+                        "tunnel" : true
+                      },
+          graphs : ['Pieton', 'Voiture'],
+          autocompleteOptions : {},
+          routeOptions : {}
           };
         }
       }
@@ -96,27 +80,45 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
           this.map_view = this.options.map_view;
         }
         create_obj() {
-          this.obj = L.geoportalControl.Route({
-                  position : "bottomleft",
-                  collapsed : true,
-                  exclusions : {
-                      "toll" : true,
-                     "bridge" : false,
-                     "tunnel" : true
-                  },
-                  graphs : ['Pieton', 'Voiture'],
-                  autocompleteOptions : {},
-                  routeOptions : {}
-              })
+          this.obj = L.geoportalControl.Route(this.get_options())
         }
       }
 
       export class LeafletGeoportalMousePositionModel extends control.LeafletControlModel {
         defaults() {
           return {
             ...super.defaults(),
-           _view_name: 'LeafletGeoportalMousePositionView',
-            _model_name: 'LeafletGeoportalMousePositionModel'
+            _view_name: 'LeafletGeoportalMousePositionView',
+            _model_name: 'LeafletGeoportalMousePositionModel',
+            position : 'bottomleft',
+            collapsed : false,
+            displayAltitude : true,
+            displayCoordinates : true,
+            editCoordinates : false,
+            crs : '',
+            label : '',
+            selectedtype: '',
+            altitude : {
+              triggerDelay : 100,
+              responseDelay : 500,
+              noDataValue : -99999,
+              noDataValueTolerance : 90000,
+              serviceOptions : {}
+           },
+          systems : [
+           {
+              crs : L.CRS.EPSG4326,
+              label : "Lon,Lat",
+              selectedtype : "Geographical"
+            },
+           {
+             crs : L.geoportalCRS.EPSG2154,
+              label : "Lambert 93",
+              selectedtype : "Metric"
+            }
+          ],
+          units : ["DEC", "DMS"]
+
             };
           }
         }
diff --git a/js/src/jupyter-leaflet.js b/js/src/jupyter-leaflet.js
@@ -30,7 +30,7 @@ export * from './layers/LayerGroup.js';
 export * from './layers/FeatureGroup.js';
 export * from './layers/GeoJSON.js';
 export * from './layers/DivIcon.js';
-export * from './layers/Geoportal.js';
+export * from './layers/GeoportalLayers.js';
 
 //Controls
 export * from './controls/AttributionControl.js';
@@ -45,6 +45,7 @@ export * from './controls/ZoomControl.js';
 export * from './controls/ScaleControl.js';
 export * from './controls/LegendControl.js';
 export * from './controls/SearchControl.js';
+export * from './controls/GeoportalControls.js';
 
 //Map
 export * from './Map.js';
diff --git a/js/src/layers/GeoportalLayers.js b/js/src/layers/GeoportalLayers.js
@@ -0,0 +1,26 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+const L = require('../leaflet.js');
+const layer = require('./TileLayer.js');
+const utils = require('../utils');
+
+export class LeafletGeoportalWMTSModel extends layer.LeafletTileLayerModel {
+  defaults() {
+    return {
+      ...super.defaults(),
+      _view_name: 'LeafletGeoportalWMTSView',
+      _model_name: 'LeafletGeoportalWMTSModel',
+      layer : 'ORTHOIMAGERY.ORTHOPHOTOS',
+      apiKey : 'essentiels',
+      format : 'image/jpeg'
+    };
+  }
+}
+
+export class LeafletGeoportalWMTSView extends layer.LeafletTileLayerView {
+  create_obj() {
+    this.obj = L.geoportalLayer.WMTS({layer : this.model.get('layer'), apiKey : this.model.get('api_key')}, {format : this.model.get('format')})
+  }
+}
+
