Skip to content

Commit

Permalink
Merge branch 'develop' into premain
Browse files Browse the repository at this point in the history
  • Loading branch information
AlvaroCodes committed Dec 3, 2024
2 parents 87de3e3 + 1745362 commit e769f37
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion api-ign-js/src/configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const backgroundlayersOpts = [{
id: 'hibrido',
title: 'Híbrido',
layers: [
'QUICK*HIBRIDO',
'QUICK*BASE_HIBRIDO_LayerGroup',
],
},
];
Expand Down
10 changes: 3 additions & 7 deletions api-ign-js/src/facade/js/layer/LayerGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,10 @@ import * as LayerType from './Type';
* @classdesc
* Representa un grupo de capas.
*
* @property {Array<M.LayerBase|M.LayerGroup>} layers
* @property {boolean} display
* @property {Array<M.LayerBase|M.LayerGroup>} layers Capas del grupo.
* @property {boolean} display Indica si el grupo se muestra en el árbol de contenidos.
*
*
* @constructor
* @extends {M.facade.Base}
* @param {string|Mx.parameters.Layer} userParameters parameters
* provided by the user
* @api
*/
class LayerGroup extends LayerBase {
Expand All @@ -28,7 +24,7 @@ class LayerGroup extends LayerBase {
* con parámetros especificados por el usuario.
*
* @constructor
* @param {String|Mx.parameters.GeoJSON} parameters Parámetros para la construcción de la capa,
* @param {String|Mx.parameters.LayerGroup} parameters Parámetros para la construcción de la capa,
* estos parámetros los proporciona el usuario.
* - name: Nombre de la capa en la leyenda.
* - layers: Capas que forman el grupo.
Expand Down
5 changes: 2 additions & 3 deletions api-ign-js/src/facade/js/mapea.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,15 @@ let quickLayers = () => {
}, {
disableBackgroundColor: false,
}),
HIBRIDO: new LayerGroup({
BASE_HIBRIDO_LayerGroup: new LayerGroup({
name: 'Híbrido',
isBase: true,
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',
Expand All @@ -231,7 +231,6 @@ let quickLayers = () => {
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>',
}, {
Expand Down
2 changes: 1 addition & 1 deletion api-ign-js/test/configuration_filtered.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const backgroundlayersIds = 'mapa,imagen,hibrido'.split(',');
const backgroundlayersTitles = 'Mapa,Imagen,Hibrido'.split(',');
const backgroundlayersLayers = 'QUICK*Base_IGNBaseTodo_TMS,QUICK*BASE_PNOA_MA_TMS,QUICK*BASE_PNOA_MA_TMS+QUICK*BASE_IGNBaseOrto_TMS'.split(',');
const backgroundlayersLayers = 'QUICK*Base_IGNBaseTodo_TMS,QUICK*BASE_PNOA_MA_TMS,QUICK*BASE_HIBRIDO_LayerGroup'.split(',');
const backgroundlayersOpts = backgroundlayersIds.map((id, index) => {
return {
id,
Expand Down

0 comments on commit e769f37

Please sign in to comment.