Commit 0d59dc27 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Restaura petición de info sobre capas del mapa

parent cec3c110

public/javascript/app/base/views/extensions/_QueryOnMap.js

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ define([ 
	, SpeciesDistributionPrimaryList

	, SpeciesDistributionCitation

) {



	return declare(null, {

		//	summary:

		//		Extensión para las vistas con mapa que desean hacer consultas sobre el mismo.

public/javascript/app/base/views/extensions/_ShowInPopupResultsFromQueryOnMap.js

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ define([ 
	, aspect

	, _ShowInPopup

) {



	return declare(null, {

		//	summary:

		//		Extensión para las vistas con mapa que hacen consultas sobre el mismo y quieren mostrar

public/javascript/app/designs/mapWithSideContent/main/Tracking.js

+3 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ define([ 
	, _PublishInfo

	, TrackingLayerImpl

) {



	return declare([Layout, Controller, _Main, _Store, _QueryOnMap, _ShowInPopupResultsFromQueryOnMap], {

		//	summary:

		//		Vista de Tracking.
@@ -69,7 +70,7 @@ define([ 
				layersTarget: redmicConfig.services.pointTrackingCluster,

				// TODO cuando se pidan por actividad, definir este en redmicConfig

				//layersTarget: "/api/activities/{id}/tracking/cluster",

				infoTarget: "/api/activities/{id}/tracking",

				infoTarget: redmicConfig.services.trackingActivity,



				mainEvents: {

					MOVE_TRACK_TO: "moveTrackTo",

public/javascript/app/redmicConfig.js

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ define([], function() { 
		'platformType': baseUri + 'platformtypes',

		'animalTracking': baseUri + 'animaltracking',

		'pointTrackingActivities': baseUri + 'tracking/activities',

		'trackingActivity': baseUri + 'activities/{id}/tracking',

		'elementsTrackingActivity': baseUri + 'activities/{id}/tracking/elements',

		'elementTracking': baseUri + 'activities/{activityid}/tracking/elements/{elementuuid}',

		'trackElementTracking': baseUri + 'activities/{activityid}/tracking/elements/{elementuuid}/track',

public/javascript/redmic/modules/map/layer/_PublishInfo.js

+3 −4
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ define([ 


		_chkLayerInfoIsMine: function(res) {



			return this.queryable && res.body && res.body.target === this.infoTarget &&

				res.body.requesterId === this.getOwnChannel();

			return this.queryable && res.target === this.infoTarget && res.requesterId === this.getOwnChannel();

		},



		_subPublishInfoMapClicked: function(response) {
@@ -130,9 +129,9 @@ define([ 
			this._requestLayerInfo(response);

		},



		_subInfoAvailable: function(res) {

		_subInfoAvailable: function(response) {



			this._processLayerInfo(res.body.data);

			this._processLayerInfo(response.res.data);

		},



		_getLayerInfoToPublish: function(res) {