Commit 85ef55f6 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Usa estilos de atlas para protocolos WMS y WMS-C 

Recoge la información de estilo definida en los elementos procedentes
del servicio de atlas, para aplicarla a las instancias de capas de mapa
que usan protocolo WMS o WMS-C. Para las demás, se requiere editar su
URL según convenga.
parent 3b0aea51

public/javascript/redmic/modules/atlas/_AtlasLayersManagement.js

+30 −12
Original line number Diff line number Diff line
@@ -101,9 +101,9 @@ define([ 
		_getWmscLayerDefinition: function(atlasLayer, protocol) {



			var layerProps = {

				layers: this._getLayersParamValue(atlasLayer, protocol),

				tiled: true

			};

			lang.mixin(layerProps, this._getWmsOrWmscLayerProps(atlasLayer, protocol));

			lang.mixin(layerProps, this._getCommonLayerProps(atlasLayer, protocol));



			return {
@@ -115,9 +115,8 @@ define([ 


		_getWmsLayerDefinition: function(atlasLayer, protocol) {



			var layerProps = {

				layers: this._getLayersParamValue(atlasLayer, protocol)

			};

			var layerProps = {};

			lang.mixin(layerProps, this._getWmsOrWmscLayerProps(atlasLayer, protocol));

			lang.mixin(layerProps, this._getCommonLayerProps(atlasLayer, protocol));



			return {
@@ -158,21 +157,26 @@ define([ 
			return '&';

		},



		_getCommonLayerProps: function(atlasLayer, protocol) {

		_getWmsOrWmscLayerProps: function(atlasLayer, protocol) {



			return {

				format: this._getFormatParamValue(atlasLayer, protocol),

				transparent: true,

				attribution: this._getLayerAttributionValue(atlasLayer)

			var layerProps = {

				layers: this._getLayersParamValue(atlasLayer, protocol)

			};



			var styles = this._getStylesParamValue(atlasLayer);

			if (styles) {

				layerProps.styles = styles;

			}



			return layerProps;

		},



		_getLayersParamValue: function(atlasLayer, protocol) {



			var params = protocol.params;

			var params = protocol.params || protocol.url;



			if (params) {

				var regex = /layers=([^&]+)&?/ig,

				var regex = /layers?=([^&]+)&?/ig,

					regexExecResults = regex.exec(params),

					layerInParams = regexExecResults && regexExecResults[1];
@@ -184,9 +188,23 @@ define([ 
			return atlasLayer.name;

		},



		_getStylesParamValue: function(atlasLayer) {



			return atlasLayer.styles;

		},



		_getCommonLayerProps: function(atlasLayer, protocol) {



			return {

				format: this._getFormatParamValue(atlasLayer, protocol),

				transparent: true,

				attribution: this._getLayerAttributionValue(atlasLayer)

			};

		},



		_getFormatParamValue: function(atlasLayer, protocol) {



			var params = protocol.params,

			var params = protocol.params || protocol.url,

				availableFormats = atlasLayer.formats,

				format;