From 28fc52ff80f1eca4afcf9ec699876f8d1a5dcd8a Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Thu, 25 Oct 2012 12:42:19 +0000
Subject: [PATCH] Correção na função de carregamento de javascript

---
 admin/admin.db              | Bin 146432 -> 0 bytes
 admin/js/listatemas.js      |  16 ++++++++--------
 admin/php/menutemas.php     |  40 ++++++++++++++++++++--------------------
 classesjs/i3geo47.js        |   2 +-
 geraminiatura.php           | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------
 interface/googlemaps.phtml  |   2 +-
 interface/minima.htm        |  32 ++++++++++++++++----------------
 interface/ol_parametros.php |  20 ++++++++++----------
 interface/openlayers.htm    |   6 +++---
 interface/openlayers1.htm   |  36 ++++++++++++++++++------------------
 interface/openlayers_t.htm  |  16 ++++++++--------
 interface/zerocal.htm       |  28 ++++++++++++++--------------
 interface/zerocalol.htm     |  42 +++++++++++++++++++++---------------------
 kml.php                     |  25 +++++++++++++------------
 mashups/openlayers.php      |  25 +++++++++++++------------
 ms_criamapa.php             |   3 +--
 ogc.htm                     |  38 +++++++++++++++-----------------------
 ogc.php                     | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------
 18 files changed, 351 insertions(+), 361 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 142bb37..cdc2db9 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/js/listatemas.js b/admin/js/listatemas.js
index cf9ba04..939ef09 100644
--- a/admin/js/listatemas.js
+++ b/admin/js/listatemas.js
@@ -35,7 +35,7 @@ function montaEditorTema(dados)
 			{ label: "Salva", value: "OK", checked: false},
 			{ label: "Cancela", value: "CANCEL", checked: false }
 		]);
-		editorBotoes.on("checkedButtonChange", on_editorCheckBoxChange);	
+		editorBotoes.on("checkedButtonChange", on_editorCheckBoxChange);
 		YAHOO.admin.container.panelEditorTema = new YAHOO.widget.Panel("janela_editor_tema", { fixedcenter:true,close:true,width:"400px", height:"400px",overflow:"auto", visible:false,constraintoviewport:true } );
 		YAHOO.admin.container.panelEditorTema.render();
 		var fecha = function()
@@ -90,19 +90,19 @@ function montaDivTemas(i)
 	ins += "<option value='WMS' ";
 	if (i.tipoa_tema == "WMS"){ins += "selected";}
 	ins += " >WMS<option></select></p>";
-	ins += "<p>Permite acesso via WMS/WFS?<br>";
+	ins += "<p>Permite acesso via WMS/WFS? (n&atilde; restringe em temas do tipo gvSIG)<br>";
 	ins += "<select  id='ogc_tema' >";
 	ins += core_combosimnao(i.ogc_tema);
 	ins += "</select></p>";
-	ins += "<p>Permite o download na aplica&ccedil;&atilde;o datadownload.htm? (n&atilde;o afeta a permiss&atilde;o de download definida no item 'disponibilidade' existente em cada layer)<br>";
+	ins += "<p>Permite o download na aplica&ccedil;&atilde;o datadownload.htm? (n&atilde; afeta temas do tipo gvSIG) (n&atilde;o afeta a permiss&atilde;o de download definida no item 'disponibilidade' existente em cada layer)<br>";
 	ins += "<select  id='download_tema' >";
 	ins += core_combosimnao(i.download_tema);
 	ins += "</select></p>";
-	ins += "<p>Permite acesso via kml?<br>";
+	ins += "<p>Permite acesso via kml? (n&atilde; restringe em temas do tipo gvSIG)<br>";
 	ins += "<select  id='kml_tema' >";
 	ins += core_combosimnao(i.kml_tema);
 	ins += "</select></p>";
-	ins += "<p>Permite acesso via kmz (kml com dados vetoriais)?<br>";
+	ins += "<p>Permite acesso via kmz (kml com dados vetoriais)? (n&atilde; restringe em temas do tipo gvSIG)<br>";
 	ins += "<select  id='kmz_tema' >";
 	ins += core_combosimnao(i.kmz_tema);
 	ins += "</select></p>";
@@ -133,7 +133,7 @@ function atualizaMiniatura(){
   		},
   		failure:core_handleFailure,
   		argument: { foo:"foo", bar:"bar" }
-	}; 
+	};
 	core_makeRequest(sUrl,callback,"GET");
 }
 function gravaDadosTema(id)
@@ -141,7 +141,7 @@ function gravaDadosTema(id)
 	//validacao
 	if($i("kml_tema") && $i("ogc_tema")){
 		if(($i("ogc_tema").value).toLowerCase() == "sim")
-		{$i("kml_tema").value = "SIM";}		
+		{$i("kml_tema").value = "SIM";}
 	}
 	if($i("kml_tema") && $i("kmz_tema")){
 		if(($i("kmz_tema").value).toLowerCase() == "sim")
@@ -190,6 +190,6 @@ function gravaDadosTema(id)
   		},
   		failure:core_handleFailure,
   		argument: { foo:"foo", bar:"bar" }
-	}; 
+	};
 	core_makeRequest(sUrl,callback,"POST");
 }
\ No newline at end of file
diff --git a/admin/php/menutemas.php b/admin/php/menutemas.php
index 3cf3b0a..ebd356a 100644
--- a/admin/php/menutemas.php
+++ b/admin/php/menutemas.php
@@ -481,12 +481,11 @@ switch (strtoupper($funcao))
 	case "ALTERATEMAS":
 		//$r ser&aacute; igual ao novo id criado, no caso de inser&ccedil;&atilde;o de um novo tema
 		$r = alteraTemas();
-		if($id == "")
-		{
+		if($id == ""){
 			retornaJSON($r);
 		}
-		else
-		{retornaJSON(pegaDados("select * from ".$esquemaadmin."i3geoadmin_temas where id_tema = $id"));
+		else{
+			retornaJSON(pegaDados("select * from ".$esquemaadmin."i3geoadmin_temas where id_tema = $id"));
 		}
 		exit;
 		break;
@@ -1125,26 +1124,27 @@ function alteraTemas()
 			$q = $dbh->query($sql,PDO::FETCH_ASSOC);
 			$resultado = $q->fetchAll();
 			$mapfile = $resultado[0]["codigo_tema"];
-			$mapfile = $locaplic."/temas/".$mapfile.".map";
-
-			if($mapa = @ms_newMapObj($mapfile))
-			{
-				$mapa = ms_newMapObj($mapfile);
-				$numlayers = $mapa->numlayers;
-				for ($i=0;$i < $numlayers;$i++)
+			if(file_exists($locaplic."/temas/".$mapfile.".map")){
+				$mapfile = $locaplic."/temas/".$mapfile.".map";
+				if($mapa = @ms_newMapObj($mapfile))
 				{
-					$layer = $mapa->getlayer($i);
-					$layer->setmetadata("permitedownload",strtolower($download));
-					$layer->setmetadata("permiteogc",strtolower($ogc));
-					$layer->setmetadata("permitekml",strtolower($kml));
-					$layer->setmetadata("permitekmz",strtolower($kmz));
-					if(count($nomes) == 1)
+					$mapa = ms_newMapObj($mapfile);
+					$numlayers = $mapa->numlayers;
+					for ($i=0;$i < $numlayers;$i++)
 					{
-						$layer->setmetadata("tema",$nomeo);
+						$layer = $mapa->getlayer($i);
+						$layer->setmetadata("permitedownload",strtolower($download));
+						$layer->setmetadata("permiteogc",strtolower($ogc));
+						$layer->setmetadata("permitekml",strtolower($kml));
+						$layer->setmetadata("permitekmz",strtolower($kmz));
+						if(count($nomes) == 1)
+						{
+							$layer->setmetadata("tema",$nomeo);
+						}
 					}
+					$mapa->save($mapfile);
+					removeCabecalho($mapfile);
 				}
-				$mapa->save($mapfile);
-				removeCabecalho($mapfile);
 			}
 		}
 		else
diff --git a/classesjs/i3geo47.js b/classesjs/i3geo47.js
index f58b9fd..0ed59d3 100644
--- a/classesjs/i3geo47.js
+++ b/classesjs/i3geo47.js
@@ -58,7 +58,7 @@ $i = function(id)
 	for (i = 0; i < scripts.length; i++) {
 		var src = scripts[i].getAttribute('src');
 		if (src) {
-			var index = src.lastIndexOf("i3geo.js");
+			var index = src.lastIndexOf("i3geo47.js");
 			// is it found, at the end of the URL?
 			if ((index > -1) && (index + "i3geo47.js".length == src.length)) {
 				scriptLocation = src.slice(0, -"i3geo47.js".length);
diff --git a/geraminiatura.php b/geraminiatura.php
index 774ecf8..329a6b2 100644
--- a/geraminiatura.php
+++ b/geraminiatura.php
@@ -142,12 +142,17 @@ function verificaMiniatura($map,$tipo,$admin=false)
 	$tema = "";
 	$map = str_replace("\\","/",$map);
 	$map = basename($map);
-	if (file_exists($locaplic.'/temas/'.$map))
-	{$tema = $locaplic.'/temas/'.$map;}
-	if (file_exists($locaplic.'/temas/'.$map.'.map'))
-	{$tema = $locaplic.'/temas/'.$map.".map";}
-	if ($tema != "")
-	{
+	$extensao = ".map";
+	if (file_exists($locaplic.'/temas/'.$map)){
+		$tema = $locaplic.'/temas/'.$map;
+	}
+	else{
+		if (file_exists($locaplic.'/temas/'.$map.'.gvp')){
+			$extensao = ".gvp";
+		}
+		$tema = $locaplic.'/temas/'.$map.$extensao;
+	}
+	if ($tema != ""){
 		if(isset($base) && $base != ""){
 			if(file_exists($base))
 			{$f = $base;}
@@ -158,13 +163,12 @@ function verificaMiniatura($map,$tipo,$admin=false)
 				exit;
 			}
 		}
-		else
-		{
+		else{
 			$f = "";
-			if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
-			{$f = $locaplic."/aplicmap/geral1windowsv".$versao.".map";}
-			else
-			{
+			if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){
+				$f = $locaplic."/aplicmap/geral1windowsv".$versao.".map";
+			}
+			else{
 				if($f == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){
 					$f = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map";
 				}
@@ -174,53 +178,62 @@ function verificaMiniatura($map,$tipo,$admin=false)
 				if($f == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
 					$f = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map";
 				}
-				if($f == "")
-				{$f = $locaplic."/aplicmap/geral1v".$versao.".map";}
+				if($f == ""){
+					$f = $locaplic."/aplicmap/geral1v".$versao.".map";
+				}
 			}
 		}
 		$mapa = ms_newMapObj($f);
-		if(@ms_newMapObj($tema))
-		{$nmapa = ms_newMapObj($tema);}
-		else
-		{
-			echo "erro no arquivo $tema <br>";
-			return;
-		}
-		$dados = "";
-		$numlayers = $nmapa->numlayers;
-		for ($i=0;$i < $numlayers;$i++)
-		{
-			$layern = $nmapa->getlayer($i);
-			$layern->set("status",MS_DEFAULT);
-			ms_newLayerObj($mapa, $layern);
-			autoClasses($layern,$mapa,$locaplic);
-			if ($layern->data == "")
-			{$dados = $layern->connection;}
-			else
-			{$dados = $layern->data;}
-			$pegarext = $teman;
-		}
-		if (isset($postgis_mapa))
-		{
-			if ($postgis_mapa != "")
-			{
-				$numlayers = $mapa->numlayers;
-				for ($i=0;$i < $numlayers;++$i)
-				{
-					$layer = $mapa->getlayer($i);
-					if ($layer->connectiontype == MS_POSTGIS)
-					{
-						if ($layer->connection == " ")
-						{
-							$layer->set("connection",$postgis_mapa);
+		if($extensao == ".map"){
+			if(@ms_newMapObj($tema)){
+				$nmapa = ms_newMapObj($tema);
+			}
+			else{
+				echo "erro no arquivo $tema <br>";
+				return;
+			}
+			$dados = "";
+			$numlayers = $nmapa->numlayers;
+			for ($i=0;$i < $numlayers;$i++){
+				$layern = $nmapa->getlayer($i);
+				$layern->set("status",MS_DEFAULT);
+				ms_newLayerObj($mapa, $layern);
+				autoClasses($layern,$mapa,$locaplic);
+				if ($layern->data == ""){
+					$dados = $layern->connection;
+				}
+				else{
+					$dados = $layern->data;
+				}
+				$pegarext = $teman->name;
+			}
+			if (isset($postgis_mapa)){
+				if ($postgis_mapa != ""){
+					$numlayers = $mapa->numlayers;
+					for ($i=0;$i < $numlayers;++$i){
+						$layer = $mapa->getlayer($i);
+						if ($layer->connectiontype == MS_POSTGIS){
+							if ($layer->connection == " "){
+								$layer->set("connection",$postgis_mapa);
+							}
 						}
 					}
 				}
 			}
+			zoomTemaMiniatura($pegarext,$mapa);
 		}
-		zoomTemaMiniatura($pegarext,$mapa);
-		if ($tipo == "mini"  || $tipo == "todos")
-		{
+		if($extensao == ".gvp"){
+			include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php");
+			$gm = new gvsig2mapfile($tema);
+			$gvsigview = $gm->getViewsNames();
+			$gvsigview = $gvsigview[0];
+			$dataView = $gm->getViewData($gvsigview);
+			$next = $dataView["extent"];
+			$ext = $mapa->extent;
+			$ext->setextent($next[0],$next[1],$next[2],$next[3]);
+			$mapa = $gm->addLayers($mapa,$gvsigview,$dataView["layerNames"]);
+		}
+		if ($tipo == "mini"  || $tipo == "todos"){
 			$mapa->setsize(50,50);
 			$sca = $mapa->scalebar;
 			$sca->set("status",MS_OFF);
@@ -230,8 +243,7 @@ function verificaMiniatura($map,$tipo,$admin=false)
 			$weboM = $mapa->web;
 			$urlM = $weboM->imageurl."/".$map;
 		}
-		if ($tipo == "grande"  || $tipo == "todos")
-		{
+		if ($tipo == "grande"  || $tipo == "todos"){
 		 	$mapa->setsize(300,300);
 			$sca = $mapa->scalebar;
 			$sca->set("status",MS_OFF);
@@ -241,23 +253,21 @@ function verificaMiniatura($map,$tipo,$admin=false)
 			$weboG = $mapa->web;
 			$urlG = $weboG->imageurl."/".$map;
 		}
-		if($tipo=="mini" || $tipo == "todos")
-		{
-			if($objImagemM->imagepath == "")
-			{echo "Erro IMAGEPATH vazio";return;}
+		if($tipo=="mini" || $tipo == "todos"){
+			if($objImagemM->imagepath == ""){
+				echo "Erro IMAGEPATH vazio";return;
+			}
 			$nomecM = ($objImagemM->imagepath).$map.".mini.png";
 			$objImagemM->saveImage($nomecM);
 		}
-		if($tipo=="grande" || $tipo == "todos")
-		{
-			if($objImagemG->imagepath == "")
-			{echo "Erro IMAGEPATH vazio";return;}
+		if($tipo=="grande" || $tipo == "todos"){
+			if($objImagemG->imagepath == ""){
+				echo "Erro IMAGEPATH vazio";return;
+			}
 			$nomecG = ($objImagemG->imagepath).$map.".grande.png";
 			$objImagemG->saveImage($nomecG);
 		}
-
-		if($admin == false)
-		{
+		if($admin == false){
 			if($tipo=="mini" || $tipo == "todos")
 			{echo "<br><img src='".$urlM.".mini.png' /><br>";}
 			if($tipo=="grande" || $tipo == "todos")
@@ -266,8 +276,7 @@ function verificaMiniatura($map,$tipo,$admin=false)
 		//
 		//copia a imagem
 		//
-		if($admin == true)
-		{
+		if($admin == true){
 			$dir = $locaplic."/temas/miniaturas";
 			$mini = $dir."/".$map.".map.mini.png";
 			$grande = $dir."/".$map.".map.grande.png";
diff --git a/interface/googlemaps.phtml b/interface/googlemaps.phtml
index 9cce7e7..adea3d7 100644
--- a/interface/googlemaps.phtml
+++ b/interface/googlemaps.phtml
@@ -106,7 +106,7 @@ include_once("../ms_configura.php");
 </div>
 
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript" src="../classesjs/i3geo.js"></script>
+<script type="text/javascript" src="../classesjs/i3geo47.js"></script>
 <script type="text/javascript">
 /*
 Title: Google Maps
diff --git a/interface/minima.htm b/interface/minima.htm
index 7b75a24..8c7232b 100644
--- a/interface/minima.htm
+++ b/interface/minima.htm
@@ -5,9 +5,9 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <title>i3Geo - Mapa interativo</title>
 
-<!-- Leitura dos programas javaScript e estilos individualmente. Pode-se ler os 
+<!-- Leitura dos programas javaScript e estilos individualmente. Pode-se ler os
 arquivos n&atilde;o compactados, bastando substituir por i3geonaocompacto -->
-<script type="text/javascript" src="../classesjs/i3geo.js"></script>
+<script type="text/javascript" src="../classesjs/i3geo47.js"></script>
 <script type="text/javascript" src="../pacotes/openlayers/OpenLayers29.js.php"></script>
 
 </head>
@@ -33,7 +33,7 @@ arquivos n&atilde;o compactados, bastando substituir por i3geonaocompacto -->
     <div id=corpoMapa style="background-image:url('../imagens/i3geo1bw.jpg');"></div>
    </td></tr>
   </table>
-  
+
  </td>
  </tr>
 <tr>
@@ -59,15 +59,15 @@ arquivos n&atilde;o compactados, bastando substituir por i3geonaocompacto -->
 <tr style="border:0px"><td colspan=3 style="background-image:url('../imagens/visual/default/rodape.png');height:10px"></td></tr>
 </table>
 </center>
-<div id=barraDeBotoes1 style='display:none'> 
+<div id=barraDeBotoes1 style='display:none'>
    <table title="zoom" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="zoom" alt="" src="../imagens/branco.gif" id='zoomli'/></td></tr></table>
    <table title="desloca" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="desloca" alt="" src="../imagens/branco.gif" ID='pan'/></td></tr></table>
    <table title="info" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="info" alt="" src="../imagens/branco.gif" id='identifica'/></td></tr></table>
-   <table title="geral" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="geral" alt="" src="../imagens/branco.gif" ID='zoomtot'/></td></tr></table> 
+   <table title="geral" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="geral" alt="" src="../imagens/branco.gif" ID='zoomtot'/></td></tr></table>
    <table title="extensao" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img  title="extensao" alt="" src="../imagens/branco.gif" id="exten"/></td></tr></table>
-   <table title="mede" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="mede" alt="" src="../imagens/branco.gif" id='mede'/></td></tr></table> 
-   <table title="area" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="area" alt="" src="../imagens/branco.gif" id='area'/></td></tr></table>   
-   <table title="imprimir" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="imprimir" alt="" src="../imagens/branco.gif" id='imprimir'/></td></tr></table>   
+   <table title="mede" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="mede" alt="" src="../imagens/branco.gif" id='mede'/></td></tr></table>
+   <table title="area" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="area" alt="" src="../imagens/branco.gif" id='area'/></td></tr></table>
+   <table title="imprimir" style="width:100%"><caption style="text-align:center">&nbsp;</caption><tr><td style='background-color:rgb(250,250,250);'><img title="imprimir" alt="" src="../imagens/branco.gif" id='imprimir'/></td></tr></table>
 </div>
 <script type="text/javascript">
 /*
@@ -84,18 +84,18 @@ i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i
 
 i3GEO.Interface.ATUAL = "openlayers";
 i3GEO.Interface.IDCORPO = "contemImg";
-i3GEO.configura.diminuixN = 20
+i3GEO.configura.diminuixN = 20;
 
 i3GEO.Interface.openlayers.GADGETS = {
 		PanZoomBar:true,
 		PanZoom:false,
 		LayerSwitcher:false,
 		ScaleLine:true,
-		OverviewMap:false	
+		OverviewMap:false
 	};
 i3GEO.Interface.openlayers.TILES = true;
 
-i3GEO.cria()
+i3GEO.cria();
 i3GEO.barraDeBotoes.INCLUIBOTAO = {
 		zoomli: true,
 		pan: true,
@@ -124,14 +124,14 @@ i3GEO.Interface.BARRABOTOESLEFT = 50;
 i3GEO.Interface.BARRABOTOESTOP = 10;
 i3GEO.barraDeBotoes.AUTO = true;
 i3GEO.barraDeBotoes.AUTOALTURA = false;
-i3GEO.barraDeBotoes.PERMITEFECHAR = false
-i3GEO.barraDeBotoes.ATIVAMENUCONTEXTO = false
-i3GEO.barraDeBotoes.COMPORTAMENTO = "laranja"
-i3GEO.idioma.IDSELETOR = "seletorIdiomas"
+i3GEO.barraDeBotoes.PERMITEFECHAR = false;
+i3GEO.barraDeBotoes.ATIVAMENUCONTEXTO = false;
+i3GEO.barraDeBotoes.COMPORTAMENTO = "laranja";
+i3GEO.idioma.IDSELETOR = "seletorIdiomas";
 i3GEO.Interface.ATIVAMENUCONTEXTO = false;
 i3GEO.arvoreDeTemas.TIPOBOTAO = "radio";
 i3GEO.arvoreDeTemas.ATIVATEMAIMEDIATO = true;
-OpenLayers.ImgPath = "../pacotes/openlayers/img/"
+OpenLayers.ImgPath = "../pacotes/openlayers/img/";
 i3GEO.inicia();
 </script>
 </body>
diff --git a/interface/ol_parametros.php b/interface/ol_parametros.php
index 98f3218..a5c9114 100644
--- a/interface/ol_parametros.php
+++ b/interface/ol_parametros.php
@@ -56,7 +56,7 @@
 						<!-- aqui ser&aacute; inclu&iacute;do o gadget que mostra a coordenada geogr&aacute;fica da posi&ccedil;&atilde;o do mouse -->
 						<div id=localizarxy style="text-align:left;font-size:10px;display:inline-table"></div>
 					</td>
-					<!-- aqui ser&atilde;o inclu&iacute;das as bandeiras que permitem a troca de idioma -->	  
+					<!-- aqui ser&atilde;o inclu&iacute;das as bandeiras que permitem a troca de idioma -->
 					<td class=tdbranca  >
 						<div id=seletorIdiomas ></div>
 					</td>
@@ -92,7 +92,7 @@
 			<div id='guia1obj' style='display:none;' >
 				<!-- Esta div acrescenta a op&ccedil;&atilde;o de busca r&aacute;pida, caso vc queira coloc&aacute;-la em um lugar espec&iacute;fico -->
 				<div style='left:5px;top:10px;' id=buscaRapida ></div>
-				<!--	Esta div acrescenta a lista de propriedades do mapa -->	
+				<!--	Esta div acrescenta a lista de propriedades do mapa -->
 				<div id=listaPropriedades style='top:15px;' ></div>
 				<!--	Esta div acrescenta a lista de de camadas do tipo 'baselayers' espec&iacute;ficas da interface Openlayers. Veja tamb&eacute;m a op&ccedil;&atilde;o i3GEO.Interface.openlayers.GADGETS.LayerSwitcher -->
 				<div id=listaLayersBase style='top:15px;'></div>
@@ -106,7 +106,7 @@
 	</div>
 </div>
 
-<script src="../classesjs/i3geo.js"></script>
+<script src="../classesjs/i3geo47.js"></script>
 <script src="../pacotes/openlayers/OpenLayers211.js.php"></script>
 <!-- estilo necess&aacute;rio para a ferramenta de edi&ccedil;&atilde;o -->
 <style>
@@ -114,7 +114,7 @@
 	background-image:url(../mashups/openlayers.png);
 	background-repeat:no-repeat;
 	float:right;
-	right: 0px;	
+	right: 0px;
 	height:29px;
 	margin:2px;
 	width:29px;
@@ -134,7 +134,7 @@ File: i3geo/interface/ol_parametros.htm
 //parametros URL
 //
 var parametrosURL = {
-	editorvetorial: <?php 
+	editorvetorial: <?php
 		if(!empty($parurl["editorvetorial"]))
 		{echo $parurl["editorvetorial"];}
 		else
@@ -151,7 +151,7 @@ i3GEO.Interface.openlayers.GADGETS = {
 		PanZoom:false,
 		LayerSwitcher:true,
 		ScaleLine:true,
-		OverviewMap:false	
+		OverviewMap:false
 	};
 i3GEO.Interface.openlayers.TILES = true;
 i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}'
@@ -177,25 +177,25 @@ OpenLayers.ImgPath = "../pacotes/openlayers/img/";
 //adiciona camadas que podem ser ativadas como fundo do mapa
 //
 (function(){
-	var oce = new OpenLayers.Layer.ArcGIS93Rest( 
+	var oce = new OpenLayers.Layer.ArcGIS93Rest(
 		"ESRI Ocean Basemap",
 		"http://server.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer/export",
 		{format:"jpeg"},
 		{isBaseLayer:true,visibility:false}
 	);
-	var ims = new OpenLayers.Layer.ArcGIS93Rest( 
+	var ims = new OpenLayers.Layer.ArcGIS93Rest(
 		"ESRI Imagery World 2D",
 		"http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/export",
 		{format:"jpeg"},
 		{isBaseLayer:true,visibility:false}
 	);
-	var wsm = new OpenLayers.Layer.ArcGIS93Rest( 
+	var wsm = new OpenLayers.Layer.ArcGIS93Rest(
 		"ESRI World Street Map",
 		"http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_StreetMap_World_2D/MapServer/export",
 		{format:"jpeg"},
 		{isBaseLayer:true,visibility:false}
 	);
-	var bra = new OpenLayers.Layer.WMS( 
+	var bra = new OpenLayers.Layer.WMS(
 		"Base carto MMA",
 		"http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map",
 		{layers:"baseraster",srs:"EPSG:4618",format:"image/png",isBaseLayer:false},
diff --git a/interface/openlayers.htm b/interface/openlayers.htm
index 977d659..886193f 100644
--- a/interface/openlayers.htm
+++ b/interface/openlayers.htm
@@ -104,7 +104,7 @@
 	</div>
 </div>
 
-<script src="../classesjs/i3geo.js"></script>
+<script src="../classesjs/i3geo47.js"></script>
 <script src="../pacotes/openlayers/OpenLayers211.js.php"></script>
 <style>
 .olControlEditingToolbar1 div {
@@ -176,7 +176,7 @@ i3GEO.Interface.openlayers.TILES = true;
 //
 //desabilita o item que abre a interface "default" do menu suspenso
 //
-i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}'
+i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}';
 
 /*
 Após a cria&ccedil;&atilde;o, &eacute; criado o objeto i3geoOL que corresponde ao objeto map da API do OpenLayers.
@@ -290,7 +290,7 @@ i3GEO.finaliza = function(){
 	if($i("i3GEOlogoMarca"))
 	{$i("i3GEOlogoMarca").style.display = "none";}
 	i3GEO.mapa.insereDobraPagina("googlemaps","../imagens/dobragooglemaps.png");
-}
+};
 i3GEO.arvoreDeTemas.OPCOESADICIONAIS.navegacaoDir = true;
 //OpenLayers.DOTS_PER_INCH = 96
 //i3GEO.configura.sid = "";
diff --git a/interface/openlayers1.htm b/interface/openlayers1.htm
index 0ecf8e5..e514364 100644
--- a/interface/openlayers1.htm
+++ b/interface/openlayers1.htm
@@ -10,7 +10,7 @@
 	background-image:url(../mashups/openlayers.png);
 	background-repeat:no-repeat;
 	float:right;
-	right: 0px;	
+	right: 0px;
 	height:29px;
 	margin:2px;
 	width:29px;
@@ -67,7 +67,7 @@
   <div id='guia1obj' >
 	<!-- Esta div acrescenta a op&ccedil;&atilde;o de busca r&aacute;pida, caso vc queira coloc&aacute;-la em um lugar espec&iacute;fico -->
 	<div style='left:5px;top:10px;' id=buscaRapida ></div>
-	<!--	Esta div acrescenta a lista de propriedades do mapa -->	
+	<!--	Esta div acrescenta a lista de propriedades do mapa -->
   	<div id=listaPropriedades style='top:15px;' ></div>
 	<!--	Esta div acrescenta a lista de de camadas do tipo 'baselayers' espec&iacute;ficas da interface Openlayers. Veja tamb&eacute;m a op&ccedil;&atilde;o i3GEO.Interface.openlayers.GADGETS.LayerSwitcher -->
   	<div id=listaLayersBase style='top:15px;'></div>
@@ -75,12 +75,12 @@
   	<div id=listaTemas style='top:15px;'></div>
   </div>
 
- 	<!-- se vc quiser colocar a arvore de adi&ccedil;&atilde;o de temas em um lugar espec&iacute;fico, 
+ 	<!-- se vc quiser colocar a arvore de adi&ccedil;&atilde;o de temas em um lugar espec&iacute;fico,
 	use o div abaixo, caso contr&aacute;rio, a &aacute;rvore ser&aacute; colocada na guia definida em objmapa.guiaMenu, por default a guia2
   	<div id=arvoreAdicionaTema style='top:25px;' ></div>
   	<div id=outrasOpcoesAdiciona style='top:25px;' ></div>
-  	-->	
-  
+  	-->
+
   <div id='guia2obj' style='display:none;'>Aguarde...<img alt="" src="../imagens/branco.gif" width=248 /></div>
   <div id='guia4obj' style='display:none;text-align:left'><div id='legenda' style='text-align:left'></div></div>
   <div id='guia5obj' style='display:none;text-align:left'><div id='banners' style='overflow:auto;text-align:left'>Aguarde...</div></div>
@@ -117,7 +117,7 @@
 		<!-- aqui ser&aacute; inclu&iacute;do o gadget que mostra a coordenada geogr&aacute;fica da posi&ccedil;&atilde;o do mouse -->
 		<div id=localizarxy style="text-align:left;font-size:10px;display:inline-table">Aguarde...</div>
 	  </td>
- 	  <!-- aqui ser&atilde;o inclu&iacute;das as bandeiras que permitem a troca de idioma -->	  
+ 	  <!-- aqui ser&atilde;o inclu&iacute;das as bandeiras que permitem a troca de idioma -->
 	  <td class=tdbranca  ><div id=seletorIdiomas ></div></td>
 	  <!--
 		A op&ccedil;&atilde;o de localiza&ccedil;&atilde;o 'onde estou?' baseia-se na identifica&ccedil;&atilde;o do IP do usu&aacute;rio. Para
@@ -158,7 +158,7 @@
 	</tr>
 </table>
 
-<script src="../classesjs/i3geo.js"></script>
+<script src="../classesjs/i3geo47.js"></script>
 <script src="../pacotes/openlayers/OpenLayers211.js.php"></script>
 <script>
 /*
@@ -181,10 +181,10 @@ Para definir quais bot&otilde;es das barras de ferramentas ser&atilde;o inclu&ia
 */
 /*
 	Indica a localiza&ccedil;&atilde;o correta do i3geo.
-	
+
 	&Eacute; utilizada para identificar o local correto onde est&atilde;o os programas em php que s&atilde;o utilizados.
-	
-	Se n&atilde;o for definida, o i3Geo tentar&aacute; encontrar o local automaticamente com base na tag javascript 
+
+	Se n&atilde;o for definida, o i3Geo tentar&aacute; encontrar o local automaticamente com base na tag javascript
 */
 //i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";
 /*
@@ -204,14 +204,14 @@ i3GEO.Interface.openlayers.GADGETS = {
 		PanZoom:false,
 		LayerSwitcher:true,
 		ScaleLine:true,
-		OverviewMap:false	
+		OverviewMap:false
 	};
 i3GEO.Interface.openlayers.TILES = true;
 
 //
 //desabilita o item que abre a interface "default" do menu suspenso
 //
-i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}'
+i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}';
 
 /*
 Após a cria&ccedil;&atilde;o, &eacute; criado o objeto i3geoOL que corresponde ao objeto map da API do OpenLayers.
@@ -260,38 +260,38 @@ OpenLayers.ImgPath = "../pacotes/openlayers/img/";
 //adiciona camadas que podem ser ativadas como fundo do mapa
 //
 (function(){
-	var oce = new OpenLayers.Layer.ArcGIS93Rest( 
+	var oce = new OpenLayers.Layer.ArcGIS93Rest(
 		"ESRI Ocean Basemap",
 		"http://server.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer/export",
 		{format:"jpg"},
 		{isBaseLayer:true,visibility:false}
 	);
-	var ims = new OpenLayers.Layer.ArcGIS93Rest( 
+	var ims = new OpenLayers.Layer.ArcGIS93Rest(
 		"ESRI Imagery World 2D",
 		"http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/export",
 		{},
 		{isBaseLayer:true,visibility:false}
 	);
-	var wsm = new OpenLayers.Layer.ArcGIS93Rest( 
+	var wsm = new OpenLayers.Layer.ArcGIS93Rest(
 		"ESRI World Street Map",
 		"http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_StreetMap_World_2D/MapServer/export",
 		{},
 		{isBaseLayer:true,visibility:false}
 	);
-	var bra = new OpenLayers.Layer.WMS( 
+	var bra = new OpenLayers.Layer.WMS(
 		"Base carto MMA",
 		"http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map",
 		{layers:"baseraster",srs:"EPSG:4618",format:"image/png",isBaseLayer:false},
 		{isBaseLayer:true,visibility:false}
 	);
 	/*
-	var osm = new OpenLayers.Layer.WMS( 
+	var osm = new OpenLayers.Layer.WMS(
 		"Open Street Map",
 		"http://full.wms.geofabrik.de/std/demo_key",
 		{layers:""},
 		{isBaseLayer:true,visibility:false}
 	);
-	*/	
+	*/
 	i3GEO.Interface.openlayers.LAYERSADICIONAIS = [oce,ims,wsm,bra];
 })();
 //
diff --git a/interface/openlayers_t.htm b/interface/openlayers_t.htm
index eb2973e..bc909b2 100644
--- a/interface/openlayers_t.htm
+++ b/interface/openlayers_t.htm
@@ -36,7 +36,7 @@
 				<div id=guia2 class=guia >Cat&aacute;logo</div>
 				<div id=guia6 class=guia >+</div>
 			</div>
-		</td> 
+		</td>
 	</tr>
 	<tr>
 		<td style="vertical-align:top;border-width:0px;">
@@ -69,7 +69,7 @@
 </div>
 
 <div id=seletorIdiomas style="position:absolute;top:15px;left:5px;z-index:20000" ></div>
-<script src="../classesjs/i3geo.js"></script>
+<script src="../classesjs/i3geo47.js"></script>
 <!--<script src="../pacotes/openlayers/OpenLayers29.js.php"></script>-->
 <script src="../pacotes/openlayers/OpenLayers211.js.php"></script>
 <script>
@@ -93,10 +93,10 @@ Para definir quais bot&otilde;es das barras de ferramentas ser&atilde;o inclu&ia
 */
 /*
 	Indica a localiza&ccedil;&atilde;o correta do i3geo.
-	
+
 	&Eacute; utilizada para identificar o local correto onde est&atilde;o os programas em php que s&atilde;o utilizados.
-	
-	Se n&atilde;o for definida, o i3Geo tentar&aacute; encontrar o local automaticamente com base na tag javascript 
+
+	Se n&atilde;o for definida, o i3Geo tentar&aacute; encontrar o local automaticamente com base na tag javascript
 */
 //i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";
 /*
@@ -117,7 +117,7 @@ i3GEO.Interface.openlayers.GADGETS = {
 	PanZoom:false,
 	LayerSwitcher:false,
 	ScaleLine:false,
-	OverviewMap:false	
+	OverviewMap:false
 };
 i3GEO.Interface.openlayers.TILES = true;
 
@@ -181,13 +181,13 @@ OpenLayers.ImgPath = "../pacotes/openlayers/img/";
 //
 
 (function(){
-	var bra = new OpenLayers.Layer.WMS( 
+	var bra = new OpenLayers.Layer.WMS(
 		"Base carto MMA",
 		"http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map",
 		{layers:"baseraster",srs:"EPSG:4618",format:"image/png",isBaseLayer:false},
 		{isBaseLayer:true,visibility:false}
 	);
-	var osm = new OpenLayers.Layer.WMS( 
+	var osm = new OpenLayers.Layer.WMS(
 		"Open Street Map",
 		"http://full.wms.geofabrik.de/std/demo_key",
 		{layers:""},
diff --git a/interface/zerocal.htm b/interface/zerocal.htm
index 47c402b..9e5085b 100644
--- a/interface/zerocal.htm
+++ b/interface/zerocal.htm
@@ -4,7 +4,7 @@
 <meta http-equiv="Category" content="I3Geo Mapa interativo MMA">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <title>MMA - Mapa interativo</title>
-<script type="text/javascript" src="../classesjs/i3geo.js"></script>
+<script type="text/javascript" src="../classesjs/i3geo47.js"></script>
 </head>
 <body id=i3geo  >
 <center>
@@ -34,12 +34,12 @@
 	<img alt="" src="../imagens/branco.gif" ID='zoomtot' style='border:0px solid white;margin-left:3px'/>
 	<img alt="" src="../imagens/branco.gif" id='identifica' style='border:0px solid white;margin-left:3px'/>
 	<img alt="" src="../imagens/branco.gif" id='mede' style='border:0px solid white;margin-left:3px'/>
-	<img alt="" src="../imagens/branco.gif" id='area' style='border:0px solid white;margin-left:3px'/>   
-	
+	<img alt="" src="../imagens/branco.gif" id='area' style='border:0px solid white;margin-left:3px'/>
+
 	<img alt="" src="../imagens/branco.gif" id='reinicia' style='border:0px solid white;margin-left:12px'/>
-	<img alt="" src="../imagens/branco.gif" id='referencia' style='border:0px solid white;margin-left:3px'/>        
-	<img alt="" src="../imagens/branco.gif" id='inserexy' style='border:0px solid white;margin-left:3px'/> 
-	<img alt="" src="../imagens/branco.gif" id='inseregrafico' style='border:0px solid white;margin-left:3px'/> 
+	<img alt="" src="../imagens/branco.gif" id='referencia' style='border:0px solid white;margin-left:3px'/>
+	<img alt="" src="../imagens/branco.gif" id='inserexy' style='border:0px solid white;margin-left:3px'/>
+	<img alt="" src="../imagens/branco.gif" id='inseregrafico' style='border:0px solid white;margin-left:3px'/>
 	<img alt="" src="../imagens/branco.gif" id='textofid' style='border:0px solid white;margin-left:0px'/>
 	<img alt="" src="../imagens/branco.gif" id='selecao' style='border:0px solid white;margin-left:3px'/>
 	<img alt="" src="../imagens/branco.gif" id='identificaBalao' style='border:0px solid white;margin-left:3px'/>
@@ -109,23 +109,23 @@ http://<host>/i3geo/interface/zerocal.htm
 */
 /*
 	Indica a localiza&ccedil;&atilde;o correta do i3geo.
-	
+
 	&Eacute; utilizada para identificar o local correto onde est&atilde;o os programas em php que s&atilde;o utilizados.
-	
+
 	Se n&atilde;o for definida, o i3Geo tentar&aacute; encontrar o local automaticamente
 */
 //i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";
 
 i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";
-i3GEO.cria()
+i3GEO.cria();
 
-i3GEO.barraDeBotoes.AUTOALTURA = false
-i3GEO.barraDeBotoes.ATIVAMENUCONTEXTO = false
-i3GEO.barraDeBotoes.COMPORTAMENTO = "laranja"
-i3GEO.idioma.IDSELETOR = "seletorIdiomas"
+i3GEO.barraDeBotoes.AUTOALTURA = false;
+i3GEO.barraDeBotoes.ATIVAMENUCONTEXTO = false;
+i3GEO.barraDeBotoes.COMPORTAMENTO = "laranja";
+i3GEO.idioma.IDSELETOR = "seletorIdiomas";
 i3GEO.interface.ATIVAMENUCONTEXTO = true;
 i3GEO.barraDeBotoes.TIPOAJUDA = "vertical";
-i3GEO.barraDeBotoes.SOICONES = true
+i3GEO.barraDeBotoes.SOICONES = true;
 
 i3GEO.inicia();
 if($i("escala") && i3GEO.parametros.w < 500)
diff --git a/interface/zerocalol.htm b/interface/zerocalol.htm
index 8a9625e..89d5742 100644
--- a/interface/zerocalol.htm
+++ b/interface/zerocalol.htm
@@ -4,7 +4,7 @@
 <meta http-equiv="Category" content="I3Geo Mapa interativo MMA">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <title>MMA - Mapa interativo</title>
-<script type="text/javascript" src="../classesjs/i3geo.js"></script>
+<script type="text/javascript" src="../classesjs/i3geo47.js"></script>
 <script type="text/javascript" src="../pacotes/openlayers/OpenLayers29.js.php"></script>
 
 </head>
@@ -34,12 +34,12 @@
 	<img alt="" src="../imagens/branco.gif" ID='zoomtot' style='border:0px solid white;margin-left:3px'/>
 	<img alt="" src="../imagens/branco.gif" id='identifica' style='border:0px solid white;margin-left:3px'/>
 	<img alt="" src="../imagens/branco.gif" id='mede' style='border:0px solid white;margin-left:3px'/>
-	<img alt="" src="../imagens/branco.gif" id='area' style='border:0px solid white;margin-left:3px'/>   
-	
+	<img alt="" src="../imagens/branco.gif" id='area' style='border:0px solid white;margin-left:3px'/>
+
 	<img alt="" src="../imagens/branco.gif" id='reinicia' style='border:0px solid white;margin-left:12px'/>
-	<img alt="" src="../imagens/branco.gif" id='referencia' style='border:0px solid white;margin-left:3px'/>        
-	<img alt="" src="../imagens/branco.gif" id='inserexy' style='border:0px solid white;margin-left:3px'/> 
-	<img alt="" src="../imagens/branco.gif" id='inseregrafico' style='border:0px solid white;margin-left:3px'/> 
+	<img alt="" src="../imagens/branco.gif" id='referencia' style='border:0px solid white;margin-left:3px'/>
+	<img alt="" src="../imagens/branco.gif" id='inserexy' style='border:0px solid white;margin-left:3px'/>
+	<img alt="" src="../imagens/branco.gif" id='inseregrafico' style='border:0px solid white;margin-left:3px'/>
 	<img alt="" src="../imagens/branco.gif" id='textofid' style='border:0px solid white;margin-left:0px'/>
 	<img alt="" src="../imagens/branco.gif" id='selecao' style='border:0px solid white;margin-left:3px'/>
 	<img alt="" src="../imagens/branco.gif" id='identificaBalao' style='border:0px solid white;margin-left:3px'/>
@@ -112,9 +112,9 @@ http://<host>/i3geo/interface/zerocal.htm
 */
 /*
 	Indica a localiza&ccedil;&atilde;o correta do i3geo.
-	
+
 	&Eacute; utilizada para identificar o local correto onde est&atilde;o os programas em php que s&atilde;o utilizados.
-	
+
 	Se n&atilde;o for definida, o i3Geo tentar&aacute; encontrar o local automaticamente
 */
 //i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";
@@ -122,48 +122,48 @@ http://<host>/i3geo/interface/zerocal.htm
 i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";
 i3GEO.Interface.ATUAL = "openlayers";
 i3GEO.Interface.IDCORPO = "contemImg";
-i3GEO.configura.diminuixN = 20
+i3GEO.configura.diminuixN = 20;
 
 i3GEO.Interface.openlayers.GADGETS = {
 		PanZoomBar:true,
 		PanZoom:false,
 		LayerSwitcher:true,
 		ScaleLine:true,
-		OverviewMap:false	
+		OverviewMap:false
 	};
 i3GEO.Interface.openlayers.TILES = true;
 
-i3GEO.cria()
+i3GEO.cria();
 
-i3GEO.barraDeBotoes.AUTOALTURA = false
-i3GEO.barraDeBotoes.ATIVAMENUCONTEXTO = false
-i3GEO.barraDeBotoes.COMPORTAMENTO = "laranja"
-i3GEO.idioma.IDSELETOR = "seletorIdiomas"
+i3GEO.barraDeBotoes.AUTOALTURA = false;
+i3GEO.barraDeBotoes.ATIVAMENUCONTEXTO = false;
+i3GEO.barraDeBotoes.COMPORTAMENTO = "laranja";
+i3GEO.idioma.IDSELETOR = "seletorIdiomas";
 i3GEO.interface.ATIVAMENUCONTEXTO = true;
 i3GEO.barraDeBotoes.TIPOAJUDA = "vertical";
-i3GEO.barraDeBotoes.SOICONES = true
+i3GEO.barraDeBotoes.SOICONES = true;
 i3GEO.arvoreDeTemas.TIPOBOTAO = "radio";
 i3GEO.arvoreDeTemas.ATIVATEMAIMEDIATO = true;
-OpenLayers.ImgPath = "../pacotes/openlayers/img/"
-var ims = new OpenLayers.Layer.ArcGIS93Rest( 
+OpenLayers.ImgPath = "../pacotes/openlayers/img/";
+var ims = new OpenLayers.Layer.ArcGIS93Rest(
 	"ESRI Imagery World 2D",
     "http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/export",
 	{},
 	{isBaseLayer:true,visibility:false}
 );
-var wsm = new OpenLayers.Layer.ArcGIS93Rest( 
+var wsm = new OpenLayers.Layer.ArcGIS93Rest(
 	"ESRI World Street Map",
     "http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_StreetMap_World_2D/MapServer/export",
 	{},
 	{isBaseLayer:true,visibility:false}
 );
-var bra = new OpenLayers.Layer.WMS( 
+var bra = new OpenLayers.Layer.WMS(
 	"Base carto MMA",
     "http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/baseraster.map",
 	{layers:"baseraster",srs:"EPSG:4618",format:"image/png",isBaseLayer:false},
 	{isBaseLayer:true,visibility:false}
 );
-var osm = new OpenLayers.Layer.WMS( 
+var osm = new OpenLayers.Layer.WMS(
 	"Open Street Map",
     "http://full.wms.geofabrik.de/std/demo_key",
 	{layers:""},
diff --git a/kml.php b/kml.php
index 4271af8..b5d82eb 100644
--- a/kml.php
+++ b/kml.php
@@ -40,6 +40,7 @@ perfil - perfis separados por espa&ccedil;os. Ao usar um perfil, ser&atilde;o mo
 
 tipoxml - (opcional) se for "kml" insere o cabe&ccedil;alho de tipo kml no xml, permitindo abrir o xml diretamente na aplica&ccedil;&atilde;o Google Earth
 */
+//TODO incluir arquivo gvp
 error_reporting(0);
 include_once ("classesphp/carrega_ext.php");
 include_once ("classesphp/classe_menutemas.php");
@@ -108,8 +109,8 @@ if ($menutemas != "" || is_array($menutemas))
 				$nome = kml_converteTexto($sgrupo->SDTIPO);
 				kml_folder($nome);
 				foreach($sgrupo->TEMA as $tema)
-				{kml_tema($tema);}		
-				echo "</Folder>\n";	
+				{kml_tema($tema);}
+				echo "</Folder>\n";
 			}
 			echo "</Folder>\n";
 		}
@@ -197,7 +198,7 @@ if(!isset($menutemas) || $menutemas == "")
 				if(count($temas) > 0)
 				{
 					foreach ($temas as $tema)
-					{kml_tema_bd($tema);}	
+					{kml_tema_bd($tema);}
 				}
 				echo "</Folder>\n";
 			}
@@ -215,21 +216,21 @@ function kml_tema_bd($tema)
 	$fonte = $tema["link_tema"];
 	else
 	$fonte = "";
-	
+
 	$nome = $tema["nome_tema"];
 	$id = $tema["codigo_tema"];
-	
+
 	if(in_array("desc_tema",$teste))
 	$desc = $tema["desc_tema"];
 	else
 	$desc = "";
-	
+
 	$fonte = "<a href='$fonte' >Fonte </a>";
 	$legenda = "<a href='$urli3geo/ogc.php?tema=$id&layer=$id&request=getlegendgraphic&service=wms&format=image/jpeg' >Legenda </a>";
 
 	$href = "$urli3geo/ogc.php?tema=$id&amp;width=800&amp;height=800&amp;VERSION=1.1.1&amp;REQUEST=GetMap&amp;SRS=EPSG:4326&amp;STYLES=&amp;BGCOLOR=0xFFFFFF&amp;FORMAT=image/png&amp;TRANSPARENT=TRUE&amp;layers=$id";
 	kml_servico($nome,$fonte,$legenda,$desc,$href);
-	
+
 	if(strtolower($tema["kmz_tema"]) == "sim")
 	{
 		$href = "$urli3geo/pacotes/kmlmapserver/kmlservice.php?request=kmz&amp;map=$id&amp;typename=$id";
@@ -241,7 +242,7 @@ function kml_cabecalho($nome,$desc)
 	echo "<Folder>\n";
 	echo " <name>".str_replace("&","&amp;",kml_converteTexto($nome))."</name>\n";
 	echo " <description>".str_replace("&","&amp;",kml_converteTexto($desc))."</description>\n";
-	echo " <open>0</open><visibility>0</visibility>\n";	
+	echo " <open>0</open><visibility>0</visibility>\n";
 }
 function kml_folder($nome)
 {
@@ -269,7 +270,7 @@ function kml_tema($tema)
 		$fonte = "<a href='$fonte' >Fonte </a>";
 		else
 		$fonte = "";
-		
+
 		$legenda = "<a href='$urli3geo/ogc.php?tema=$id&layer=$id&request=getlegendgraphic&service=wms&format=image/png' >Legenda </a>";
 		$href = "$urli3geo/ogc.php?tema=$id&amp;width=800&amp;height=800&amp;VERSION=1.1.1&amp;REQUEST=GetMap&amp;SRS=EPSG:4326&amp;STYLES=&amp;BGCOLOR=0xFFFFFF&amp;FORMAT=image/png&amp;TRANSPARENT=TRUE&amp;layers=$id";
 		kml_servico($nome,$fonte,$legenda,$desc,$href);
@@ -280,7 +281,7 @@ function kml_servico($nome,$fonte,$legenda,$desc,$href)
 	echo "   <GroundOverlay>\n";
 	echo "    <name>".str_replace("&","&amp;",kml_converteTexto($nome))."</name>\n";
 	echo "    <description><![CDATA[".$fonte.$legenda.$desc."]]></description>\n";
-	echo "    <visibility>0</visibility>\n";      
+	echo "    <visibility>0</visibility>\n";
 	echo "    <Icon>\n";
 	echo "    <viewRefreshMode>onStop</viewRefreshMode>\n";
 	echo "    <href>$href</href>\n";
@@ -293,7 +294,7 @@ function kml_networklink($nome,$fonte,$legenda,$desc,$href)
 	echo "   <NetworkLink>\n";
 	echo "    <name>".str_replace("&","&amp;",kml_converteTexto($nome))."</name>\n";
 	echo "    <description><![CDATA[".$fonte.$legenda.$desc."]]></description>\n";
-	echo "    <visibility>0</visibility>\n";      
+	echo "    <visibility>0</visibility>\n";
 	echo "    <Link>\n";
 	echo "       <viewRefreshMode>never</viewRefreshMode>\n";
 	echo "       <href>$href</href>\n";
@@ -304,6 +305,6 @@ function kml_converteTexto($i)
 {
 	global $encoding;
 	$encodingatual = mb_detect_encoding($i, 'UTF-8, UTF-7, ASCII, ISO-8859-1');
-	return mb_convert_encoding($i,$encoding,$encodingatual);	
+	return mb_convert_encoding($i,$encoding,$encodingatual);
 }
 ?>
\ No newline at end of file
diff --git a/mashups/openlayers.php b/mashups/openlayers.php
index 2232bd8..99379f4 100644
--- a/mashups/openlayers.php
+++ b/mashups/openlayers.php
@@ -1,4 +1,5 @@
 <?php
+//TODO incluir arquivo gvp
 error_reporting(0);if(extension_loaded('zlib')){ob_start('ob_gzhandler');} header("Content-type: text/html");
 include_once("../ms_configura.php");
 include_once("../classesphp/pega_variaveis.php");
@@ -80,7 +81,7 @@ if(isset($botoes)){
 	if(in_array("salva",$botoes))
 	{$objBotoes[] = "'salva':true";}
 	if(in_array("ajuda",$botoes))
-	{$objBotoes[] = "'ajuda':true";}	
+	{$objBotoes[] = "'ajuda':true";}
 	if(in_array("fecha",$botoes))
 	{$objBotoes[] = "'fecha':true";}
 	if(in_array("tools",$botoes))
@@ -122,7 +123,7 @@ if($temas != "")
 	else{
 		$visiveis = str_replace(" ",",",$visiveis);
 		$visiveis = strtolower($visiveis);
-		$visiveis = explode(",",$visiveis);	
+		$visiveis = explode(",",$visiveis);
 	}
 	$objOpenLayers = array();
 	if(isset($servidor) && $servidor != "../ogc.php"){
@@ -144,7 +145,7 @@ if($temas != "")
 					$nomeMap = $tema;
 				}
 			}
-			if($nomeMap != ""){	
+			if($nomeMap != ""){
 				if(empty($layers)){
 					$layers = array();
 					$maptemp = @ms_newMapObj($nomeMap);
@@ -195,12 +196,12 @@ Par&acirc;metros:
 	incluilayergrafico (true|false) - indica se o layer que recebe elementos gr&aacute;ficos ser&aacute; adicionado ou n&atilde;o ao mapa
 	ativalayerswicther (true|false) - inicia o mapa com a caixa de escolha das camadas (layerSwitcher) aberta ou n&atilde;o. Por default, inicia fechada
 	ativarodadomouse (true|false) - ativa ou n&atilde;o o zoom com base na roda do mouse (default &eacute; true)
-	
+
 	fundo - lista com os nomes, separados por ',' dos layers que ser&atilde;o usados como fundo para o mapa. Se n&atilde;o for definido,
 			ser&aacute; usado o default. O primeiro da lista ser&aacute; o fundo ativo. Se na lista de temas de fundo estiver algum
 			tema incluido com o parametro 'temas', esses ser&atilde;o inclu&iacute;dos como temas de fundo.
 			Os seguintes fundos podem usados nessa lista:
-			
+
 			e_oce - ESRI Ocean Basemap
 			e_ims - ESRI Imagery World 2D
 			e_wsm - ESRI World Street Map
@@ -208,14 +209,14 @@ Par&acirc;metros:
 			ol_wms - base mundial da Meta Carta
 			top_wms - topon&iacute;mia do servidor do MMA usado no mapa de refer&ecirc;ncia
 			est_wms - estados do Brasil
-			
+
 	controles - lista com os nomes dos controles que ser&atilde;o adicionados ao mapa. Se n&atilde;o for definido, todos os controles ser&atilde;o adicionados
 		navigation
-		panzoombar 
-		layerswitcher 
-		scaleline 
+		panzoombar
+		layerswitcher
+		scaleline
 		mouseposition
-		overviewmap 
+		overviewmap
 		keyboarddefaults
 	botoes - lista com os nomes dos botoes que ser&atilde;o adicionados ao mapa. Se n&atilde;o for definido, todos os bot&otilde;es ser&atilde;o adicionados
 		pan
@@ -242,14 +243,14 @@ Par&acirc;metros:
 		fecha
 		corta
 
-	Para ver a lista de códigos de temas, que podem ser utilizados no par&acirc;metro 'temas', acesse: 
+	Para ver a lista de códigos de temas, que podem ser utilizados no par&acirc;metro 'temas', acesse:
 	<a href='../ogc.php?lista=temas' >lista de temas</a>. Os códigos s&atilde;o mostrados em vermelho.
 
 	Exemplo:
 
 	&lt;iframe height='400px' src='http://mapas.mma.gov.br/i3geo/mashups/openlayers.php?temas=bioma&amp;altura=350&amp;largura=350' style='border: 0px solid white;' width='400px'&gt;&lt;/iframe&gt;
 
-	";	
+	";
 	exit;
 }
 ?>
diff --git a/ms_criamapa.php b/ms_criamapa.php
index 9261e1a..1a96db4 100644
--- a/ms_criamapa.php
+++ b/ms_criamapa.php
@@ -1115,8 +1115,7 @@ function incluiMapaGvsig($gvsiggvp,$gvsigview=""){
 	}
 	$dataView = $gm->getViewData($gvsigview);
 	$numlayers = $mapn->numlayers;
-	for ($i=0;$i < $numlayers;$i++)
-	{
+	for ($i=0;$i < $numlayers;$i++){
 		$layer = $mapn->getlayer($i);
 		$layer->set("status",MS_DELETE);
 	}
diff --git a/ogc.htm b/ogc.htm
index 9087b29..becccb0 100644
--- a/ogc.htm
+++ b/ogc.htm
@@ -78,18 +78,16 @@ tema - tema para acesso
 */
 function ogc_endereco(tema)
 {
-	tema.checked = false
-	tema = tema.value
-	ins = "<H1>Endere&ccedil;o do web service:</H1>"
+	tema.checked = false;
+	tema = tema.value;
+	ins = "<H1>Endere&ccedil;o do web service:</H1>";
 	var re = new RegExp(".htm", "g");
-	var servico = window.location.href.replace(re,'.php?tema=')+tema
-	ins += "<p>"+servico
-
-	ins += "<p>Bookmark: <span id=bm ></span>"
+	var servico = window.location.href.replace(re,'.php?tema=')+tema;
+	ins += "<p>"+servico;
+	ins += "<p>Bookmark: <span id=bm ></span>";
 	ins  += "<p><iframe src='http://www.facebook.com/plugins/like.php?href="+servico+"&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light&amp;height=21' scrolling='no' frameborder='0' style='border:none; overflow:hidden; width:100px; height:21px;' allowTransparency='true'></iframe>";
-	ins += "<p><a target=blank href='"+servico+"&SRS=EPSG:4618&WIDTH=500&HEIGHT=500&BBOX=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&FORMAT=image/png&service=wms&version=1.1.0&request=getmap&layers="+tema+"' />testar</a>"
-	ins += "<p><a target=blank href='ogc.php?temas="+tema+"&format=application/openlayers&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081' />visualizar</a>"
-
+	ins += "<p><a target=blank href='"+servico+"&SRS=EPSG:4618&WIDTH=500&HEIGHT=500&BBOX=-76.5125927,-39.3925675209,-29.5851853,9.49014852081&FORMAT=image/png&service=wms&version=1.1.0&request=getmap&layers="+tema+"' />testar</a>";
+	ins += "<p><a target=blank href='ogc.php?temas="+tema+"&format=application/openlayers&bbox=-76.5125927,-39.3925675209,-29.5851853,9.49014852081' />visualizar</a>";
 	if(!$i("panellistaarquivos")){
 		YAHOO.namespace("datadownloadLista");
 		YAHOO.datadownloadLista.panel = new YAHOO.widget.Panel("panellistaarquivos", {zIndex:2000, iframe:false, width:"450px",align:"left", visible:false, draggable:true, close:true, modal:true } );
@@ -104,30 +102,24 @@ function ogc_endereco(tema)
 	$i("bm").innerHTML = i3GEO.social.bookmark(servico);
 	//document.getElementById("corpo").innerHTML = ins
 }
-
-
-
 var loc = window.location.href;
-
 var temp = loc.split("/ogc.htm");
-g_locaplic = temp[0]
+g_locaplic = temp[0];
 i3GEO.configura.locaplic = g_locaplic;
 
 $i("bm1").innerHTML = i3GEO.social.bookmark(loc);
 i3GEO.social.compartilhar("curtir",loc,loc,"comtotal");
 
-g_arvoreClicks = ""
+g_arvoreClicks = "";
 i3GEO.idioma.IDSELETOR = "bandeiras";
 i3GEO.idioma.mostraSeletor();
-i3GEO.arvoreDeTemas.INCLUISISTEMAS = false
-i3GEO.arvoreDeTemas.FILTRAOGC = true
-i3GEO.arvoreDeTemas.INCLUIWMS = false
-i3GEO.arvoreDeTemas.OPCOESADICIONAIS.incluiArvore = false
-i3GEO.arvoreDeTemas.OPCOESADICIONAIS.incluibusca = false
+i3GEO.arvoreDeTemas.INCLUISISTEMAS = false;
+i3GEO.arvoreDeTemas.FILTRAOGC = true;
+i3GEO.arvoreDeTemas.INCLUIWMS = false;
+i3GEO.arvoreDeTemas.OPCOESADICIONAIS.incluiArvore = false;
+i3GEO.arvoreDeTemas.OPCOESADICIONAIS.incluibusca = false;
 i3GEO.arvoreDeTemas.TIPOBOTAO = "radio";
-
 i3GEO.arvoreDeTemas.cria("",g_locaplic,"arvoreTemas","ogc_endereco\(this\)");
-
 </script>
 </body>
 </html>
diff --git a/ogc.php b/ogc.php
index f4598df..abdcb29 100644
--- a/ogc.php
+++ b/ogc.php
@@ -1,4 +1,5 @@
 <?php
+//TODO incluir projeto gvsig
 /*
 Title: ogc.php
 
@@ -86,7 +87,7 @@ if(isset($format) && strtolower($format) == "application/openlayers"){
 	if(!headers_sent())
 	{header("Location:".$urln);}
 	else
-	{echo "<meta http-equiv='refresh' content='0;url=$urln'>";}	
+	{echo "<meta http-equiv='refresh' content='0;url=$urln'>";}
 }
 //
 //pega os endere&ccedil;os para compor a url de chamada do gerador de web services
@@ -184,10 +185,8 @@ $oMap->setmetadata("wms_attribution_logourl_href",$proto.$server.dirname($_SERVE
 $oMap->setmetadata("wms_attribution_onlineresource",$proto.$server.dirname($_SERVER['PHP_SELF']));
 $oMap->setmetadata("wms_attribution_title",$tituloInstituicao);
 $oMap->setmetadata("ows_enable_request","*");
-
 $e = $oMap->extent;
 $extensaoMap = ($e->minx)." ".($e->miny)." ".($e->maxx)." ".($e->maxy);
-
 if (!isset($intervalo))
 {$intervalo = "0,5000";}
 else
@@ -197,24 +196,26 @@ if(!isset($tema)){
 	{$intervalo = "0,5000";}
 	$tipo = "intervalo";
 }
-if ($tipo == "" || $tipo == "metadados")
-{
+if ($tipo == "" || $tipo == "metadados"){
 	$tema = explode(" ",$tema);
 	//para o caso do tema ser um arquivo mapfile existente em uma pasta qualquer
 	//$temai3geo = true indica que o layer ser&aacute; buscado na pasta i3geo/temas
 	$temai3geo = true;
+	//FIXME não aceita gvp quando o caminho é completo
 	if(file_exists($_GET["tema"])){
 		$nmap = ms_newMapobj($_GET["tema"]);
 		$temai3geo = false;
 		$nmap->setmetadata("ows_enable_request","*");
 	}
-	foreach ($tema as $tx)
-	{
+	foreach ($tema as $tx){
 		$extensao = ".map";
 		if(file_exists($locaplic."/temas/".$tx.".php") && $temai3geo == true){
 			$extensao = ".php";
 		}
-		if($extensao == ".map"){			
+		if(file_exists($locaplic."/temas/".$tx.".gvp") && $temai3geo == true){
+			$extensao = ".gvp";
+		}
+		if($extensao == ".map"){
 			if($temai3geo == true){
 				$nmap = ms_newMapobj($locaplic."/temas/".$tx.".map");
 				$nmap->setmetadata("ows_enable_request","*");
@@ -224,80 +225,93 @@ if ($tipo == "" || $tipo == "metadados")
 			else{
 				$ts = explode(",",str_replace(" ",",",$layers));
 			}
-			foreach ($ts as $t)
-			{
+			foreach ($ts as $t){
 				$l = $nmap->getlayerbyname($t);
-				//necess&aacute;rio pq o mapfile pode ter todos os layers como default
-				if($temai3geo == false)
-				{$l->set("status",MS_OFF);}
-				if($cache == true && strtolower($l->getmetadata('cache')) == 'sim' && $tipo == '' && count($tema) == 1){
-					carregaCacheImagem($_GET['BBOX'],$tx,$_GET['WIDTH'],$_GET['HEIGHT'],$cachedir);
-				}
-				$l->setmetadata("ows_title",pegaNome($l));
-				$l->setmetadata("ows_srs",$listaepsg);
-				//essa linha &eacute; necess&aacute;ria pq as vezes no mapfile n&atilde;o tem nenhum layer com o nome igual ao nome do mapfile
-				if(count($ts)==1)
-				{$l->set("name",$tx);}
-				$l->setmetadata("gml_include_items","all");
-				$l->set("dump",MS_TRUE);
-				$l->setmetadata("WMS_INCLUDE_ITEMS","all");
-				$l->setmetadata("WFS_INCLUDE_ITEMS","all");
-				if(file_exists($locaplic."/temas/miniaturas/".$t.".map.mini.png"))
-				{
-					$mini = $proto.$server.dirname($_SERVER['PHP_SELF'])."/temas/miniaturas/".$t.".map.mini.png";
-					$l->setmetadata("wms_attribution_logourl_format","image/png");
-					$l->setmetadata("wms_attribution_logourl_height","50");
-					$l->setmetadata("wms_attribution_logourl_width","50");
-					$l->setmetadata("wms_attribution_logourl_href",$mini);
-				}
-				if($l->type == MS_LAYER_RASTER && $l->numclasses > 0)
-				{
-					$c = $l->getclass(0);
-					if($c->name == "")
-					{$c->name = " ";}
-				}
-				//inclui extensao geografica
-				$extensao = $l->getmetadata("EXTENSAO");
-				if($extensao == "")
-				{$extensao = $extensaoMap;}
-				$l->setmetadata("wms_extent",$extensao);
-				if (!empty($postgis_mapa))
-				{					
-					if ($l->connectiontype == MS_POSTGIS)
-					{
-						$lcon = $l->connection;
-						if (($lcon == " ") || ($lcon == "") || (in_array($lcon,array_keys($postgis_mapa))))
-						{
-							//
-							//o metadata CONEXAOORIGINAL guarda o valor original para posterior substitui&ccedil;&atilde;o
-							//				
-							if(($lcon == " ") || ($lcon == ""))
-							{
-								$l->set("connection",$postgis_mapa);
-								$l->setmetadata("CONEXAOORIGINAL",$lcon);
+				$permite = $l->getmetadata("permiteogc");
+				if(strtolower($permite) != "nao"){
+					//necess&aacute;rio pq o mapfile pode ter todos os layers como default
+					if($temai3geo == false){
+						$l->set("status",MS_OFF);
+					}
+					if($cache == true && strtolower($l->getmetadata('cache')) == 'sim' && $tipo == '' && count($tema) == 1){
+						carregaCacheImagem($_GET['BBOX'],$tx,$_GET['WIDTH'],$_GET['HEIGHT'],$cachedir);
+					}
+					$l->setmetadata("ows_title",pegaNome($l));
+					$l->setmetadata("ows_srs",$listaepsg);
+					//essa linha &eacute; necess&aacute;ria pq as vezes no mapfile n&atilde;o tem nenhum layer com o nome igual ao nome do mapfile
+					if(count($ts)==1){
+						$l->set("name",$tx);
+					}
+					$l->setmetadata("gml_include_items","all");
+					$l->set("dump",MS_TRUE);
+					$l->setmetadata("WMS_INCLUDE_ITEMS","all");
+					$l->setmetadata("WFS_INCLUDE_ITEMS","all");
+					if(file_exists($locaplic."/temas/miniaturas/".$t.".map.mini.png")){
+						$mini = $proto.$server.dirname($_SERVER['PHP_SELF'])."/temas/miniaturas/".$t.".map.mini.png";
+						$l->setmetadata("wms_attribution_logourl_format","image/png");
+						$l->setmetadata("wms_attribution_logourl_height","50");
+						$l->setmetadata("wms_attribution_logourl_width","50");
+						$l->setmetadata("wms_attribution_logourl_href",$mini);
+					}
+					if($l->type == MS_LAYER_RASTER && $l->numclasses > 0){
+						$c = $l->getclass(0);
+						if($c->name == "")
+						{$c->name = " ";}
+					}
+					//inclui extensao geografica
+					$extensao = $l->getmetadata("EXTENSAO");
+					if($extensao == ""){
+						$extensao = $extensaoMap;
+					}
+					$l->setmetadata("wms_extent",$extensao);
+					if (!empty($postgis_mapa)){
+						if ($l->connectiontype == MS_POSTGIS){
+							$lcon = $l->connection;
+							if (($lcon == " ") || ($lcon == "") || (in_array($lcon,array_keys($postgis_mapa)))){
+								//
+								//o metadata CONEXAOORIGINAL guarda o valor original para posterior substitui&ccedil;&atilde;o
+								//
+								if(($lcon == " ") || ($lcon == "")){
+									$l->set("connection",$postgis_mapa);
+									$l->setmetadata("CONEXAOORIGINAL",$lcon);
+								}
+								else{
+									$l->set("connection",$postgis_mapa[$lcon]);
+									$l->setmetadata("CONEXAOORIGINAL",$lcon);
+								}
 							}
-							else
-							{
-								$l->set("connection",$postgis_mapa[$lcon]);
-								$l->setmetadata("CONEXAOORIGINAL",$lcon);
-							}					
 						}
 					}
+					autoClasses($l,$oMap);
+					ms_newLayerObj($oMap, $l);
 				}
-				autoClasses($l,$oMap);
-				$permite = $l->getmetadata("permiteogc");
-				if($permite != "nao")
-				ms_newLayerObj($oMap, $l);
 			}
 		}
-		else{
+		if($extensao == ".php"){
 			include_once($locaplic."/temas/".$tx.".php");
 			eval($tx."(\$oMap);");
 		}
+		if($extensao == ".gvp"){
+			include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php");
+			$gm = new gvsig2mapfile($locaplic."/temas/".$tx.".gvp");
+			$gvsigview = $gm->getViewsNames();
+			$gvsigview = $gvsigview[0];
+			$dataView = $gm->getViewData($gvsigview);
+			$oMap = $gm->addLayers($oMap,$gvsigview,$dataView["layerNames"]);
+			$numlayers = $oMap->numlayers;
+			for ($i=0;$i < $numlayers;$i++){
+				$l = $oMap->getlayer($i);
+				$l->setmetadata("gml_include_items","all");
+				$l->set("dump",MS_TRUE);
+				$l->setmetadata("WMS_INCLUDE_ITEMS","all");
+				$l->setmetadata("WFS_INCLUDE_ITEMS","all");
+				$l->setmetadata("ows_srs",$listaepsg);
+				$oMap->setmetadata("ows_enable_request","*");
+			}
+		}
 	}
 }
-else
-{
+else{
 	$conta = 0;
 	$int = explode(",",$intervalo);
 	$codigosTema = array();
@@ -305,22 +319,15 @@ else
 	include("classesphp/classe_menutemas.php");
 	$m = new Menutemas("",$perfil,$locaplic,$urli3geo);
 	$menus = $m->pegaListaDeMenus();
-	foreach ($menus as $menu)
-	{	
+	foreach ($menus as $menu){
 		$grupos = $m->pegaListaDeGrupos($menu["idmenu"],$listasistemas="nao",$listasgrupos="sim");
-		foreach($grupos as $grupo)
-		{
-			if(strtolower($grupo["ogc"]) == "sim")
-			{
-				foreach($grupo["subgrupos"] as $sgrupo)
-				{
-					if(strtolower($sgrupo["ogc"]) == "sim")
-					{
+		foreach($grupos as $grupo){
+			if(strtolower($grupo["ogc"]) == "sim"){
+				foreach($grupo["subgrupos"] as $sgrupo){
+					if(strtolower($sgrupo["ogc"]) == "sim"){
 						$temas = $m->pegaListaDeTemas($grupo["id_n1"],$sgrupo["id_n2"],$menu["idmenu"]);
-						foreach($temas as $tema)
-						{
-							if(strtolower($tema["ogc"]) == "sim")
-							{
+						foreach($temas as $tema){
+							if(strtolower($tema["ogc"]) == "sim"){
 								$codigosTema[] = array("tema"=>$tema["tid"],"fonte"=>$tema["link"]);
 							}
 						}
@@ -332,25 +339,18 @@ else
 	//echo "<pre>";
 	//var_dump($$codigosTema);
 	//exit;
-	foreach($codigosTema as $c)
-	{
+	foreach($codigosTema as $c){
 		$codigoTema = $c["tema"];
-		if(file_exists($locaplic."/temas/".$codigoTema.".map"))
-		{
-			if (@ms_newMapobj($locaplic."/temas/".$codigoTema.".map"))
-			{
+		if(file_exists($locaplic."/temas/".$codigoTema.".map")){
+			if (@ms_newMapobj($locaplic."/temas/".$codigoTema.".map")){
 				$nmap = ms_newMapobj($locaplic."/temas/".$codigoTema.".map");
 				$nmap->setmetadata("ows_enable_request","*");
 				$ts = $nmap->getalllayernames();
-				if (count($ts) == 1)
-				{ 
-					foreach ($ts as $t)
-					{
-						if ($oMap->getlayerbyname($t) == "")
-						{
+				if (count($ts) == 1){
+					foreach ($ts as $t){
+						if ($oMap->getlayerbyname($t) == ""){
 							$conta++;
-							if (($conta >= $int[0]) && ($conta <= $int[1]))
-							{
+							if (($conta >= $int[0]) && ($conta <= $int[1])){
 								$l = $nmap->getlayerbyname($t);
 								$extensao = $l->getmetadata("EXTENSAO");
 								if($extensao == "")
@@ -364,18 +364,17 @@ else
 								$l->set("dump",MS_TRUE);
 								$l->setmetadata("WMS_INCLUDE_ITEMS","all");
 								$l->setmetadata("WFS_INCLUDE_ITEMS","all");
-								
+
 								$l->setmetadata("ows_metadataurl_href",$c["fonte"]);
 								$l->setmetadata("ows_metadataurl_type","TC211");
 								$l->setmetadata("ows_metadataurl_format","text/html");
-								if(file_exists($locaplic."/temas/miniaturas/".$t.".map.mini.png"))
-								{
+								if(file_exists($locaplic."/temas/miniaturas/".$t.".map.mini.png")){
 									$mini = $proto.$server.dirname($_SERVER['PHP_SELF'])."/temas/miniaturas/".$t.".map.mini.png";
 									$l->setmetadata("wms_attribution_logourl_format","image/png");
 									$l->setmetadata("wms_attribution_logourl_height","50");
 									$l->setmetadata("wms_attribution_logourl_width","50");
 									$l->setmetadata("wms_attribution_logourl_href",$mini);
-								}								
+								}
 								ms_newLayerObj($oMap, $l);
 							}
 						}
@@ -386,7 +385,7 @@ else
 	}
 }
 if($cache == true){
-	
+
 }
 ms_ioinstallstdouttobuffer();
 $oMap->owsdispatch($req);
@@ -401,8 +400,7 @@ ms_ioresethandlers();
 //
 //fun&ccedil;&otilde;es
 //
-function ogc_pegaListaDeMenus()
-{
+function ogc_pegaListaDeMenus(){
 	global $perfil,$locaplic,$urli3geo;
 	if(!isset($perfil)){$perfil = "";}
 	$m = new Menutemas("",$perfil,$locsistemas,$locaplic,"",$urli3geo);
@@ -410,8 +408,7 @@ function ogc_pegaListaDeMenus()
 	{$menus[] = $urli3geo."/admin/xmlmenutemas.php?id_menu=".$menu["idmenu"];}
 	return $menus;
 }
-function ogc_imprimeAjuda()
-{
+function ogc_imprimeAjuda(){
 	echo "<pre><b>Construtor de web services do I3Geo.</b><br><br>";
 	echo "Esse utilit&aacute;rio usa os arquivos mapfiles existentes em <br>";
 	echo "i3geo/temas para gerar web services no padr&atilde;o OGC.<br>";
@@ -423,32 +420,24 @@ function ogc_imprimeAjuda()
 	echo "Utilize o sistema de administra&ccedil;&atilde;o do i3Geo para configurar quais os temas da pasta i3geo/temas podem ser utilizados.";
 	echo "Utilize o parametro &intervalo=0,20 para definir o n&uacute;mero de temas desejado na fun&ccedil;&atilde;o getcapabilities.";
 }
-function ogc_imprimeListaDeTemas()
-{
+function ogc_imprimeListaDeTemas(){
 	global $urli3geo,$perfil,$locaplic;
 	$m = new Menutemas("",$perfil,$locaplic,$urli3geo);
 	$menus = $m->pegaListaDeMenus();
 	echo '<html><head><title>WMS</title><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"><meta name="description" content="OGC"><meta name="keywords" content="WMS OGC mapa sig gis webmapping geo geoprocessamento interativo meio ambiente MMA cartografia geografia"> <meta name="robots" content="index,follow">';
 	echo "<body><b>Lista de temas por grupos e subgrupos e endere&ccedil;os de acesso aos dados por meio de Web Services WMS (os códigos dos temas est&atilde;o em vermelho)</b><br><br>";
 	$imprimir = "";
-	foreach ($menus as $menu)
-	{
+	foreach ($menus as $menu){
 		$grupos = $m->pegaListaDeGrupos($menu["idmenu"],$listasistemas="nao",$listasgrupos="sim");
-		foreach($grupos as $grupo)
-		{
-			if(strtolower($grupo["ogc"]) == "sim")
-			{
+		foreach($grupos as $grupo){
+			if(strtolower($grupo["ogc"]) == "sim"){
 				$imprimegrupo = "<i>".$grupo["nome"]."</i>";
-				foreach($grupo["subgrupos"] as $sgrupo)
-				{
-					if(strtolower($sgrupo["ogc"]) == "sim")
-					{
+				foreach($grupo["subgrupos"] as $sgrupo){
+					if(strtolower($sgrupo["ogc"]) == "sim"){
 						$imprimesubgrupo = $sgrupo["nome"];
 						$temas = $m->pegaListaDeTemas($grupo["id_n1"],$sgrupo["id_n2"],$menu["idmenu"]);
-						foreach($temas as $tema)
-						{
-							if(strtolower($tema["ogc"]) == "sim")
-							{
+						foreach($temas as $tema){
+							if(strtolower($tema["ogc"]) == "sim"){
 								$imprimir .= $imprimegrupo."->".$imprimesubgrupo."<br>";
 								$imprimir .= "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
 								$imprimir .= "<span style=color:red >".$tema["tid"]."</span>";
@@ -474,8 +463,7 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){
 	{$nome = $dir_tmp."/cache/".$layer."/".$nome;}
 	else
 	{$nome = $cachedir."/".$layer."/".$nome;}
-	if(file_exists($nome))
-	{
+	if(file_exists($nome)){
 		ob_start();
 		// assuming you have image data in $imagedata
 		$img = file_get_contents($nome);
@@ -494,7 +482,7 @@ function carregaCacheImagem($bbox,$layer,$w,$h,$cachedir=""){
 		print($img);
 		ob_end_flush();
 		exit;
-	}	
+	}
 	/*
 	if(file_exists($nome))
 	{
--
libgit2 0.21.2