From 828e5e139e5fd8072f8200c5ac174d045ed372ee Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Tue, 16 Mar 2010 22:17:52 +0000
Subject: [PATCH] Correção na inclusão de parâmetros

---
 mashups/openlayers.js.php | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/mashups/openlayers.js.php b/mashups/openlayers.js.php
index 03cc98e..c30d8d1 100644
--- a/mashups/openlayers.js.php
+++ b/mashups/openlayers.js.php
@@ -12,7 +12,7 @@ i3GEOOL = {
 	ol_mma: new OpenLayers.Layer.WMS(
 		"Base cartográfica",
 		"http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map&",
-		{layers:'baseraster',SRS:'EPSG:4291'}
+		{layers:'baseraster',SRS:'EPSG:4291',FORMAT:'image/png'}
 	),
 	ol_wms: new OpenLayers.Layer.WMS.Untiled(
 		"OpenLayers WMS",
@@ -25,7 +25,12 @@ i3GEOOL = {
 		{layers: "landsat7"}
 	),
 	layergrafico: new OpenLayers.Layer.Vector("Edição"),
-	layersIniciais: <?php echo implode(",",$objOpenLayers); ?>,
+	layersIniciais: <?php 
+						if(isset($objOpenLayers) && $objOpenLayers != "")
+						echo implode(",",$objOpenLayers);
+						else
+						echo "''";
+					?>,
 	botoes: <?php echo $botoes; ?>,
 	mapa: new OpenLayers.Map('i3geoMapa', {
 		controls: [
@@ -35,15 +40,21 @@ i3GEOOL = {
 		maxExtent: new OpenLayers.Bounds(<?php echo $maxextent;?>)
 	}),
 	inicia: function(){
+		var alayers = [];
 		i3GEOOL.jpl_wms.setVisibility(false);
 		i3GEOOL.ol_wms.setVisibility(false);
-		i3GEOOL.mapa.addLayers([
-			i3GEOOL.ol_mma,
-			i3GEOOL.ol_wms,
-			i3GEOOL.jpl_wms,
-			i3GEOOL.layersIniciais,
-			i3GEOOL.layergrafico
-		]);	
+		if(i3GEOOL.ol_mma != "")
+		{alayers.push(i3GEOOL.ol_mma);}
+		if(i3GEOOL.ol_wms != "")
+		{alayers.push(i3GEOOL.ol_wms);}
+		if(i3GEOOL.jpl_wms != "")
+		{alayers.push(i3GEOOL.jpl_wms);}
+		if(i3GEOOL.layersIniciais != "")
+		{alayers.push(i3GEOOL.layersIniciais);}
+		if(i3GEOOL.layergrafico != "")
+		{alayers.push(i3GEOOL.layergrafico);}
+		
+		i3GEOOL.mapa.addLayers(alayers);	
 		i3GEOOL.mapa.zoomToMaxExtent();
 		i3GEOOL.coordenadas();	
 		i3GEOOL.criaJanelaBusca();
--
libgit2 0.21.2