Commit 3a34ad96 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Muestra atribución en mapa, corrige usos de capas 

Se muestra dinámicamente la procedencia y un enlace para las capas base
cargadas en el mapa, en reconocimiento a los proveedores.

Corrige capas usadas en minimapa y filtro geográfico.
parent cb7f22c6

public/javascript/redmic/modules/map/LeafletImpl.js

+9 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ define([ 
				doubleClickZoom: false,

				minZoom: this.minZoom,

				maxZoom: this.maxZoom,

				attributionControl: false,

				attributionControl: true,

				worldCopyJump: true

			});

			this.map.once("load", lang.hitch(this, this._afterMapLoaded));
@@ -251,7 +251,13 @@ define([ 
				return;

			}



			var baseMap = OpenLayers.get(this.defaultBaseLayer).instance,

			var defaultLayerName = this.baseLayers[this.defaultBaseLayer];



			if (defaultLayerName instanceof Array) {

				defaultLayerName = defaultLayerName[0];

			}



			var baseMap = OpenLayers.get(defaultLayerName).instance,

				miniMapConfig = {

					position: "topright",

					collapsedWidth: 36,
@@ -267,7 +273,7 @@ define([ 


			miniMap.addTo(this.map);



			// Workaround for https://github.com/Norkart/Leaflet-MiniMap/issues/114

			// TODO workaround for https://github.com/Norkart/Leaflet-MiniMap/issues/114

			on(miniMap._miniMap._container, "click", function(evt) { evt.stopPropagation(); });

		},

public/javascript/redmic/modules/search/GeographicImpl.js

+6 −1
Original line number Diff line number Diff line
@@ -29,7 +29,12 @@ define([ 


		_initialize: function() {



			this.mapSearch = new Map({});

			// TODO este redmic-widget de mapa es contraproducente, debería usarse el módulo mapa en su lugar

			this.mapSearch = new Map({

				urlMapBasemap: "https://idecan3.grafcan.es/ServicioWMS/MTI",

				layersBasemap: 'WMS_MTI',

				formatBasemap: 'image/png'

			});



			this.mapSearch.on("queryMap", lang.hitch(this, this._onNewSearch));

			this.mapSearch.placeAt(this.domNode);