diff --git a/WebContent/js/FigisMap/FigisMap.js b/WebContent/js/FigisMap/FigisMap.js index 152d3bf..1e2872a 100644 --- a/WebContent/js/FigisMap/FigisMap.js +++ b/WebContent/js/FigisMap/FigisMap.js @@ -120,7 +120,8 @@ FigisMap.defaults = { mapSize : 'S', layerFilter : '', layerStyle : '*', - layerStyles : { distribution : 'all_fao_areas_style', intersecting : '*', associated : '*' } + layerStyles : { distribution : 'all_fao_areas_style', intersecting : '*', associated : '*' }, + enableRasterProjection : false }; /** @@ -2288,13 +2289,15 @@ FigisMap.renderer = function(options) { //baselayer var baselayerList = new Array(); - if(projection == 4326 || projection == 900913){ + //@eblondel 09/11/2016 testing raster reprojection by OL3 + if( (FigisMap.defaults.enableRasterProjection && ol.ENABLE_RASTER_REPROJECTION) || projection == 4326 || projection == 900913){ for(var i=0;i 1)? "s" : ""), diff --git a/WebContent/js/firms/firms.js b/WebContent/js/firms/firms.js index 2bdfc4a..2033da4 100644 --- a/WebContent/js/firms/firms.js +++ b/WebContent/js/firms/firms.js @@ -72,14 +72,17 @@ FV.baseMapParams = function() { }; //baselayers - this.base = [{ + var baselayers = FigisMap.defaults.baseLayers.slice(); + baselayers.reverse(); + this.base = baselayers; + /*this.base = [{ cached: true, filter: "", label: "Oceans basemap", layer: FigisMap.fifao.obl, title: "Oceans basemap", type: "base" - }]; + }];*/ // this.associated = [ FigisMap.fifao.rfb ]; this.vectorLayer = {};