Commit 86762e61 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Mejora interacción de timeseries con mapa 

Permite selección desde mapa y desde listado de parámetros de estaciones
indistintamente, respetando las selecciones de estaciones diferentes
desde popup de mapa.

Limpia estructuras al vaciar la selección.
parent 69f3ec02

public/javascript/app/details/views/_ActivityTimeSeriesDataManagement.js

+7 −2
Original line number Diff line number Diff line
@@ -41,10 +41,15 @@ define([ 


			this._clear();



			this._parseData(sourceData);

			this._parseAndAddTimeseriesData(sourceData);

			this._generateChartsDefinitionDataFromTimeseriesInternalStructures();

		},



		_parseAndAddTimeseriesData: function(data) {



			this._addSourceDataToTimeseriesInternalStructures(this._parseData(data));

		},



		_parseData: function(item) {



			var site = item.site,
@@ -73,7 +78,7 @@ define([ 
			site.leaves = parameters.length;

			dataList.push(site);



			this._addSourceDataToTimeseriesInternalStructures(dataList);

			return dataList;

		},



		_isInserted: function(data, itemId) {

public/javascript/app/viewers/views/_TimeSeriesDataManagement.js

+2 −5
Original line number Diff line number Diff line
@@ -103,11 +103,8 @@ define([ 


			var itemProps = response.data.properties;



			this._clearTimeseriesInternalStructures();

			this._parseData(itemProps);



			this._emitEvt('INJECT_DATA', {

				data: this._getTimeseriesHierarchicalList(),

				data: this._parseData(itemProps),

				target: this.browserPopupTarget

			});

		},
@@ -117,7 +114,7 @@ define([ 
			this._clearTimeseriesInternalStructures();



			for (var i = 0; i < features.length; i++) {

				this._parseData(features[i].properties);

				this._parseAndAddTimeseriesData(features[i].properties);

			}

		},

public/javascript/app/viewers/views/_TimeSeriesSelectionManagement.js

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


			aspect.before(this, '_select', lang.hitch(this, this._selectTimeSeriesSelectionManagement));

			aspect.before(this, '_deselect', lang.hitch(this, this._deselectTimeSeriesSelectionManagement));

			aspect.before(this, '_clearSelection', lang.hitch(this, this._clearSelectionTimeSeriesSelectionManagement));

		},



		_setTimeSeriesSelectionManagementOwnCallbacksForEvents: function() {
@@ -50,13 +51,18 @@ define([ 
		_selectTimeSeriesSelectionManagement: function(path) {



			this._selected[path] = true;

			this._insertedInTimeSeriesData = {};

			this._clearChartsDefinitionData();

		},



		_deselectTimeSeriesSelectionManagement: function(path) {



			delete this._selected[path];

			this._insertedInTimeSeriesData = {};

			this._clearChartsDefinitionData();

		},



		_clearSelectionTimeSeriesSelectionManagement: function() {



			this._clearChartsDefinitionData();

		},



		_generateTimeSeriesDataFromSelectedData: function() {