Commit ada349cf authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige paso de edición de geometrías 

Este paso del asistente de edición hereda de un diseño pero no lo usaba,
sino que definía sus propios contenedores. Se elimina toda esta
estructura inútil.
parent 449490a5

public/javascript/app/components/steps/AddGeomSiteStep.js

+3 −74
Original line number Diff line number Diff line 
define([

	"app/designs/mapWithSideContent/Controller"

	, "app/designs/mapWithSideContent/layout/MapAndContent"

	, "dijit/layout/ContentPane"

	, "dijit/layout/StackContainer"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/aspect"

	, "redmic/map/OpenLayers"

	, "redmic/modules/map/_LeafletDraw"

	, "redmic/modules/map/layer/WmsLayerImpl"

], function(

	Controller

	, Layout

	, ContentPane

	, StackContainer

	, declare

	, lang

	, aspect

	, OpenLayers

	, _LeafletDraw

	, WmsLayerImpl

) {



	return declare([Layout, Controller], {

		//	summary:

		//		Vista base para añadir geometría.
@@ -34,73 +25,16 @@ define([ 
				mapExts: [_LeafletDraw]

			};



			aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setMainConfigurations));

			aspect.after(this, "_beforeInitialize", lang.hitch(this, this._initializeMain));

			aspect.before(this, "_beforeShow", lang.hitch(this, this._beforeShowStep));



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

		},



		_setMainConfigurations: function() {



			this.batimetriasLayerConfig = this._merge([{

				parentChannel: this.getChannel(),

				layer: OpenLayers.build({

					type: "wms",

					url: "https://atlas.redmic.es/geoserver/el/wms",

					props: {

						layers: ["batimetriaGlobal"],

						format: "image/png",

						transparent: true,

						tiled: true

					}

				})

			}, this.batimetriasLayerConfig || {}]);

		},



		_initializeMain: function() {



			this.batimetriasLayerConfig.mapChannel = this.map.getChannel();



			this.batimetriasLayer = new WmsLayerImpl(this.batimetriasLayerConfig);

		},



		postCreate: function() {



			this.inherited(arguments);



			this._publish(this.map.getChannel("ADD_LAYER"), {

				layer: this.batimetriasLayer,

				layerId: "batimetrias",

				layerLabel: this.i18n.bathymetry,

				optional: true

			});



			this.leftContainer = new ContentPane({

				'class': 'rightZone',

				region: "center"

			});



			this.leftNode = new declare(StackContainer)({

				region: "left",

				'class': "mediumSolidContainer sideStackContainer"

			});



			this.addChild(this.leftNode);



			this.leftNode.addChild(this.leftContainer);



			this._loadForm();

		},



		_beforeShowStep: function() {



			this._publish(this.map.getChannel("SET_CENTER_AND_ZOOM"), {

				center: [28.5, -16.0],

				zoom: 7

			});

		},



		_instanceDataToResult: function(data) {



			this._publish(this.viewForm.getChannel("DATA_TO_RESULT"), {
@@ -108,11 +42,6 @@ define([ 
			});

		},



		_getNodeToShow: function() {



			return this.containerNode;

		},



		_doFlush: function() {



			this._publish(this.viewForm.getChannel("SUBMIT"));
@@ -152,7 +81,7 @@ define([ 
			this._once(this.viewForm.getChannel("SHOWN"), lang.hitch(this, this._onceFormShown));



			this._publish(this.viewForm.getChannel("SHOW"), {

				node: this.leftContainer

				node: this.contentNode

			});

		},