From 3706ac048476549e5f6fefbf2195961ba2fb5501 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Mon, 28 Mar 2011 22:34:27 +0000 Subject: [PATCH] --- ferramentas/legenda/index.js.php | 18 ++++++++++++------ ms_criamapa.php | 45 +++++++++++++++++++++++++++++++++++++++------ pacotes/gvsig/class.gvsig2mapfile.php | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- pacotes/gvsig/gvsig2mapfile.php | 9 ++++++++- pacotes/gvsig/projetoteste.bak | 527 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------ pacotes/gvsig/projetoteste.gvp | 527 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------ 6 files changed, 1120 insertions(+), 179 deletions(-) diff --git a/ferramentas/legenda/index.js.php b/ferramentas/legenda/index.js.php index 8dc8a58..677e8c1 100644 --- a/ferramentas/legenda/index.js.php +++ b/ferramentas/legenda/index.js.php @@ -118,27 +118,32 @@ i3GEOF.legenda = { "i3GEOlegendabotao1", {onclick:{fn: i3GEOF.legenda.mudaLegenda}} ); - $i("i3GEOlegendabotao1-button").style.width = "0px"; + if(navm) + {$i("i3GEOlegendabotao1-button").style.width = "0px";} new YAHOO.widget.Button( "i3GEOlegendabotao2", {onclick:{fn: i3GEOF.legenda.adicionaClasse}} ); - $i("i3GEOlegendabotao2-button").style.width = "0px"; + if(navm) + {$i("i3GEOlegendabotao2-button").style.width = "0px";} new YAHOO.widget.Button( "i3GEOlegendabotao3", {onclick:{fn: i3GEOF.legenda.adicionaConta}} ); - $i("i3GEOlegendabotao3-button").style.width = "0px"; + if(navm) + {$i("i3GEOlegendabotao3-button").style.width = "0px";} new YAHOO.widget.Button( "i3GEOlegendabotao15", {onclick:{fn: i3GEOF.legenda.adicionaOpacidade}} ); - $i("i3GEOlegendabotao15-button").style.width = "0px"; + if(navm) + {$i("i3GEOlegendabotao15-button").style.width = "0px";} new YAHOO.widget.Button( "i3GEOlegendabotao4", {onclick:{fn: i3GEOF.legenda.paleta}} ); - $i("i3GEOlegendabotao4-button").style.width = "0px"; + if(navm) + {$i("i3GEOlegendabotao4-button").style.width = "0px";} new YAHOO.widget.Button( "i3GEOlegendabotao5", {onclick:{fn: i3GEOF.legenda.simbU}} @@ -184,7 +189,8 @@ i3GEOF.legenda = { i3GEO.util.abreColourRamp("","listaColourRamp",ncores); }}} ); - $i("i3GEOlegendabotaoRamp-button").style.width = "0px"; + if(navm) + {$i("i3GEOlegendabotaoRamp-button").style.width = "0px";} i3GEOF.legenda.ativaFoco(); i3GEOF.legenda.mostralegenda(); i3GEO.util.comboItens( diff --git a/ms_criamapa.php b/ms_criamapa.php index f0abf76..749b9fe 100644 --- a/ms_criamapa.php +++ b/ms_criamapa.php @@ -123,6 +123,10 @@ srs_wms - código da projeção image_wms - tipo de imagem disponível versao_wms - Versão do WMS (necessário quando da inclusão de uma camada WMS diretamente pela URL) + +gvsiggvp - endereço no servidor do arquivo de projeto gvSig (gvp) que será utilizado para construir o mapa (experimental) + +gvsigview - nome da view do projeto gvSig */ /* @@ -183,8 +187,8 @@ if (!isset($mapext)){$mapext="";} $dir_tmp_ = $dir_tmp; $locmapserv_ = $locmapserv; $locaplic_ = $locaplic; -$locsistemas_ = $locsistemas; -$locidentifica_ = $locidentifica; +//$locsistemas_ = $locsistemas; +//$locidentifica_ = $locidentifica; $R_path_ = $R_path; $mapext_ = $mapext; $locmapas_ = $locmapas; @@ -192,7 +196,7 @@ $debug_ = $debug; $ler_extensoes_ = $ler_extensoes; $postgis_mapa_ = $postgis_mapa; $tituloInstituicao_ = $tituloInstituicao; -$atlasxml_ = $atlasxml; +//$atlasxml_ = $atlasxml; $expoeMapfile_ = $expoeMapfile; $googleApiKey_ = $googleApiKey; $mensagemInicia_ = $mensagemInicia; @@ -235,8 +239,8 @@ isso pq algumas aplicações podem ser prejudicadas caso o aguarde seja mostrado $_SESSION["dir_tmp"] = $dir_tmp_; $_SESSION["locmapserv"] = $locmapserv_; $_SESSION["locaplic"] = $locaplic_; -$_SESSION["locsistemas"] = $locsistemas_; -$_SESSION["locidentifica"] = $locidentifica_; +//$_SESSION["locsistemas"] = $locsistemas_; +//$_SESSION["locidentifica"] = $locidentifica_; $_SESSION["R_path"] = $R_path_; $_SESSION["mapext"] = $mapext_; $_SESSION["locmapas"] = $locmapas_; @@ -247,7 +251,7 @@ $_SESSION["perfil"] = $perfil_; $_SESSION["navegadoresLocais"] = $navegadoresLocais_; $_SESSION["utilizacgi"] = $utilizacgi_; $_SESSION["tituloInstituicao"] = $tituloInstituicao_; -$_SESSION["atlasxml"] = $atlasxml; +//$_SESSION["atlasxml"] = $atlasxml; $_SESSION["expoeMapfile"] = $expoeMapfile; $_SESSION["googleApiKey"] = $googleApiKey_; $_SESSION["mensagemInicia"] = $mensagemInicia_; @@ -309,6 +313,16 @@ else $mapn = ms_newMapObj($locaplic."/aplicmap/".$base.".map"); } /* +Utiliza um projeto gvSig para compor o mapa +*/ +if(isset($gvsiggvp) && $gvsiggvp != ""){ + if(isset($gvsigview) && $gvsigview != ""){ + incluiMapaGvsig($gvsiggvp,$gvsigview); + } + else + {echo "Nenhuma vista foi definida &gvsigview";} +} +/* Parâmetros adicionais. Processa os parâmetros para a inicialização verificando se foram passados pela URL ou não. @@ -1001,6 +1015,25 @@ function incluiTemaWms() erroCriacao(); } /* +Projeto gvsig +*/ +function incluiMapaGvsig($gvsiggvp,$gvsigview){ + global $mapn,$locaplic; + include_once($locaplic."/pacotes/gvsig/class.gvsig2mapfile.php"); + $gm = new gvsig2mapfile($gvsiggvp); + $dataView = $gm->getViewData($gvsigview); + //var_dump($dataView); + $lnames = $mapn->getalllayernames(); + foreach($lnames as $name){ + $layer = $mapn->getlayerbyname($name); + $layer->set("status",MS_DELETE); + } + $next = $dataView["extent"]; + $ext = $mapn->extent; + $ext->setextent($next[0],$next[1],$next[2],$next[3]); + $mapn = $gm->addLayers($mapn,$gvsigview,$dataView["layerNames"]); +} +/* Captura e mostra os erros de processamento do mapserver */ function erroCriacao(){ diff --git a/pacotes/gvsig/class.gvsig2mapfile.php b/pacotes/gvsig/class.gvsig2mapfile.php index 14de3a7..ce3cbb1 100644 --- a/pacotes/gvsig/class.gvsig2mapfile.php +++ b/pacotes/gvsig/class.gvsig2mapfile.php @@ -1,9 +1,7 @@ xml = simplexml_load_file($gvp); } - } - + } function getViewsNames(){ $names = array(); $this->xml->registerXPathNamespace("tag", "http://www.gvsig.gva.es"); @@ -29,15 +26,171 @@ class gvsig2mapfile{ } return $names; } - function findAttribute($object, $attribute) { - foreach($object->attributes() as $a => $b) { - if ($a == $attribute) { - $return = $b; + function getViewByName($nome){ + $this->xml->registerXPathNamespace("tag", "http://www.gvsig.gva.es"); + $result = $this->xml->xpath("/tag:xml-tag/tag:xml-tag/tag:property[@value='ProjectView']/parent::*/tag:property[@value='".$nome."']/parent::*"); + return $result; + } + function getViewData($nome){ + $this->xml->registerXPathNamespace("tag", "http://www.gvsig.gva.es"); + $path = "/tag:xml-tag/tag:xml-tag/tag:property[@value='ProjectView']/parent::*/tag:property[@value='".$nome."']/parent::*/tag:xml-tag/tag:xml-tag"; + + $xmin = $this->getValue($path,"adjustedExtentX"); + $ymin = $this->getValue($path,"adjustedExtentY"); + $xmax = $xmin + $this->getValue($path,"adjustedExtentW"); + $ymax = $ymin + $this->getValue($path,"adjustedExtentH"); + $proj = $this->getValue($path,"proj"); + $nomes = $this->getValue($path,"LayerNames"); + return array( + "extent"=>array($xmin,$ymin,$xmax,$ymax), + "proj"=>$proj, + "layerNames"=>explode(",",str_replace(" ,",",",$nomes)) + ); + } + function getLayerData($viewNome,$layerNome){ + $this->xml->registerXPathNamespace("tag", "http://www.gvsig.gva.es"); + $path = "/tag:xml-tag/tag:xml-tag/tag:property[@value='ProjectView']/parent::*/tag:property[@value='".$viewNome."']/parent::*/tag:xml-tag/tag:xml-tag/tag:xml-tag/tag:xml-tag/parent::*/tag:property[@value='".$layerNome."']/parent::*"; + $classes = array(); + $render = 'com.iver.cit.gvsig.fmap.rendering'; + + $path1 = $path."/tag:xml-tag/tag:property[@value='".$render.".VectorialUniqueValueLegend']/parent::*/tag:xml-tag"; + $result = $this->xml->xpath($path1); + if($result != FALSE){ + $coluna = $this->getValue($path."/tag:xml-tag","fieldNames"); + $valores = $this->getValue($path."/tag:xml-tag","values"); + $tipocoluna = $this->getValue($path."/tag:xml-tag","fieldTypes"); + $classes = $this->VectorialUniqueValueLegend($result,$path1,$coluna,$tipocoluna,$valores); + } + + $path1 = $path."/tag:xml-tag/tag:property[@value='".$render.".SingleSymbolLegend']/parent::*/tag:xml-tag"; + $result = $this->xml->xpath($path1); + if($result != FALSE) + {$classes = $this->SingleSymbolLegend($result,$path1);} + + return array( + "minScale"=>$this->getValue($path,"minScale"), + "maxScale"=>$this->getValue($path,"maxScale"), + "visible"=>$this->getValue($path,"visible"), + "proj"=>$this->getValue($path,"proj"), + "transparency"=>$this->getValue($path,"transparency"), + "type"=>$this->getValue($path,"type"), + "file"=>$this->getValue($path,"file"), + "driverName"=>$this->getValue($path,"driverName"), + "isLabeled"=>$this->getValue($path,"isLabeled"), + "legenda"=>array( + "tipoLegenda"=>$this->getValue($path."/tag:xml-tag","className"), + "classes"=>$classes + ) + ); + } + function VectorialUniqueValueLegend($result,$path1,$coluna,$tipocoluna,$valores){ + $valores = ",".str_replace(" ,",",",$valores); + $valores = explode(",",$valores); + $classes = array(); + $c = 0; + while(list( , $node) = each($result)) { + $classe = array(); + if($tipocoluna == 12) + {$classe["exp"] = "('[".$coluna."]'eq'".$valores[$c]."')";} + else + {$classe["exp"] = "([".$coluna."] = ".$valores[$c]." )";} + $classe["className"] = $this->getValue($path1,"className",$c); + $classe["desc"] = $this->getValue($path1,"desc",$c); + $classe["color"] = $this->getValue($path1,"color",$c); + $classe["rotation"] = $this->getValue($path1,"rotation",$c); + $classe["offsetX"] = $this->getValue($path1,"offsetX",$c); + $classe["offsetY"] = $this->getValue($path1,"offsetY",$c); + $classe["size"] = $this->getValue($path1,"size",$c); + $classe["outline"] = $this->getValue($path1,"outline",$c); + $classe["markerStyle"] = $this->getValue($path1,"markerStyle",$c); + $classe["hasFill"] = $this->getValue($path1,"hasFill",$c); + $classe["hasOutline"] = $this->getValue($path1,"hasOutline",$c); + if($classe["desc"] != "") + {$classes[] = $classe;} + $c = $c + 1; + } + return $classes; + } + function SingleSymbolLegend($result,$path){ + $classes = array(); + $c = 0; + //var_dump($result);exit; + while(list( , $node) = each($result)) { + $classe = array(); + $classe["className"] = $this->getValue($path,"className",$c); + $classe["desc"] = $this->getValue($path,"desc",$c); + $classe["color"] = $this->getValue($path,"color",$c); + $classe["rotation"] = $this->getValue($path,"rotation",$c); + $classe["offsetX"] = $this->getValue($path,"offsetX",$c); + $classe["offsetY"] = $this->getValue($path,"offsetY",$c); + $classe["size"] = $this->getValue($path,"size",$c); + $classe["outline"] = $this->getValue($path,"outline",$c); + $classe["markerStyle"] = $this->getValue($path,"markerStyle",$c); + $classe["hasFill"] = $this->getValue($path1,"hasFill",$c); + $classe["hasOutline"] = $this->getValue($path1,"hasOutline",$c); + $classe["exp"] = false; + if($classe["hasOutline"] == "true"){ + $classe["outline"] = $this->getValue($path."/tag:xml-tag","color"); + } + $classes[] = $classe; + $c = $c + 1; + } + return $classes; + } + function getValue($path,$key,$i=0){ + $result = $this->xml->xpath($path."/tag:property[@key='".$key."']"); + if($result) + {return $this->findAttribute($result[$i],"value");} + else + {return false;} + } + function addLayers($objMap,$gvsigview,$layerNames){ + foreach($layerNames as $lname){ + $dataLayer = $this->getLayerData($gvsigview,$lname); + $oLayer = ms_newLayerObj($objMap); + $oLayer->setmetadata("TEMA",$lname); + $oLayer = $this->data2layer($oLayer,$dataLayer); + } + return $objMap; + } + function data2layer($oLayer,$dataLayer){ + $oLayer->set("name",nomeRandomico()); + $oLayer->set("data",$dataLayer["file"]); + $oLayer->set("status",MS_DEFAULT); + if($dataLayer["visible"] == "false") + {$oLayer->set("status",MS_OFF);} + $tipo = $dataLayer["legenda"]["classes"][0]["className"]; + $oLayer->set("type",1); + if($tipo == "com.iver.cit.gvsig.fmap.core.symbols.SimpleMarkerSymbol") + {$oLayer->set("type",0);} + if($tipo == "com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol") + {$oLayer->set("type",2);} + foreach($dataLayer["legenda"]["classes"] as $data){ + $classe = ms_newClassObj($oLayer); + $estilo = ms_newStyleObj($classe); + if($oLayer->type == 0){ + $estilo->set("symbolname","ponto"); } + $ncor = explode(",",$data["color"]); + $cor = $estilo->color; + $cor->setrgb($ncor[0],$ncor[1],$ncor[2]); + if($data["size"] != false) + {$estilo->set("size",$data["size"]);} + if($data["exp"] != false) + {$classe->setExpression($data["exp"]);} } - if($return) { - return $return; + return $oLayer; + } + function findAttribute($object, $attribute) { + $return = false; + if(@$object->attributes()){ + foreach($object->attributes() as $a => $b) { + if ($a == $attribute) { + $return = $b; + } + } } + return $return; } } ?> \ No newline at end of file diff --git a/pacotes/gvsig/gvsig2mapfile.php b/pacotes/gvsig/gvsig2mapfile.php index 3aff03f..bb197a3 100644 --- a/pacotes/gvsig/gvsig2mapfile.php +++ b/pacotes/gvsig/gvsig2mapfile.php @@ -4,5 +4,12 @@ $gm = new gvsig2mapfile("C:\ms4w\Apache\htdocs\i3geo\pacotes\gvsig\projetoteste.gvp"); echo "
";
 	$nomes = $gm->getViewsNames();
-	echo $nomes[0];
+	$view = $gm->getViewByName($nomes[0]);
+	$dataView = $gm->getViewData($nomes[0]);
+	echo "Extensão do mapa: ".(implode(",",$dataView["extent"]))."\n";
+	echo "Projeção do mapa: ".$dataView["proj"]."\n";
+	echo "Camadas: ".(implode(",",$dataView["layerNames"]))."\n";
+	foreach($dataView["layerNames"] as $lname)
+	{var_dump($gm->getLayerData($nomes[0],$lname));}
+	//localhost/i3geo/ms_criamapa.php?gvsiggvp=C:\ms4w\Apache\htdocs\i3geo\pacotes\gvsig\projetoteste.gvp&gvsigview=teste 1&temasa=
 ?>
\ No newline at end of file
diff --git a/pacotes/gvsig/projetoteste.bak b/pacotes/gvsig/projetoteste.bak
index 0374653..aa0ff6b 100644
--- a/pacotes/gvsig/projetoteste.bak
+++ b/pacotes/gvsig/projetoteste.bak
@@ -6,9 +6,9 @@
     
     
     
-    
+    
     
-    
+    
     
     
     
@@ -16,38 +16,32 @@
     
     
         
-        
-        
+        
+        
         
     
     
         
-        
-        
+        
+        
         
     
     
         
-        
-        
+        
+        
         
     
     
         
-        
-        
+        
+        
         
     
     
         
-        
-        
-        
-    
-    
-        
-        
-        
+        
+        
         
     
     
@@ -88,11 +82,89 @@
     
     
         
+        
+        
+        
+    
+    
+        
         
         
         
     
     
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
         
         
         
@@ -104,48 +176,68 @@
             
             
                 
-                
-                
-                
-                
+                
+                
+                
+                
                 
-                
-                
+                
+                
                 
-                
-                
-                
-                
+                
+                
+                
+                
                 
                 
                 
                 
-                
+                
                 
                     
-                    
+                    
                     
                     
                     
                     
                     
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
                 
             
             
                 
                 
-                
+                
                 
                 
                 
                 
                 
-                
-                
+                
+                
                 
                     
                     
-                    
+                    
                     
                     
                     
@@ -153,25 +245,54 @@
                     
                     
                     
-                    
-                    
+                    
+                    
                     
                     
                     
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
                         
                         
-                            
-                            
+                            
+                            
+                            
+                            
                             
-                            
-                            
-                            
-                            
-                            
-                            
-                            
                             
-                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                    
+                                    
+                                    
+                                    
+                                    
+                                    
+                                    
+                                    
+                                    
+                                
+                            
                         
                     
                     
@@ -179,6 +300,20 @@
                         
                     
                     
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
                         
                         
                         
@@ -187,7 +322,7 @@
                 
                 
                     
-                    
+                    
                     
                     
                     
@@ -201,12 +336,26 @@
                     
                     
                     
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
                         
                         
                             
-                            
+                            
                             
-                            
+                            
                             
                             
                             
@@ -237,6 +386,21 @@
                         
                     
                     
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
                         
                         
                         
@@ -245,11 +409,11 @@
                 
                 
                     
-                    
+                    
                     
                     
                     
-                    
+                    
                     
                     
                     
@@ -259,14 +423,28 @@
                     
                     
                     
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
                         
                         
                             
                             
-                            
+                            
                             
                             
-                            
+                            
                             
                                 
                                 
@@ -285,6 +463,21 @@
                         
                     
                     
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
                         
                         
                         
@@ -307,14 +500,28 @@
                     
                     
                     
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
                         
                         
                             
                             
-                            
+                            
                             
                             
-                            
+                            
                             
                                 
                                 
@@ -333,6 +540,163 @@
                         
                     
                     
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
+                        
+                        
+                        
+                        
+                    
+                
+                
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                    
+                    
+                        
+                        
+                    
+                    
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
                         
                         
                         
@@ -345,6 +709,7 @@
             
             
                 
+                
                 
                 
                 
@@ -362,7 +727,7 @@
             
                 
                 
-                
+                
                 
                 
                 
@@ -401,7 +766,7 @@
                 
                 
                 
-                
+                
                 
                     
                     
@@ -415,7 +780,7 @@
             
                 
                 
-                
+                
                 
                 
                 
@@ -809,6 +1174,7 @@
             
             
                 
+                
                 
                 
                 
@@ -826,7 +1192,7 @@
             
                 
                 
-                
+                
                 
                 
                 
@@ -859,10 +1225,10 @@
         
         
             
-            
-            
-            
-            
+            
+            
+            
+            
             
             
             
@@ -871,32 +1237,37 @@
             
             
             
+            
+            
+            
+            
+            
             
-            
+            
             
             
                 
                 
-                
+                
                 
                 
-                
-                
-                
+                
+                
+                
                 
                 
-                
-                
+                
+                
                 
-                
-                
-                
-                
+                
+                
+                
+                
                 
-                
-                
-                
-                
+                
+                
+                
+                
             
         
     
diff --git a/pacotes/gvsig/projetoteste.gvp b/pacotes/gvsig/projetoteste.gvp
index c18cbfd..3f811ef 100644
--- a/pacotes/gvsig/projetoteste.gvp
+++ b/pacotes/gvsig/projetoteste.gvp
@@ -6,9 +6,9 @@
     
     
     
-    
+    
     
-    
+    
     
     
     
@@ -16,38 +16,32 @@
     
     
         
-        
-        
+        
+        
         
     
     
         
-        
-        
+        
+        
         
     
     
         
-        
-        
+        
+        
         
     
     
         
-        
-        
+        
+        
         
     
     
         
-        
-        
-        
-    
-    
-        
-        
-        
+        
+        
         
     
     
@@ -88,11 +82,89 @@
     
     
         
+        
+        
+        
+    
+    
+        
         
         
         
     
     
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
         
         
         
@@ -104,48 +176,68 @@
             
             
                 
-                
-                
-                
-                
+                
+                
+                
+                
                 
-                
-                
+                
+                
                 
-                
-                
-                
-                
+                
+                
+                
+                
                 
                 
                 
                 
-                
+                
                 
                     
-                    
+                    
                     
                     
                     
                     
                     
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
                 
             
             
                 
                 
-                
+                
                 
                 
                 
                 
                 
-                
-                
+                
+                
                 
                     
                     
-                    
+                    
                     
                     
                     
@@ -153,25 +245,54 @@
                     
                     
                     
-                    
-                    
+                    
+                    
                     
                     
                     
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
                         
                         
-                            
-                            
+                            
+                            
+                            
+                            
                             
-                            
-                            
-                            
-                            
-                            
-                            
-                            
                             
-                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                    
+                                    
+                                    
+                                    
+                                    
+                                    
+                                    
+                                    
+                                    
+                                
+                            
                         
                     
                     
@@ -179,6 +300,20 @@
                         
                     
                     
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
                         
                         
                         
@@ -187,7 +322,7 @@
                 
                 
                     
-                    
+                    
                     
                     
                     
@@ -201,12 +336,26 @@
                     
                     
                     
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
                         
                         
                             
-                            
+                            
                             
-                            
+                            
                             
                             
                             
@@ -237,6 +386,21 @@
                         
                     
                     
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
                         
                         
                         
@@ -245,11 +409,11 @@
                 
                 
                     
-                    
+                    
                     
                     
                     
-                    
+                    
                     
                     
                     
@@ -259,14 +423,28 @@
                     
                     
                     
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
                         
                         
                             
                             
-                            
+                            
                             
                             
-                            
+                            
                             
                                 
                                 
@@ -285,6 +463,21 @@
                         
                     
                     
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
                         
                         
                         
@@ -307,14 +500,28 @@
                     
                     
                     
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
                         
                         
                             
                             
-                            
+                            
                             
                             
-                            
+                            
                             
                                 
                                 
@@ -333,6 +540,163 @@
                         
                     
                     
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
+                        
+                        
+                        
+                        
+                    
+                
+                
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                        
+                        
+                            
+                            
+                            
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    
+                    
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                    
+                    
+                        
+                        
+                    
+                    
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
                         
                         
                         
@@ -345,6 +709,7 @@
             
             
                 
+                
                 
                 
                 
@@ -362,7 +727,7 @@
             
                 
                 
-                
+                
                 
                 
                 
@@ -401,7 +766,7 @@
                 
                 
                 
-                
+                
                 
                     
                     
@@ -415,7 +780,7 @@
             
                 
                 
-                
+                
                 
                 
                 
@@ -809,6 +1174,7 @@
             
             
                 
+                
                 
                 
                 
@@ -826,7 +1192,7 @@
             
                 
                 
-                
+                
                 
                 
                 
@@ -859,10 +1225,10 @@
         
         
             
-            
-            
-            
-            
+            
+            
+            
+            
             
             
             
@@ -871,32 +1237,37 @@
             
             
             
+            
+            
+            
+            
+            
             
-            
+            
             
             
                 
                 
-                
+                
                 
                 
-                
-                
-                
+                
+                
+                
                 
                 
-                
-                
+                
+                
                 
-                
-                
-                
-                
+                
+                
+                
+                
                 
-                
-                
-                
-                
+                
+                
+                
+                
             
         
     
--
libgit2 0.21.2