[UPD] services

Viglino · Feb 26, 2024 · aee6efe · aee6efe
1 parent 849b073
commit aee6efe
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 16 deletions.
diff --git a/dist/ol-ext.js b/dist/ol-ext.js
@@ -20046,6 +20046,7 @@ ol.control.WMTSCapabilities = class olcontrolWMTSCapabilities extends ol.control
   }
 }
 /** An array of supported sets (basically EPSG:3857)
+ * @api
  */
 ol.control.WMSCapabilities.prototype.supportedSets = [
   'PM',
@@ -34643,36 +34644,42 @@ ol.layer.Geoportail.themes = [{
 }, {
   theme: 'cartes',
   rex: /GEOGRAPHICALGRIDSYSTEMS|CARTES|SCAN/
+}, {
+  theme: 'energie',
+  rex: /CHALEUR|CHAUD|FROID|METHAN|CONSO|ENR|ELECTRIQUE|EOLIEN|SOLAIRE|PRODUCTIBLE|GEOTHERM|PROD\.INSTALLATION|POTENTIEL\.HYDRO/
+}, {
+  theme: 'risque',
+  rex: /SISMIC|RISKZONE/
 }, {
   theme: 'agriculture',
   rex: /AGRICULTURE|PAC/
 }, {
   theme: 'altimetrie',
-  rex: /ELEVATION|SLOPE/
+  rex: /ELEVATION|SLOPE|ISOHYPSE/
 }, {
   theme: 'parcellaire',
-  rex: /PARCELS|Parcellaire/
+  rex: /PARCELS|Parcellaire|RPG|PCRS|PCI/
 }, {
   theme: 'administratif',
   rex: /ADMIN/
 }, {
   theme: 'ocsge',
-  rex: /OCSGE/
+  rex: /OCSGE|CoSIA/
 }, {
   theme: 'clc',
   rex: /\.CLC|\.CHA/
 }, {
   theme: 'environnement',
-  rex: /PROTECTEDAREAS|FORETS|DEBROUSSAILLEMENT|LANDCOVER|PROTECTEDSITES|CHASSE/
+  rex: /PROTECTEDAREAS|FORETS|DEBROUSSAILLEMENT|LANDCOVER|PROTECTEDSITES|CHASSE|INPE|OFB/
 }, {
   theme: 'topographie',
-  rex: /RAILWAYS|BUILDINGS|RUNWAYS|COMMONTRANSPORTELEMENTS|UTILITYANDGOVERNMENTALSERVICES|GEOGRAPHICALNAMES\.NAMES|HYDROGRAPHY|TRANSPORTNETWORKS.ROADS$|hedge.hedge/
+  rex: /BDCARTO|PARKING|RAILWAYS|BUILDINGS|RUNWAYS|UTILITYANDGOVERNMENTALSERVICES|GEOGRAPHICALNAMES\.NAMES|HYDROGRAPHY|TRANSPORTNETWORKS\.ROADS$|hedge.hedge/
 }, {
   theme: 'transport',
-  rex: /TRANSPORTNETWORKS\.ROADS|TRANSPORTS\.DRONES|SECUROUTE/
+  rex: /TRANSPORT|SECUROUTE|AUTOROUT/
 }, {
   theme: 'economie',
-  rex: /INSEE|AREAMANAGEMENT/
+  rex: /INSEE|AREAMANAGEMENT|PINEL|PRIORITYDISCTRICT/
 }, {
   theme: 'agriculture',
   rex: /LANDUSE|PRAIRIES/

diff --git a/dist/ol-ext.min.js b/dist/ol-ext.min.js
diff --git a/examples/layer/map.geoportail.wmts.html b/examples/layer/map.geoportail.wmts.html
@@ -78,6 +78,9 @@
       padding: 0;
       list-style-type: none;
     }
+    ul.collapsed {
+      display: none;
+    }
     #geoportail {
       margin-top: 11em;
     }
@@ -88,6 +91,11 @@
       text-transform: capitalize;
       font-size: 1.1em;
       font-weight: bold;
+      cursor: pointer;
+      opacity: .9;
+    }
+    #geoportail > li > p:hover {
+      opacity: 1;
     }
     #geoportail p {
       margin: 0;
@@ -195,7 +203,12 @@ <h1>ol-ext: IGN Géoservices</h1>
   }
   // Sort by theme
   Object.keys(themes).sort(sort).forEach(function(k) {
-    var li = $('<li>').append($('<p>').text(k)).appendTo(ul);
+    var li = $('<li>').appendTo(ul);
+    $('<p>').text(k)
+      .click(function(e) {
+        e.target.nextSibling.classList.toggle('collapsed')
+      })
+      .appendTo(li)
     var ul2 = $('<ul>').appendTo(li);
     Object.keys(themes[k]).forEach(function(c) {
       var cap = themes[k][c]

diff --git a/src/layer/Geoportail.js b/src/layer/Geoportail.js
@@ -466,36 +466,42 @@ ol_layer_Geoportail.themes = [{
 }, {
   theme: 'cartes',
   rex: /GEOGRAPHICALGRIDSYSTEMS|CARTES|SCAN/
+}, {
+  theme: 'energie',
+  rex: /CHALEUR|CHAUD|FROID|METHAN|CONSO|ENR|ELECTRIQUE|EOLIEN|SOLAIRE|PRODUCTIBLE|GEOTHERM|PROD\.INSTALLATION|POTENTIEL\.HYDRO/
+}, {
+  theme: 'risque',
+  rex: /SISMIC|RISKZONE/
 }, {
   theme: 'agriculture',
   rex: /AGRICULTURE|PAC/
 }, {
   theme: 'altimetrie',
-  rex: /ELEVATION|SLOPE/
+  rex: /ELEVATION|SLOPE|ISOHYPSE/
 }, {
   theme: 'parcellaire',
-  rex: /PARCELS|Parcellaire/
+  rex: /PARCELS|Parcellaire|RPG|PCRS|PCI/
 }, {
   theme: 'administratif',
   rex: /ADMIN/
 }, {
   theme: 'ocsge',
-  rex: /OCSGE/
+  rex: /OCSGE|CoSIA/
 }, {
   theme: 'clc',
   rex: /\.CLC|\.CHA/
 }, {
   theme: 'environnement',
-  rex: /PROTECTEDAREAS|FORETS|DEBROUSSAILLEMENT|LANDCOVER|PROTECTEDSITES|CHASSE/
+  rex: /PROTECTEDAREAS|FORETS|DEBROUSSAILLEMENT|LANDCOVER|PROTECTEDSITES|CHASSE|INPE|OFB/
 }, {
   theme: 'topographie',
-  rex: /RAILWAYS|BUILDINGS|RUNWAYS|COMMONTRANSPORTELEMENTS|UTILITYANDGOVERNMENTALSERVICES|GEOGRAPHICALNAMES\.NAMES|HYDROGRAPHY|TRANSPORTNETWORKS.ROADS$|hedge.hedge/
+  rex: /BDCARTO|PARKING|RAILWAYS|BUILDINGS|RUNWAYS|UTILITYANDGOVERNMENTALSERVICES|GEOGRAPHICALNAMES\.NAMES|HYDROGRAPHY|TRANSPORTNETWORKS\.ROADS$|hedge.hedge/
 }, {
   theme: 'transport',
-  rex: /TRANSPORTNETWORKS\.ROADS|TRANSPORTS\.DRONES|SECUROUTE/
+  rex: /TRANSPORT|SECUROUTE|AUTOROUT/
 }, {
   theme: 'economie',
-  rex: /INSEE|AREAMANAGEMENT/
+  rex: /INSEE|AREAMANAGEMENT|PINEL|PRIORITYDISCTRICT/
 }, {
   theme: 'agriculture',
   rex: /LANDUSE|PRAIRIES/