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

Merge branch 'dev' into 'master' 

0.12.4

See merge request redmic-project/client/web!24
parents f4e7c563 5e5bc635

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.12.3",

  "version": "0.12.4",

  "author": "Observatorio Ambiental Granadilla",

  "homepage": "https://redmic.es",

  "description": "Integrated marine data repository of Canary Islands - Client",

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

+3 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ define([ 


				ownChannel: "map",



				defaultBaseLayer: "redmic"

				defaultBaseLayer: "ortofoto"

			};



			lang.mixin(this, this.config, args);
@@ -717,10 +717,10 @@ define([ 
		_afterMapLoaded: function() {



			// TODO revisar las capas base

			this._changeBaseLayer(this.defaultBaseLayer);

			//this._changeBaseLayer(this.defaultBaseLayer);

			this._changeBaseLayer("topografico");

			this._changeBaseLayer("ortofoto");

			this._changeBaseLayer(this.defaultBaseLayer);

			//this._changeBaseLayer(this.defaultBaseLayer);

			this._addContainerListeners();

		},