Commit 9deb8277 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige centrado de estaciones acústicas y traduce

parent d93ceb26

client-app/src/component/gateway/MapCenteringGatewayImpl.js

+9 −8
Original line number Diff line number Diff line 
define([

	'dojo/_base/declare'

	, 'dojo/_base/lang'

	, './Gateway'

	, 'src/component/gateway/Gateway'

], function(

	declare

	, lang

	, Gateway

) {

	return declare([Gateway], {



	return declare(Gateway, {

		//	summary:

		//		Implementación de gateway entre browser y map/mapLayer para centrar el mapa en un punto y destacar un

		//		marcador de la capa.



		constructor: function(args) {

		postMixInProperties: function() {



			this.config = {

			const defaultConfig = {

				ownChannel: 'mapCenteringGateway',

				btnToListen: 'mapCentering',

				centeringDuration: 1,

				idProperty: 'uuid'

			};



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

			this._mergeOwnAttributes(defaultConfig);



			this.inherited(arguments);

		},



		_subAnimateMarker: function(/*Object*/ objReceived) {

client-app/src/component/layout/widgetProvider/_LayoutWidgetDefinition.js

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ define([ 
			return {

				type: AcousticDetectionMap,

				props: {

					title: 'acoustic-detections',

					title: 'acoustic-detection',

					activityIds: config.activityIds

				}

			};

client-app/src/design/map/_AddBrowserComponent.js

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ define([ 
			const browserWrapperInstance = this.getComponentInstance('browserWrapper'),

				browserWrapperChannel = browserWrapperInstance.getChannel();



			// TODO contemplar omisión de search

			const searchInstance = this.getComponentInstance('search');



			this._publish(browserWrapperInstance.getChannel('ADD_TOPBAR_CONTENT'), {

client-app/src/detail/widget/AcousticDetectionMap.js

+12 −2
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ define([ 
				ownChannel: 'acousticDetectionMap',

				target: redmicConfig.services.acousticDistribution,

				mapLayerPopupTemplate: AcousticDetectionPopupTemplate,

				activityIds: []

				activityIds: [],

				idProperty: 'id'

			};



			this._mergeOwnAttributes(defaultConfig);
@@ -57,7 +58,16 @@ define([ 
			this.inherited(arguments);



			this.mergeComponentAttribute('browserConfig', {

				template: AcousticDetectionListTemplate

				template: AcousticDetectionListTemplate,

				idProperty: this.idProperty

			});



			this.mergeComponentAttribute('mapLayerConfig', {

				idProperty: this.idProperty

			});



			this.mergeComponentAttribute('mapCenteringConfig', {

				idProperty: this.idProperty

			});

		},

client-app/src/oldapp/nls/es/translation.js

+4 −0
Original line number Diff line number Diff line 
define({

	"ok": "Aceptar"

	, "acoustic-detection": "Detección acústica"

	, "totalReceptors": "Receptores desplegados"

	, "totalAnimals": "Individuos detectados"

	, "totalDetections": "Total de detecciones"

	, "unknownDevice": "Dispositivo desconocido"

	, "contents": "Contenidos"

	, "providedByAtlas": "Contenido provisto por atlas"