Commit 95ffde06 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Recupera funcionalidad de visor marine monitoring

parent 076942b5

client-app/src/component/atlas/Atlas.js

+12 −7
Original line number Diff line number Diff line
@@ -53,9 +53,15 @@ define([ 
		//	summary:

		//		Módulo de Atlas, con un catálogo de capas para añadir al mapa y un listado de gestión de las añadidas.



		constructor: function(args) {

		constructor: function() {



			this.config = {

			aspect.before(this, '_createAtlasMapLayerInstance',

				lang.hitch(this, this._beforeCreateAtlasMapLayerInstance));

		},



		postMixInProperties: function() {



			const defaultConfig = {

				ownChannel: 'atlas',



				events: {
@@ -72,15 +78,14 @@ define([ 
				_layerIdsById: {} // correspondencia entre ids de las capas con sus layerIds

			};



			lang.mixin(this, this.config, args);

			this._mergeOwnAttributes(defaultConfig);



			aspect.before(this, '_createAtlasMapLayerInstance',

				lang.hitch(this, this._beforeCreateAtlasMapLayerInstance));

			this.inherited(arguments);

		},



		_setConfigurations: function() {



			this.themesBrowserConfig = this._merge([{

			this.mergeComponentAttribute('themesBrowserConfig', {

				title: this.i18n.selectedLayers,

				target: this.localTarget,

				browserConfig: {
@@ -103,7 +108,7 @@ define([ 
						}

					}

				}

			}, this.themesBrowserConfig || {}], {

			}, {

				arrayMergingStrategy: 'concatenate'

			});

client-app/src/component/atlas/_AtlasDimensionsManagement.js

+11 −6
Original line number Diff line number Diff line
@@ -16,19 +16,24 @@ define([ 
		//	summary:

		//		Gestión de dimensiones de capas (como tiempo y elevación) para el módulo Atlas.



		constructor: function(args) {

		constructor: function() {



			this.config = {

			aspect.before(this, '_deactivateLayer', lang.hitch(this, this._atlasDimensionsDeactivateLayer));

			aspect.before(this, '_cleanRowSecondaryContainer', lang.hitch(this,

				this._atlasDimensionsCleanRowSecondaryContainer));

		},



		postMixInProperties: function() {



			const defaultConfig = {

				_elevationTagsContainerClass: 'tagListBottomContentContainer',

				_elevationTagListByLayerId: {},

				_elevationShownByLayerId: {}

			};



			lang.mixin(this, this.config, args);

			this._mergeOwnAttributes(defaultConfig);



			aspect.before(this, '_deactivateLayer', lang.hitch(this, this._atlasDimensionsDeactivateLayer));

			aspect.before(this, '_cleanRowSecondaryContainer', lang.hitch(this,

				this._atlasDimensionsCleanRowSecondaryContainer));

			this.inherited(arguments);

		},



		_getAtlasLayerDimensions: function(atlasItem) {

client-app/src/component/atlas/_AtlasLayersManagement.js

+5 −3
Original line number Diff line number Diff line
@@ -15,16 +15,18 @@ define([ 
		//		Permite interpretar las configuraciones de capas procedentes del servicio atlas, para generar

		//		configuraciones de capa que puedan mostrarse en el mapa.



		constructor: function(args) {

		postMixInProperties: function() {



			this.config = {

			const defaultConfig = {

				layerIdSeparator: '_',

				themeSeparator: '-',

				_layerInstances: {}, // capas de las que hemos creado instancia (no se borran, se reciclan)

				defaultLayerItemState: true

			};



			lang.mixin(this, this.config, args);

			this._mergeOwnAttributes(defaultConfig);



			this.inherited(arguments);

		},



		_getLayerDefinitionByProtocol: function(atlasLayer) {

client-app/src/component/atlas/_AtlasThemesManagement.js

+10 −9
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ define([ 
		//	summary:

		//		Gestión de capas temáticas de atlas cargadas en el mapa.



		constructor: function(args) {

		postMixInProperties: function() {



			this.config = {

			const defaultConfig = {

				pathSeparator: '.',

				parentProperty: 'parent',

				addThemesBrowserFirst: false,
@@ -41,13 +41,13 @@ define([ 
				_activeLayers: {} // indicador sobre si la capa está activada en el mapa o no

			};



			lang.mixin(this, this.config, args);

			this._mergeOwnAttributes(defaultConfig);



			if (this.omitThemesBrowser) {

				return;

			}

			this.inherited(arguments);



			if (!this.omitThemesBrowser) {

				this._prepareThemesBrowserCallbacks();

			}

		},



		_prepareThemesBrowserCallbacks: function() {
@@ -68,7 +68,7 @@ define([ 


		_themesBrowserAfterSetConfigurations: function() {



			this.themesBrowserConfig = this._merge([{

			this.mergeComponentAttribute('themesBrowserConfig', {

				ownChannel: 'themesBrowser',

				parentChannel: this.getChannel(),

				enabledBrowserExtensions: {
@@ -114,7 +114,8 @@ define([ 
						}

					}

				}

			}, this.themesBrowserConfig || {}], {

			}, {

				avoidOverwrite: true,

				arrayMergingStrategy: 'concatenate'

			});

		},

client-app/src/viewer/marineMonitoring/MarineMonitoringViewerView.js

+2 −2
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ define([ 


		postMixInProperties: function() {



			this.inherited(arguments);



			const defaultConfig = {

				title: this.i18n.marineMonitoringViewerView,

				ownChannel: 'marineMonitoringViewer',
@@ -45,8 +47,6 @@ define([ 
			};



			this._mergeOwnAttributes(defaultConfig);



			this.inherited(arguments);

		},



		_setOwnCallbacksForEvents: function() {