Merge branch 'develop' into premain

IGN-CNIG · Nov 29, 2024 · 87de3e3 · 87de3e3
2 parents b752322 + d20eb8f
commit 87de3e3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -83,6 +83,7 @@
 - Se modifica estilo proporcional para soportar VendorOptions en estilos simples y genéricos
 - Se controla en formato GML de capas WFS 2.0.0 las etiquetas inválidas wfs
 - Inteligencia Popup y Dialog por defecto estará activada dicha funcionalidad.
+- Se modifica la capa híbrida del control backgroundlayers a grupo de capas.
 
 22/05/24 - Versión 5.0.0
 - Se incluye nuevo tipo de capa GeoTiff.

diff --git a/api-ign-js/src/configuration.js b/api-ign-js/src/configuration.js
@@ -22,8 +22,7 @@ const backgroundlayersOpts = [{
   id: 'hibrido',
   title: 'H&iacute;brido',
   layers: [
-    'QUICK*BASE_PNOA_MA_TMS',
-    'QUICK*BASE_IGNBaseOrto_TMS',
+    'QUICK*HIBRIDO',
   ],
 },
 ];

diff --git a/api-ign-js/src/facade/js/mapea.js b/api-ign-js/src/facade/js/mapea.js
@@ -9,6 +9,7 @@ import MapImpl from 'impl/Map';
 import Map from 'M/Map';
 import WFS from 'M/layer/WFS';
 import TMS from 'M/layer/TMS';
+import LayerGroup from 'M/layer/LayerGroup';
 import WMTS from 'M/layer/WMTS';
 import MapLibre from 'M/layer/MapLibre';
 import Point from 'M/style/Point';
@@ -204,6 +205,41 @@ let quickLayers = () => {
     }, {
       disableBackgroundColor: false,
     }),
+    HIBRIDO: new LayerGroup({
+      name: 'Híbrido',
+      layers: [
+        new TMS({
+          url: 'https://tms-pnoa-ma.idee.es/1.0.0/pnoa-ma/{z}/{x}/{-y}.jpeg',
+          legend: 'PNOA_MA',
+          name: 'PNOA_MA',
+          visible: true,
+          transparent: false,
+          tileGridMaxZoom: 19,
+          attribution: {
+            name: 'PNOA-MA',
+            description: 'IGN',
+            url: 'https://www.ign.es',
+            contentAttributions: 'https://componentes.cnig.es/api-core/files/attributions/WMTS_PNOA_20170220/atribucionPNOA_Url.kml',
+            contentType: 'kml',
+          },
+        }, {
+          crossOrigin: 'anonymous',
+          displayInLayerSwitcher: false,
+        }),
+        new TMS({
+          url: 'https://tms-ign-base.idee.es/1.0.0/IGNBaseOrto/{z}/{x}/{-y}.png',
+          legend: 'IGNBaseOrto',
+          name: 'IGNBaseOrto',
+          visible: true,
+          transparent: false,
+          tileGridMaxZoom: 17,
+          attribution: '<p><b>IDEE</b>: <a style="color: #0000FF" href="https://www.scne.es" target="_blank">SCNE</a></p>',
+        }, {
+          crossOrigin: 'anonymous',
+          displayInLayerSwitcher: false,
+        }),
+      ],
+    }),
   };
 };