Commit dcaacb0f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Mejora comportamiento de timeDimension 

Prepara el uso del plugin timeDimension en entornos de tamaño reducido.

Soluciona parche de asignación directa de capa modificada, permitiendo
pasarlo mediante publicación SET_PROPS, que ahora soporta este tipo de
valores sin intentar procesarlos.
parent 94204592

client-app/src/component/base/_Module.js

+11 −3
Original line number Diff line number Diff line
@@ -803,11 +803,19 @@ define([ 


		_getUnmutableValue: function(value) {



			if (typeof value === 'object' && value && !value.ownChannel && !value.ownerDocument) {

				return lang.clone(value);

			var valueIsObject = value && typeof value === 'object';



			if (!valueIsObject) {

				return value;

			}



			var objectHasLifecycle = value.ownChannel || value.ownerDocument || value.constructor;



			if (objectHasLifecycle) {

				return value;

			}



			return lang.clone(value);

		},



		_subGetProps: function(req) {

client-app/src/component/map/widget/_LeafletTimeDimension.js

+37 −4
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ define([ 
				timeDimensionMaxTime: moment().utc().startOf('day'),



				getTimeDimensionExternalContainer: null,

				reducedTimeDimensionClass: 'timeDimensionReduced',



				_layersWithTimeDimension: {}

			};
@@ -47,6 +48,32 @@ define([ 


			aspect.before(this, '_addMapLayer', lang.hitch(this, this._addTimeDimensionMapLayer));

			aspect.before(this, '_removeMapLayer', lang.hitch(this, this._removeTimeDimensionMapLayer));

			aspect.before(this, '_resize', lang.hitch(this, this._resizeTimeDimension));

		},



		_resizeTimeDimension: function() {



			if (!this._timeDimensionInstance) {

				return;

			}



			this._evaluateLowWidthCondition();

			this._updateTimeDimensionWidget();

		},



		_evaluateLowWidthCondition: function() {



			var controlContainer = this._getTimeDimensionControlContainer();



			if (!controlContainer) {

				return;

			}



			if (this._getLowWidth()) {

				put(controlContainer, '.' + this.reducedTimeDimensionClass);

			} else {

				put(controlContainer, '!' + this.reducedTimeDimensionClass);

			}

		},



		_addTimeDimensionMapLayer: function(obj) {
@@ -69,6 +96,7 @@ define([ 


			if (!this._timeDimensionInstance) {

				this._addTimeDimensionWidget();

				this._evaluateLowWidthCondition();

			}



			this._updateTimeDimensionWidget();
@@ -213,7 +241,12 @@ define([ 
				return;

			}



			put(externalContainer, this._timeDimensionControlInstance._container);

			put(externalContainer, this._getTimeDimensionControlContainer());

		},



		_getTimeDimensionControlContainer: function() {



			return this._timeDimensionControlInstance && this._timeDimensionControlInstance._container;

		},



		_removeTimeDimensionWidget: function() {
@@ -234,9 +267,9 @@ define([ 


			var timeDimensionLayer = this._getLayerWithTimeDimensionWrapper(layerId, originalLayer);



			// TODO parche para actualizar la instancia de la capa interna en el componente de capa, necesario para

			// que responda a la hora de aplicarle cambios de parámetros, como el de la dimensión de elevación

			layer.layer = timeDimensionLayer;

			this._publish(layer.getChannel('SET_PROPS'), {

				layer: timeDimensionLayer

			});



			return timeDimensionLayer;

		},

style @ 7115a768

Compare 55de289e to 7115a768
Original line number Diff line number Diff line 
Subproject commit 55de289e4933f7caf4d7ea39f6bc240c0f7bbaff
 
Subproject commit 7115a7682a3a50d87e03de032af983a56425160f