Commit 162eaa59 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Mejora visualización de mapa con contenido 

Controla algunos tamaños problemáticos de pantalla y limpia catálogo de
capas en atlas.

Actualiza módulos TabsDisplayer y Map cuando se muestran de nuevo
directamente o algún ancestro (corrige problemas de resize).

Aplica icono de sección de atlas a la pestaña del catálogo de capas.

Actualiza submódulo de estilos.
parent 361b6ce8

public/javascript/app/designs/textSearchList/layout/BasicAndButtonsAndKeypadTopZone.js

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
define([

	'app/designs/base/_Layout'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'put-selector/put'

], function(

	_Layout

	, declare

	, lang

	, put

) {



	return declare(_Layout, {

		//	summary:

		//		Layout para vistas que contienen un buscador de texto y un listado.



		constructor: function(args) {



			this.config = {

				layoutAdditionalClasses: 'layoutTextSearchListDesign',

				classByList: '.noBorderList'

			};



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

		},



		postCreate: function() {



			this.inherited(arguments);



			this.topNode = put(this.domNode, "div.topZone");



			this._titleNode = put(this.topNode, "div.titleZone");



			this._setTitle(this.title);



			var optionNode = put(this.topNode, "div.optionZone");



			this.buttonsNode = put(optionNode, "div.buttonsZone");



			this.textSearchNode = put(this.topNode, "div.textSearchZone");



			this.keypadZoneNode = put(this.topNode, "div.keypadZone");



			this.centerNode = put(this.domNode, "div.centerZone");



			this.listNode = put(this.centerNode, "div.listZone" + this.classByList);

		}

	});

});

public/javascript/app/designs/textSearchList/main/ServiceOGC.js

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ define([ 
	, "app/designs/base/_Main"

	, "app/designs/base/_ServiceOGC"

	, "app/designs/textSearchList/Controller"

	, "app/designs/textSearchList/layout/BasicAndButtonsAndKeypadTopZone"

	, "app/designs/textSearchList/layout/BasicTopZone"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "redmic/modules/browser/HierarchicalImpl"

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

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ define([ 


			this._publish(addTabChannel, {

				title: this.i18n.layersCatalog,

				iconClass: 'fa fa-list-ul',

				iconClass: 'fr fr-world',

				channel: this.catalogView.getChannel()

			});

public/javascript/redmic/modules/layout/TabsDisplayer.js

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ define([ 
		_setOwnCallbacksForEvents: function() {



			this._onEvt('RESIZE', lang.hitch(this, this._onMeOrAncestorResized));

			this._onEvt('ME_OR_ANCESTOR_SHOWN', lang.hitch(this, this._onMeOrAncestorShown));

		},



		postCreate: function() {
@@ -140,6 +141,11 @@ define([ 
			this._resizeTabs();

		},



		_onMeOrAncestorShown: function(req) {



			this._resizeTabs();

		},



		_afterShow: function() {



			this._resizeTabs();

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

+3 −2
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ define([ 
	, _LeafletWidgetsManagement

	, _ListenContainers

	, _OverlayLayersManagement

	, Map

	, MapModule

) {



	return declare([Map, _LeafletImplItfc, _LeafletWidgetsManagement, _ListenContainers, _OverlayLayersManagement], {

	return declare([MapModule, _LeafletImplItfc, _LeafletWidgetsManagement, _ListenContainers, _OverlayLayersManagement], {

		//	summary:

		//		Implementación de mapa Leaflet.

		//	description:
@@ -149,6 +149,7 @@ define([ 
			}));



			this._onEvt('RESIZE', lang.hitch(this, this.invalidateSize));

			this._onEvt('ME_OR_ANCESTOR_SHOWN', lang.hitch(this, this.invalidateSize));

			this._onEvt('LAYER_ADDED_TO_PANE', lang.hitch(this, this._onLayerAddedToPane));

			this._onEvt('LAYER_REMOVED_FROM_PANE', lang.hitch(this, this._onLayerRemovedFromPane));

		},