Obtenção de camadas POSTGIS no gvsig2mapfile

Edmar Moretti
1 parent e2573c86
Showing 7 changed files with 390 additions and 87 deletions Show diff stats
ms_configura.php
ms_criamapa.php
pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php
pacotes/gvsig/gvsig2mapfile/gvsig2mapfile.php
pacotes/gvsig/gvsig2mapfile/projetoteste.bak
pacotes/gvsig/gvsig2mapfile/projetoteste.gvp
pacotes/gvsig/gvsig2mapfile/upload.htm
@@ -301,7 +301,10 @@ if (strtoupper(substr(PHP_OS, 0, 3) == &#39;WIN&#39;))
 	Tipo:
 	{array ou  string}
 	*/
-	$postgis_mapa = array("teste"=>"user=postgres password=postgres dbname=pgutf8 host=localhost port=5432 options='-c client_encoding=LATIN1'"); //"user=geodados password=geodados dbname=geodados host=10.1.1.36 port=5432";
+	$postgis_mapa = array(
+		"teste"=>"user=postgres password=postgres dbname=pgutf8 host=localhost port=5432 options='-c client_encoding=LATIN1'",
+		"postgres"=>"user=postgres password=postgres dbname=postgis host=localhost port=5432'",
+	); //"user=geodados password=geodados dbname=geodados host=10.1.1.36 port=5432";
 	/*
 	Variable: utilizacgi
  
@@ -1019,7 +1019,7 @@ Projeto gvsig
 */
 function incluiMapaGvsig($gvsiggvp,$gvsigview){
 	global $mapn,$locaplic;
-	include_once($locaplic."/pacotes/gvsig/class.gvsig2mapfile.php");
+	include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php");
 	$gm = new gvsig2mapfile($gvsiggvp);
 	$dataView = $gm->getViewData($gvsigview);
 	//var_dump($dataView);
@@ -66,7 +66,25 @@ class gvsig2mapfile{
 		$result = $this->xml->xpath($path1);
 		if($result != FALSE)
 		{$classes = $this->SingleSymbolLegend($result,$path1);}
-		
+		//
+		//obtem a conexão
+		//a senha não pode ser obtida, então, é usado o mesmo nome de usuário em seu lugar. No i3Geo deve-se prever isso na variável de substituição de string.
+		$driverName = $this->getValue($path,"driverName");
+		if($driverName == "gvSIG shp driver"){
+			$data = $this->getValue($path,"file");
+			$connection = "";
+			$connectiontype = "";
+		}
+		if($driverName == "PostGIS JDBC Driver"){
+			$path1 = $path."/tag:xml-tag/tag:property[@value='org.postgresql.Driver']/parent::*";
+			$tabela = "";
+			if($this->getValue($path1,"schema") != "")
+			{$tabela = $this->getValue($path1,"schema").".";}
+			$tabela .= $this->getValue($path1,"tablename");
+			$data = $this->getValue($path1,"THE_GEOM")." FROM (select ".$this->getValue($path1,"THE_GEOM").",".$this->getValue($path1,"fields")." FROM ".$tabela.") as foo USING UNIQUE ".$this->getValue($path1,"FID")." USING SRID=".$this->getValue($path1,"SRID");
+			$connection = "user=".$this->getValue($path1,"username")." password=".$this->getValue($path1,"username")." dbname=".$this->getValue($path1,"dbName")." host=".$this->getValue($path1,"host")." port=".$this->getValue($path1,"port");
+			$connectiontype = MS_POSTGIS;
+		}
 		return array(
 			"minScale"=>$this->getValue($path,"minScale"),
 			"maxScale"=>$this->getValue($path,"maxScale"),
@@ -74,7 +92,9 @@ class gvsig2mapfile{
 			"proj"=>$this->getValue($path,"proj"),
 			"transparency"=>$this->getValue($path,"transparency"),
 			"type"=>$this->getValue($path,"type"),
-			"file"=>$this->getValue($path,"file"),
+			"data"=>$data,
+			"connection"=>$connection,
+			"connectiontype"=>$connectiontype,
 			"driverName"=>$this->getValue($path,"driverName"),
 			"isLabeled"=>$this->getValue($path,"isLabeled"),
 			"legenda"=>array(
@@ -155,10 +175,21 @@ class gvsig2mapfile{
 	}
 	function data2layer($oLayer,$dataLayer){
 		$oLayer->set("name",$this->nomeRandomico());
-		$oLayer->set("data",$dataLayer["file"]);
+		$oLayer->set("data",$dataLayer["data"]);
+		if($dataLayer["connectiontype"] != "")
+		{$oLayer->setConnectionType($dataLayer["connectiontype"]);}
+		if($dataLayer["connection"] != "")
+		{$oLayer->set("connection",$dataLayer["connection"]);}		
 		$oLayer->set("status",MS_DEFAULT);
 		if($dataLayer["visible"] == "false")
 		{$oLayer->set("status",MS_OFF);}
+		$opacidade = ($dataLayer["transparency"] * 100) / 255;
+		$oLayer->set("opacity",$opacidade);
+		if($dataLayer["minScale"] > 0)
+		{$oLayer->set("minscaledenom",$dataLayer["minScale"]);}
+		if($dataLayer["maxScale"] > 0)
+		{$oLayer->set("maxscaledenom",$dataLayer["maxScale"]);}
+		
 		$tipo = $dataLayer["legenda"]["classes"][0]["className"];
 		$oLayer->set("type",1);
 		if($tipo == "com.iver.cit.gvsig.fmap.core.symbols.SimpleMarkerSymbol")
@@ -172,7 +203,10 @@ class gvsig2mapfile{
 				$estilo->set("symbolname","ponto");
 			}
 			$ncor = explode(",",$data["color"]);
-			$cor = $estilo->color;
+			if($data["hasFill"] == "true")
+			{$cor = $estilo->color;}
+			else
+			{$cor = $estilo->outlinecolor;}
 			$cor->setrgb($ncor[0],$ncor[1],$ncor[2]);
 			if($data["size"] != false)
 			{$estilo->set("size",$data["size"]);}
 <?php
 	include_once("class.gvsig2mapfile.php");
 	error_reporting(E_ALL);
-	$gm = new gvsig2mapfile("C:\ms4w\Apache\htdocs\i3geo\pacotes\gvsig\projetoteste.gvp");
+	$gm = new gvsig2mapfile("C:\ms4w\Apache\htdocs\i3geo\pacotes\gvsig\gvsig2mapfile\projetoteste.gvp");
 	echo "<pre>";
 	$nomes = $gm->getViewsNames();
 	$view = $gm->getViewByName($nomes[0]);
@@ -11,5 +11,5 @@
 	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=
+	//localhost/i3geo/ms_criamapa.php?gvsiggvp=C:\ms4w\Apache\htdocs\i3geo\pacotes\gvsig\gvsig2mapfile\projetoteste.gvp&gvsigview=teste 1&temasa=
 ?>
 \ No newline at end of file
@@ -6,15 +6,19 @@
     <property key="creationDate" value="Mar 25, 2011"/>
     <property key="numExtents" value="0"/>
     <property key="numCameras" value="0"/>
-    <property key="data-source-count" value="25"/>
+    <property key="data-source-count" value="30"/>
     <property key="numDocuments" value="2"/>
-    <property key="modificationDate" value="Mar 28, 2011"/>
+    <property key="modificationDate" value="Apr 7, 2011"/>
     <property key="name" value="projetoteste.gvp"/>
     <property key="owner" value="Dono do projeto"/>
     <property key="selectionColor" value="255,255,0,255"/>
     <property key="projection" value="EPSG:27700"/>
     <property key="followHeaderEncoding" value="true"/>
     <xml-tag>
+        <property key="type" value="sameDriverFile"/>
+        <property key="gdbmsname" value="gdbms574d1a22_12f31209ac8__7ff4"/>
+    </xml-tag>
+    <xml-tag>
         <property key="type" value="otherDriverFile"/>
         <property key="gdbmsname" value="gdbms_3efbdd4f_12efe5773d1__7ff1"/>
         <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\RIO_INTERMITENTE.dbf"/>
@@ -28,6 +32,12 @@
     </xml-tag>
     <xml-tag>
         <property key="type" value="otherDriverFile"/>
+        <property key="gdbmsname" value="gdbms574d1a22_12f31209ac8__7ff3"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.dbf"/>
+        <property key="driverName" value="gdbms dbf driver"/>
+    </xml-tag>
+    <xml-tag>
+        <property key="type" value="otherDriverFile"/>
         <property key="gdbmsname" value="gdbms_3efbdd4f_12efe5773d1__7ff3"/>
         <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.dbf"/>
         <property key="driverName" value="gdbms dbf driver"/>
@@ -76,14 +86,14 @@
     </xml-tag>
     <xml-tag>
         <property key="type" value="otherDriverFile"/>
-        <property key="gdbmsname" value="gdbms760b52d1_12eee43d099__7ffa"/>
-        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\CURVA_NIVEL_INTERMEDIARIA_400.dbf"/>
+        <property key="gdbmsname" value="gdbms1cc05f5b_12efd076fd8__7ff5"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AEROPORTO_CAMPO_DE_POUSO.dbf"/>
         <property key="driverName" value="gdbms dbf driver"/>
     </xml-tag>
     <xml-tag>
         <property key="type" value="otherDriverFile"/>
-        <property key="gdbmsname" value="gdbms1cc05f5b_12efd076fd8__7ff5"/>
-        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AEROPORTO_CAMPO_DE_POUSO.dbf"/>
+        <property key="gdbmsname" value="gdbms760b52d1_12eee43d099__7ffa"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\CURVA_NIVEL_INTERMEDIARIA_400.dbf"/>
         <property key="driverName" value="gdbms dbf driver"/>
     </xml-tag>
     <xml-tag>
@@ -165,6 +175,22 @@
         <property key="driverName" value="gdbms dbf driver"/>
     </xml-tag>
     <xml-tag>
+        <property key="type" value="sameDriverFile"/>
+        <property key="gdbmsname" value="gdbms72533b10_12f313e0c95__7ff1"/>
+    </xml-tag>
+    <xml-tag>
+        <property key="type" value="otherDriverFile"/>
+        <property key="gdbmsname" value="gdbms72533b10_12f313e0c95__7ff3"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AREA_PARQUE.dbf"/>
+        <property key="driverName" value="gdbms dbf driver"/>
+    </xml-tag>
+    <xml-tag>
+        <property key="type" value="otherDriverFile"/>
+        <property key="gdbmsname" value="gdbms72533b10_12f313e0c95__7ff2"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AREA_PARQUE.dbf"/>
+        <property key="driverName" value="gdbms dbf driver"/>
+    </xml-tag>
+    <xml-tag>
         <property key="className" value="ProjectView"/>
         <property key="comment" value="Comentário"/>
         <property key="creationDate" value="3/25/11 3:24 PM"/>
@@ -176,13 +202,13 @@
             <property key="className" value="com.iver.cit.gvsig.fmap.MapContext"/>
             <xml-tag>
                 <property key="className" value="com.iver.cit.gvsig.fmap.ViewPort"/>
-                <property key="adjustedExtentX" value="-51.90943376137458"/>
+                <property key="adjustedExtentX" value="-52.25357561684568"/>
                 <property key="adjustedExtentY" value="-11.25304171250298"/>
-                <property key="adjustedExtentW" value="2.6466687325602045"/>
+                <property key="adjustedExtentW" value="3.3349524435024023"/>
                 <property key="adjustedExtentH" value="1.9368478730191256"/>
                 <property key="backColor" value="255,255,255,255"/>
-                <property key="dist1pixel" value="0.003566938918083906"/>
-                <property key="dist3pixel" value="0.010700816288590431"/>
+                <property key="dist1pixel" value="0.0026280160527676344"/>
+                <property key="dist3pixel" value="0.00788404792547226"/>
                 <property key="distanceUnits" value="1"/>
                 <property key="extentX" value="-51.72729379915035"/>
                 <property key="extentY" value="-11.25304171250298"/>
@@ -192,7 +218,7 @@
                 <property key="offsetX" value="0.0"/>
                 <property key="offsetY" value="0.0"/>
                 <property key="proj" value="EPSG:4291"/>
-                <property key="scale" value="280.35242600317434"/>
+                <property key="scale" value="380.5151712050451"/>
                 <xml-tag>
                     <property key="className" value="com.iver.cit.gvsig.fmap.ExtentHistory"/>
                     <property key="num" value="6"/>
@@ -232,22 +258,22 @@
                 <property key="visible" value="true"/>
                 <property key="transparency" value="255"/>
                 <property key="isInTOC" value="true"/>
-                <property key="numLayers" value="5"/>
-                <property key="LayerNames" value="estados.shp ,AREA_PARQUE.shp ,RIO_INTERMITENTE.shp ,RIO_PERMANENTE.shp ,Aeroportos"/>
+                <property key="numLayers" value="6"/>
+                <property key="LayerNames" value="teste.vegetacao ,AREA_PARQUE.shp ,RIO_INTERMITENTE.shp ,RIO_PERMANENTE.shp ,Aeroportos ,estados.shp"/>
                 <xml-tag>
                     <property key="className" value="com.iver.cit.gvsig.fmap.layers.FLyrVect"/>
-                    <property key="active" value="false"/>
-                    <property key="name" value="estados.shp"/>
-                    <property key="minScale" value="-1.0"/>
+                    <property key="active" value="true"/>
+                    <property key="name" value="teste.vegetacao"/>
+                    <property key="minScale" value="500000.0"/>
                     <property key="maxScale" value="-1.0"/>
                     <property key="visible" value="true"/>
                     <property key="proj" value="EPSG:4291"/>
                     <property key="transparency" value="255"/>
                     <property key="isInTOC" value="true"/>
                     <property key="type" value="vectorial"/>
-                    <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.shp"/>
-                    <property key="recordset-name" value="gdbms_3efbdd4f_12efe5773d1__7ff3"/>
-                    <property key="driverName" value="gvSIG shp driver"/>
+                    <property key="db" value="PostGIS JDBC Driver"/>
+                    <property key="recordset-name" value="gdbms574d1a22_12f31209ac8__7ff4"/>
+                    <property key="driverName" value="PostGIS JDBC Driver"/>
                     <property key="isLabeled" value="false"/>
                     <xml-tag>
                         <property key="childName" value="properties"/>
@@ -258,7 +284,7 @@
                             <xml-tag>
                                 <property key="className" value="org.gvsig.hyperlink.config.LinkConfig"/>
                                 <property key="actionCode" value="Txt_format"/>
-                                <property key="fieldName" value="ESTADO"/>
+                                <property key="fieldName" value="gid"/>
                                 <property key="extension" value=""/>
                             </xml-tag>
                         </xml-tag>
@@ -267,9 +293,9 @@
                         <property key="className" value="com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend"/>
                         <xml-tag>
                             <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol"/>
-                            <property key="color" value="249,233,179,255"/>
+                            <property key="color" value="193,200,127,255"/>
                             <property key="hasFill" value="true"/>
-                            <property key="desc" value=""/>
+                            <property key="desc"/>
                             <property key="isShapeVisible" value="true"/>
                             <property key="referenceSystem" value="0"/>
                             <property key="unit" value="-1"/>
@@ -300,14 +326,34 @@
                         <property key="numBitSet" value="0"/>
                     </xml-tag>
                     <xml-tag>
+                        <property key="className" value="com.iver.cit.gvsig.fmap.drivers.jdbc.postgis.PostGisDriver"/>
+                        <property key="catalog"/>
+                        <property key="username" value="postgres"/>
+                        <property key="driverclass" value="org.postgresql.Driver"/>
+                        <property key="schema" value="teste"/>
+                        <property key="tablename" value="vegetacao"/>
+                        <property key="fields" value="gid ,nome ,tipo ,desc_tipo ,sigla ,fonte"/>
+                        <property key="FID" value="gid"/>
+                        <property key="THE_GEOM" value="the_geom"/>
+                        <property key="whereclause" value=""/>
+                        <property key="SRID" value="4291"/>
+                        <property key="host" value="localhost"/>
+                        <property key="port" value="5432"/>
+                        <property key="dbName" value="postgis"/>
+                        <property key="literalDBName" value="true"/>
+                        <property key="connName" value="teste"/>
+                    </xml-tag>
+                    <xml-tag>
                         <property key="className" value="com.iver.cit.gvsig.fmap.rendering.styling.labeling.AttrInTableLabelingStrategy"/>
                         <property key="labelingStrategy" value="labelingStrategy"/>
-                        <property key="TextField" value="ESTADO"/>
+                        <property key="HeightField" value="gid"/>
+                        <property key="ColorField" value="gid"/>
+                        <property key="TextField" value="gid"/>
                         <property key="fontSize" value="8"/>
                         <property key="fontName" value="Segoe UI"/>
                         <property key="fontStyle" value="0"/>
-                        <property key="useFixedSize" value="true"/>
-                        <property key="useFixedColor" value="true"/>
+                        <property key="useFixedSize" value="false"/>
+                        <property key="useFixedColor" value="false"/>
                         <property key="fixedColor" value="0,0,0,255"/>
                         <property key="fixedSize" value="10.0"/>
                         <property key="Unit" value="1"/>
@@ -322,7 +368,7 @@
                 </xml-tag>
                 <xml-tag>
                     <property key="className" value="com.iver.cit.gvsig.fmap.layers.FLyrVect"/>
-                    <property key="active" value="true"/>
+                    <property key="active" value="false"/>
                     <property key="name" value="AREA_PARQUE.shp"/>
                     <property key="minScale" value="-1.0"/>
                     <property key="maxScale" value="-1.0"/>
@@ -353,7 +399,7 @@
                         <property key="className" value="com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend"/>
                         <xml-tag>
                             <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol"/>
-                            <property key="color" value="102,255,51,255"/>
+                            <property key="color" value="102,255,51,130"/>
                             <property key="hasFill" value="true"/>
                             <property key="desc" value=""/>
                             <property key="isShapeVisible" value="true"/>
@@ -703,6 +749,92 @@
                         <property key="typeLink" value="0"/>
                     </xml-tag>
                 </xml-tag>
+                <xml-tag>
+                    <property key="className" value="com.iver.cit.gvsig.fmap.layers.FLyrVect"/>
+                    <property key="active" value="false"/>
+                    <property key="name" value="estados.shp"/>
+                    <property key="minScale" value="-1.0"/>
+                    <property key="maxScale" value="-1.0"/>
+                    <property key="visible" value="true"/>
+                    <property key="proj" value="EPSG:4291"/>
+                    <property key="transparency" value="255"/>
+                    <property key="isInTOC" value="true"/>
+                    <property key="type" value="vectorial"/>
+                    <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.shp"/>
+                    <property key="recordset-name" value="gdbms_3efbdd4f_12efe5773d1__7ff3"/>
+                    <property key="driverName" value="gvSIG shp driver"/>
+                    <property key="isLabeled" value="false"/>
+                    <xml-tag>
+                        <property key="childName" value="properties"/>
+                        <xml-tag>
+                            <property key="className" value="org.gvsig.hyperlink.config.LayerLinkConfig"/>
+                            <property key="enabled" value="false"/>
+                            <property key="layerPropertyName" value="org.gvsig.hyperlink.config"/>
+                            <xml-tag>
+                                <property key="className" value="org.gvsig.hyperlink.config.LinkConfig"/>
+                                <property key="actionCode" value="Txt_format"/>
+                                <property key="fieldName" value="ESTADO"/>
+                                <property key="extension" value=""/>
+                            </xml-tag>
+                        </xml-tag>
+                    </xml-tag>
+                    <xml-tag>
+                        <property key="className" value="com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend"/>
+                        <xml-tag>
+                            <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol"/>
+                            <property key="color" value="249,233,179,255"/>
+                            <property key="hasFill" value="false"/>
+                            <property key="desc" value=""/>
+                            <property key="isShapeVisible" value="true"/>
+                            <property key="referenceSystem" value="0"/>
+                            <property key="unit" value="-1"/>
+                            <property key="hasOutline" value="true"/>
+                            <xml-tag>
+                                <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleLineSymbol"/>
+                                <property key="isShapeVisible" value="true"/>
+                                <property key="desc"/>
+                                <property key="unit" value="-1"/>
+                                <property key="referenceSystem" value="0"/>
+                                <property key="color" value="128,128,128,255"/>
+                                <xml-tag>
+                                    <property key="className" value="com.iver.cit.gvsig.fmap.core.styles.SimpleLineStyle"/>
+                                    <property key="desc"/>
+                                    <property key="lineWidth" value="3.0"/>
+                                    <property key="dashPhase" value="0.0"/>
+                                    <property key="endCap" value="0"/>
+                                    <property key="lineJoin" value="2"/>
+                                    <property key="miterLimit" value="10.0"/>
+                                    <property key="offset" value="0.0"/>
+                                    <property key="unit" value="0"/>
+                                </xml-tag>
+                            </xml-tag>
+                        </xml-tag>
+                    </xml-tag>
+                    <xml-tag>
+                        <property key="className" value="com.iver.cit.gvsig.fmap.layers.SelectionSupport"/>
+                        <property key="numBitSet" value="0"/>
+                    </xml-tag>
+                    <xml-tag>
+                        <property key="className" value="com.iver.cit.gvsig.fmap.rendering.styling.labeling.AttrInTableLabelingStrategy"/>
+                        <property key="labelingStrategy" value="labelingStrategy"/>
+                        <property key="TextField" value="ESTADO"/>
+                        <property key="fontSize" value="8"/>
+                        <property key="fontName" value="Segoe UI"/>
+                        <property key="fontStyle" value="0"/>
+                        <property key="useFixedSize" value="true"/>
+                        <property key="useFixedColor" value="true"/>
+                        <property key="fixedColor" value="0,0,0,255"/>
+                        <property key="fixedSize" value="10.0"/>
+                        <property key="Unit" value="1"/>
+                        <property key="referenceSystem" value="0"/>
+                    </xml-tag>
+                    <xml-tag>
+                        <property key="typeChild" value="linkProperties"/>
+                        <property key="extName"/>
+                        <property key="fieldName"/>
+                        <property key="typeLink" value="0"/>
+                    </xml-tag>
+                </xml-tag>
             </xml-tag>
         </xml-tag>
         <xml-tag>
@@ -1227,8 +1359,8 @@
             <property key="name" value="ViewInfoProperties"/>
             <property key="X" value="0"/>
             <property key="Y" value="0"/>
-            <property key="Width" value="1073"/>
-            <property key="Height" value="569"/>
+            <property key="Width" value="1600"/>
+            <property key="Height" value="763"/>
             <property key="isVisible" value="true"/>
             <property key="isResizable" value="true"/>
             <property key="isMaximizable" value="true"/>
@@ -1248,26 +1380,26 @@
             <xml-tag>
                 <property key="name" value="windowData"/>
                 <property key="GraphicLocator.isPalette" value="false"/>
-                <property key="GraphicLocator.Height" value="226"/>
+                <property key="GraphicLocator.Height" value="382"/>
                 <property key="MainDivider.Y" value="0"/>
                 <property key="MainDivider.X" value="0"/>
-                <property key="MapControl.Height" value="543"/>
-                <property key="TOCDivider.Location" value="309"/>
-                <property key="TOC.Height" value="308"/>
+                <property key="MapControl.Height" value="737"/>
+                <property key="TOCDivider.Location" value="347"/>
+                <property key="TOC.Height" value="346"/>
                 <property key="TOCDivider.Y" value="1"/>
                 <property key="TOCDivider.X" value="1"/>
                 <property key="MainDivider.Location" value="322"/>
-                <property key="MainDivider.Width" value="1072"/>
+                <property key="MainDivider.Width" value="1599"/>
                 <property key="MainWindow.X" value="0"/>
-                <property key="TOCDivider.Height" value="543"/>
+                <property key="TOCDivider.Height" value="737"/>
                 <property key="TOC.Width" value="319"/>
-                <property key="MainWindow.Width" value="1072"/>
+                <property key="MainWindow.Width" value="1599"/>
                 <property key="TOCDivider.Width" value="321"/>
                 <property key="MainWindow.Y" value="0"/>
-                <property key="MapControl.Width" value="742"/>
+                <property key="MapControl.Width" value="1269"/>
                 <property key="GraphicLocator.Width" value="319"/>
-                <property key="MainWindow.Height" value="545"/>
-                <property key="MainDivider.Height" value="545"/>
+                <property key="MainWindow.Height" value="739"/>
+                <property key="MainDivider.Height" value="739"/>
             </xml-tag>
         </xml-tag>
     </xml-tag>
@@ -6,15 +6,19 @@
     <property key="creationDate" value="Mar 25, 2011"/>
     <property key="numExtents" value="0"/>
     <property key="numCameras" value="0"/>
-    <property key="data-source-count" value="25"/>
+    <property key="data-source-count" value="30"/>
     <property key="numDocuments" value="2"/>
-    <property key="modificationDate" value="Mar 28, 2011"/>
+    <property key="modificationDate" value="Apr 7, 2011"/>
     <property key="name" value="projetoteste.gvp"/>
     <property key="owner" value="Dono do projeto"/>
     <property key="selectionColor" value="255,255,0,255"/>
     <property key="projection" value="EPSG:27700"/>
     <property key="followHeaderEncoding" value="true"/>
     <xml-tag>
+        <property key="type" value="sameDriverFile"/>
+        <property key="gdbmsname" value="gdbms574d1a22_12f31209ac8__7ff4"/>
+    </xml-tag>
+    <xml-tag>
         <property key="type" value="otherDriverFile"/>
         <property key="gdbmsname" value="gdbms_3efbdd4f_12efe5773d1__7ff1"/>
         <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\RIO_INTERMITENTE.dbf"/>
@@ -28,6 +32,12 @@
     </xml-tag>
     <xml-tag>
         <property key="type" value="otherDriverFile"/>
+        <property key="gdbmsname" value="gdbms574d1a22_12f31209ac8__7ff3"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.dbf"/>
+        <property key="driverName" value="gdbms dbf driver"/>
+    </xml-tag>
+    <xml-tag>
+        <property key="type" value="otherDriverFile"/>
         <property key="gdbmsname" value="gdbms_3efbdd4f_12efe5773d1__7ff3"/>
         <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.dbf"/>
         <property key="driverName" value="gdbms dbf driver"/>
@@ -76,14 +86,14 @@
     </xml-tag>
     <xml-tag>
         <property key="type" value="otherDriverFile"/>
-        <property key="gdbmsname" value="gdbms760b52d1_12eee43d099__7ffa"/>
-        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\CURVA_NIVEL_INTERMEDIARIA_400.dbf"/>
+        <property key="gdbmsname" value="gdbms1cc05f5b_12efd076fd8__7ff5"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AEROPORTO_CAMPO_DE_POUSO.dbf"/>
         <property key="driverName" value="gdbms dbf driver"/>
     </xml-tag>
     <xml-tag>
         <property key="type" value="otherDriverFile"/>
-        <property key="gdbmsname" value="gdbms1cc05f5b_12efd076fd8__7ff5"/>
-        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AEROPORTO_CAMPO_DE_POUSO.dbf"/>
+        <property key="gdbmsname" value="gdbms760b52d1_12eee43d099__7ffa"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\CURVA_NIVEL_INTERMEDIARIA_400.dbf"/>
         <property key="driverName" value="gdbms dbf driver"/>
     </xml-tag>
     <xml-tag>
@@ -165,6 +175,22 @@
         <property key="driverName" value="gdbms dbf driver"/>
     </xml-tag>
     <xml-tag>
+        <property key="type" value="sameDriverFile"/>
+        <property key="gdbmsname" value="gdbms72533b10_12f313e0c95__7ff1"/>
+    </xml-tag>
+    <xml-tag>
+        <property key="type" value="otherDriverFile"/>
+        <property key="gdbmsname" value="gdbms72533b10_12f313e0c95__7ff3"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AREA_PARQUE.dbf"/>
+        <property key="driverName" value="gdbms dbf driver"/>
+    </xml-tag>
+    <xml-tag>
+        <property key="type" value="otherDriverFile"/>
+        <property key="gdbmsname" value="gdbms72533b10_12f313e0c95__7ff2"/>
+        <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AREA_PARQUE.dbf"/>
+        <property key="driverName" value="gdbms dbf driver"/>
+    </xml-tag>
+    <xml-tag>
         <property key="className" value="ProjectView"/>
         <property key="comment" value="Comentário"/>
         <property key="creationDate" value="3/25/11 3:24 PM"/>
@@ -176,13 +202,13 @@
             <property key="className" value="com.iver.cit.gvsig.fmap.MapContext"/>
             <xml-tag>
                 <property key="className" value="com.iver.cit.gvsig.fmap.ViewPort"/>
-                <property key="adjustedExtentX" value="-51.90943376137458"/>
+                <property key="adjustedExtentX" value="-52.25357561684568"/>
                 <property key="adjustedExtentY" value="-11.25304171250298"/>
-                <property key="adjustedExtentW" value="2.6466687325602045"/>
+                <property key="adjustedExtentW" value="3.3349524435024023"/>
                 <property key="adjustedExtentH" value="1.9368478730191256"/>
                 <property key="backColor" value="255,255,255,255"/>
-                <property key="dist1pixel" value="0.003566938918083906"/>
-                <property key="dist3pixel" value="0.010700816288590431"/>
+                <property key="dist1pixel" value="0.0026280160527676344"/>
+                <property key="dist3pixel" value="0.00788404792547226"/>
                 <property key="distanceUnits" value="1"/>
                 <property key="extentX" value="-51.72729379915035"/>
                 <property key="extentY" value="-11.25304171250298"/>
@@ -192,7 +218,7 @@
                 <property key="offsetX" value="0.0"/>
                 <property key="offsetY" value="0.0"/>
                 <property key="proj" value="EPSG:4291"/>
-                <property key="scale" value="280.35242600317434"/>
+                <property key="scale" value="380.5151712050451"/>
                 <xml-tag>
                     <property key="className" value="com.iver.cit.gvsig.fmap.ExtentHistory"/>
                     <property key="num" value="6"/>
@@ -232,22 +258,22 @@
                 <property key="visible" value="true"/>
                 <property key="transparency" value="255"/>
                 <property key="isInTOC" value="true"/>
-                <property key="numLayers" value="5"/>
-                <property key="LayerNames" value="estados.shp ,AREA_PARQUE.shp ,RIO_INTERMITENTE.shp ,RIO_PERMANENTE.shp ,Aeroportos"/>
+                <property key="numLayers" value="6"/>
+                <property key="LayerNames" value="teste.vegetacao ,AREA_PARQUE.shp ,RIO_INTERMITENTE.shp ,RIO_PERMANENTE.shp ,Aeroportos ,estados.shp"/>
                 <xml-tag>
                     <property key="className" value="com.iver.cit.gvsig.fmap.layers.FLyrVect"/>
-                    <property key="active" value="false"/>
-                    <property key="name" value="estados.shp"/>
-                    <property key="minScale" value="-1.0"/>
+                    <property key="active" value="true"/>
+                    <property key="name" value="teste.vegetacao"/>
+                    <property key="minScale" value="500000.0"/>
                     <property key="maxScale" value="-1.0"/>
                     <property key="visible" value="true"/>
                     <property key="proj" value="EPSG:4291"/>
                     <property key="transparency" value="255"/>
                     <property key="isInTOC" value="true"/>
                     <property key="type" value="vectorial"/>
-                    <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.shp"/>
-                    <property key="recordset-name" value="gdbms_3efbdd4f_12efe5773d1__7ff3"/>
-                    <property key="driverName" value="gvSIG shp driver"/>
+                    <property key="db" value="PostGIS JDBC Driver"/>
+                    <property key="recordset-name" value="gdbms574d1a22_12f31209ac8__7ff4"/>
+                    <property key="driverName" value="PostGIS JDBC Driver"/>
                     <property key="isLabeled" value="false"/>
                     <xml-tag>
                         <property key="childName" value="properties"/>
@@ -258,7 +284,7 @@
                             <xml-tag>
                                 <property key="className" value="org.gvsig.hyperlink.config.LinkConfig"/>
                                 <property key="actionCode" value="Txt_format"/>
-                                <property key="fieldName" value="ESTADO"/>
+                                <property key="fieldName" value="gid"/>
                                 <property key="extension" value=""/>
                             </xml-tag>
                         </xml-tag>
@@ -267,9 +293,9 @@
                         <property key="className" value="com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend"/>
                         <xml-tag>
                             <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol"/>
-                            <property key="color" value="249,233,179,255"/>
+                            <property key="color" value="193,200,127,255"/>
                             <property key="hasFill" value="true"/>
-                            <property key="desc" value=""/>
+                            <property key="desc"/>
                             <property key="isShapeVisible" value="true"/>
                             <property key="referenceSystem" value="0"/>
                             <property key="unit" value="-1"/>
@@ -300,14 +326,34 @@
                         <property key="numBitSet" value="0"/>
                     </xml-tag>
                     <xml-tag>
+                        <property key="className" value="com.iver.cit.gvsig.fmap.drivers.jdbc.postgis.PostGisDriver"/>
+                        <property key="catalog"/>
+                        <property key="username" value="postgres"/>
+                        <property key="driverclass" value="org.postgresql.Driver"/>
+                        <property key="schema" value="teste"/>
+                        <property key="tablename" value="vegetacao"/>
+                        <property key="fields" value="gid ,nome ,tipo ,desc_tipo ,sigla ,fonte"/>
+                        <property key="FID" value="gid"/>
+                        <property key="THE_GEOM" value="the_geom"/>
+                        <property key="whereclause" value=""/>
+                        <property key="SRID" value="4291"/>
+                        <property key="host" value="localhost"/>
+                        <property key="port" value="5432"/>
+                        <property key="dbName" value="postgis"/>
+                        <property key="literalDBName" value="true"/>
+                        <property key="connName" value="teste"/>
+                    </xml-tag>
+                    <xml-tag>
                         <property key="className" value="com.iver.cit.gvsig.fmap.rendering.styling.labeling.AttrInTableLabelingStrategy"/>
                         <property key="labelingStrategy" value="labelingStrategy"/>
-                        <property key="TextField" value="ESTADO"/>
+                        <property key="HeightField" value="gid"/>
+                        <property key="ColorField" value="gid"/>
+                        <property key="TextField" value="gid"/>
                         <property key="fontSize" value="8"/>
                         <property key="fontName" value="Segoe UI"/>
                         <property key="fontStyle" value="0"/>
-                        <property key="useFixedSize" value="true"/>
-                        <property key="useFixedColor" value="true"/>
+                        <property key="useFixedSize" value="false"/>
+                        <property key="useFixedColor" value="false"/>
                         <property key="fixedColor" value="0,0,0,255"/>
                         <property key="fixedSize" value="10.0"/>
                         <property key="Unit" value="1"/>
@@ -322,7 +368,7 @@
                 </xml-tag>
                 <xml-tag>
                     <property key="className" value="com.iver.cit.gvsig.fmap.layers.FLyrVect"/>
-                    <property key="active" value="true"/>
+                    <property key="active" value="false"/>
                     <property key="name" value="AREA_PARQUE.shp"/>
                     <property key="minScale" value="-1.0"/>
                     <property key="maxScale" value="-1.0"/>
@@ -353,7 +399,7 @@
                         <property key="className" value="com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend"/>
                         <xml-tag>
                             <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol"/>
-                            <property key="color" value="102,255,51,255"/>
+                            <property key="color" value="102,255,51,130"/>
                             <property key="hasFill" value="true"/>
                             <property key="desc" value=""/>
                             <property key="isShapeVisible" value="true"/>
@@ -703,6 +749,92 @@
                         <property key="typeLink" value="0"/>
                     </xml-tag>
                 </xml-tag>
+                <xml-tag>
+                    <property key="className" value="com.iver.cit.gvsig.fmap.layers.FLyrVect"/>
+                    <property key="active" value="false"/>
+                    <property key="name" value="estados.shp"/>
+                    <property key="minScale" value="-1.0"/>
+                    <property key="maxScale" value="-1.0"/>
+                    <property key="visible" value="true"/>
+                    <property key="proj" value="EPSG:4291"/>
+                    <property key="transparency" value="255"/>
+                    <property key="isInTOC" value="true"/>
+                    <property key="type" value="vectorial"/>
+                    <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.shp"/>
+                    <property key="recordset-name" value="gdbms_3efbdd4f_12efe5773d1__7ff3"/>
+                    <property key="driverName" value="gvSIG shp driver"/>
+                    <property key="isLabeled" value="false"/>
+                    <xml-tag>
+                        <property key="childName" value="properties"/>
+                        <xml-tag>
+                            <property key="className" value="org.gvsig.hyperlink.config.LayerLinkConfig"/>
+                            <property key="enabled" value="false"/>
+                            <property key="layerPropertyName" value="org.gvsig.hyperlink.config"/>
+                            <xml-tag>
+                                <property key="className" value="org.gvsig.hyperlink.config.LinkConfig"/>
+                                <property key="actionCode" value="Txt_format"/>
+                                <property key="fieldName" value="ESTADO"/>
+                                <property key="extension" value=""/>
+                            </xml-tag>
+                        </xml-tag>
+                    </xml-tag>
+                    <xml-tag>
+                        <property key="className" value="com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend"/>
+                        <xml-tag>
+                            <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol"/>
+                            <property key="color" value="249,233,179,255"/>
+                            <property key="hasFill" value="false"/>
+                            <property key="desc" value=""/>
+                            <property key="isShapeVisible" value="true"/>
+                            <property key="referenceSystem" value="0"/>
+                            <property key="unit" value="-1"/>
+                            <property key="hasOutline" value="true"/>
+                            <xml-tag>
+                                <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleLineSymbol"/>
+                                <property key="isShapeVisible" value="true"/>
+                                <property key="desc"/>
+                                <property key="unit" value="-1"/>
+                                <property key="referenceSystem" value="0"/>
+                                <property key="color" value="128,128,128,255"/>
+                                <xml-tag>
+                                    <property key="className" value="com.iver.cit.gvsig.fmap.core.styles.SimpleLineStyle"/>
+                                    <property key="desc"/>
+                                    <property key="lineWidth" value="3.0"/>
+                                    <property key="dashPhase" value="0.0"/>
+                                    <property key="endCap" value="0"/>
+                                    <property key="lineJoin" value="2"/>
+                                    <property key="miterLimit" value="10.0"/>
+                                    <property key="offset" value="0.0"/>
+                                    <property key="unit" value="0"/>
+                                </xml-tag>
+                            </xml-tag>
+                        </xml-tag>
+                    </xml-tag>
+                    <xml-tag>
+                        <property key="className" value="com.iver.cit.gvsig.fmap.layers.SelectionSupport"/>
+                        <property key="numBitSet" value="0"/>
+                    </xml-tag>
+                    <xml-tag>
+                        <property key="className" value="com.iver.cit.gvsig.fmap.rendering.styling.labeling.AttrInTableLabelingStrategy"/>
+                        <property key="labelingStrategy" value="labelingStrategy"/>
+                        <property key="TextField" value="ESTADO"/>
+                        <property key="fontSize" value="8"/>
+                        <property key="fontName" value="Segoe UI"/>
+                        <property key="fontStyle" value="0"/>
+                        <property key="useFixedSize" value="true"/>
+                        <property key="useFixedColor" value="true"/>
+                        <property key="fixedColor" value="0,0,0,255"/>
+                        <property key="fixedSize" value="10.0"/>
+                        <property key="Unit" value="1"/>
+                        <property key="referenceSystem" value="0"/>
+                    </xml-tag>
+                    <xml-tag>
+                        <property key="typeChild" value="linkProperties"/>
+                        <property key="extName"/>
+                        <property key="fieldName"/>
+                        <property key="typeLink" value="0"/>
+                    </xml-tag>
+                </xml-tag>
             </xml-tag>
         </xml-tag>
         <xml-tag>
@@ -1227,8 +1359,8 @@
             <property key="name" value="ViewInfoProperties"/>
             <property key="X" value="0"/>
             <property key="Y" value="0"/>
-            <property key="Width" value="1073"/>
-            <property key="Height" value="569"/>
+            <property key="Width" value="1600"/>
+            <property key="Height" value="763"/>
             <property key="isVisible" value="true"/>
             <property key="isResizable" value="true"/>
             <property key="isMaximizable" value="true"/>
@@ -1248,26 +1380,26 @@
             <xml-tag>
                 <property key="name" value="windowData"/>
                 <property key="GraphicLocator.isPalette" value="false"/>
-                <property key="GraphicLocator.Height" value="226"/>
+                <property key="GraphicLocator.Height" value="382"/>
                 <property key="MainDivider.Y" value="0"/>
                 <property key="MainDivider.X" value="0"/>
-                <property key="MapControl.Height" value="543"/>
-                <property key="TOCDivider.Location" value="309"/>
-                <property key="TOC.Height" value="308"/>
+                <property key="MapControl.Height" value="737"/>
+                <property key="TOCDivider.Location" value="347"/>
+                <property key="TOC.Height" value="346"/>
                 <property key="TOCDivider.Y" value="1"/>
                 <property key="TOCDivider.X" value="1"/>
                 <property key="MainDivider.Location" value="322"/>
-                <property key="MainDivider.Width" value="1072"/>
+                <property key="MainDivider.Width" value="1599"/>
                 <property key="MainWindow.X" value="0"/>
-                <property key="TOCDivider.Height" value="543"/>
+                <property key="TOCDivider.Height" value="737"/>
                 <property key="TOC.Width" value="319"/>
-                <property key="MainWindow.Width" value="1072"/>
+                <property key="MainWindow.Width" value="1599"/>
                 <property key="TOCDivider.Width" value="321"/>
                 <property key="MainWindow.Y" value="0"/>
-                <property key="MapControl.Width" value="742"/>
+                <property key="MapControl.Width" value="1269"/>
                 <property key="GraphicLocator.Width" value="319"/>
-                <property key="MainWindow.Height" value="545"/>
-                <property key="MainDivider.Height" value="545"/>
+                <property key="MainWindow.Height" value="739"/>
+                <property key="MainDivider.Height" value="739"/>
             </xml-tag>
         </xml-tag>
     </xml-tag>
@@ -17,7 +17,9 @@
 <form id=i3GEOupload target="i3GEOuploadiframe" action="upload.php" method="post" ENCTYPE="multipart/form-data">
 	<p class="paragrafo" >Arquivo de projeto gvSig (.gvp). Será utilizada a primeira "view" existente no projeto.<br>
 	A conversão ainda é experimental, caso ocorra algum erro, envie o seu projeto para o e-mail: edmar.moretti@gmail.com<br>
-	Não há garantias de sigilo em relação ao arquivo enviado ao servidor. Evite utilizar dados restritos, como endereços e senhas.<br><br>
+	Não há garantias de sigilo em relação ao arquivo enviado ao servidor. Evite utilizar dados restritos, como endereços e senhas.<br>
+	No caso de camadas baseadas em conexões com banco de dados, a senha colocada em CONNECTION é igual ao nome do usuário, uma vez
+	que não é armazenada no arquivo .gvp<br><br>
 	<input type="file" size=42 name="i3GEOuploadfile" style="top:0px;left:0px;cursor:pointer;"></p>
 	<input type="submit" value="Upload" size=12 name="submit">
 	<input type="hidden" name="MAX_FILE_SIZE" value="100000">
...	...	@@ -301,7 +301,10 @@ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
301	301	Tipo:
302	302	{array ou string}
303	303	*/
304		- $postgis_mapa = array("teste"=>"user=postgres password=postgres dbname=pgutf8 host=localhost port=5432 options='-c client_encoding=LATIN1'"); //"user=geodados password=geodados dbname=geodados host=10.1.1.36 port=5432";
	304	+ $postgis_mapa = array(
	305	+ "teste"=>"user=postgres password=postgres dbname=pgutf8 host=localhost port=5432 options='-c client_encoding=LATIN1'",
	306	+ "postgres"=>"user=postgres password=postgres dbname=postgis host=localhost port=5432'",
	307	+ ); //"user=geodados password=geodados dbname=geodados host=10.1.1.36 port=5432";
305	308	/*
306	309	Variable: utilizacgi
307	310
...	...
...	...	@@ -1019,7 +1019,7 @@ Projeto gvsig
1019	1019	*/
1020	1020	function incluiMapaGvsig($gvsiggvp,$gvsigview){
1021	1021	global $mapn,$locaplic;
1022		- include_once($locaplic."/pacotes/gvsig/class.gvsig2mapfile.php");
	1022	+ include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php");
1023	1023	$gm = new gvsig2mapfile($gvsiggvp);
1024	1024	$dataView = $gm->getViewData($gvsigview);
1025	1025	//var_dump($dataView);
...	...
...	...	@@ -66,7 +66,25 @@ class gvsig2mapfile{
66	66	$result = $this->xml->xpath($path1);
67	67	if($result != FALSE)
68	68	{$classes = $this->SingleSymbolLegend($result,$path1);}
69		-
	69	+ //
	70	+ //obtem a conexão
	71	+ //a senha não pode ser obtida, então, é usado o mesmo nome de usuário em seu lugar. No i3Geo deve-se prever isso na variável de substituição de string.
	72	+ $driverName = $this->getValue($path,"driverName");
	73	+ if($driverName == "gvSIG shp driver"){
	74	+ $data = $this->getValue($path,"file");
	75	+ $connection = "";
	76	+ $connectiontype = "";
	77	+ }
	78	+ if($driverName == "PostGIS JDBC Driver"){
	79	+ $path1 = $path."/tag:xml-tag/tag:property[@value='org.postgresql.Driver']/parent::*";
	80	+ $tabela = "";
	81	+ if($this->getValue($path1,"schema") != "")
	82	+ {$tabela = $this->getValue($path1,"schema").".";}
	83	+ $tabela .= $this->getValue($path1,"tablename");
	84	+ $data = $this->getValue($path1,"THE_GEOM")." FROM (select ".$this->getValue($path1,"THE_GEOM").",".$this->getValue($path1,"fields")." FROM ".$tabela.") as foo USING UNIQUE ".$this->getValue($path1,"FID")." USING SRID=".$this->getValue($path1,"SRID");
	85	+ $connection = "user=".$this->getValue($path1,"username")." password=".$this->getValue($path1,"username")." dbname=".$this->getValue($path1,"dbName")." host=".$this->getValue($path1,"host")." port=".$this->getValue($path1,"port");
	86	+ $connectiontype = MS_POSTGIS;
	87	+ }
70	88	return array(
71	89	"minScale"=>$this->getValue($path,"minScale"),
72	90	"maxScale"=>$this->getValue($path,"maxScale"),
...	...	@@ -74,7 +92,9 @@ class gvsig2mapfile{
74	92	"proj"=>$this->getValue($path,"proj"),
75	93	"transparency"=>$this->getValue($path,"transparency"),
76	94	"type"=>$this->getValue($path,"type"),
77		- "file"=>$this->getValue($path,"file"),
	95	+ "data"=>$data,
	96	+ "connection"=>$connection,
	97	+ "connectiontype"=>$connectiontype,
78	98	"driverName"=>$this->getValue($path,"driverName"),
79	99	"isLabeled"=>$this->getValue($path,"isLabeled"),
80	100	"legenda"=>array(
...	...	@@ -155,10 +175,21 @@ class gvsig2mapfile{
155	175	}
156	176	function data2layer($oLayer,$dataLayer){
157	177	$oLayer->set("name",$this->nomeRandomico());
158		- $oLayer->set("data",$dataLayer["file"]);
	178	+ $oLayer->set("data",$dataLayer["data"]);
	179	+ if($dataLayer["connectiontype"] != "")
	180	+ {$oLayer->setConnectionType($dataLayer["connectiontype"]);}
	181	+ if($dataLayer["connection"] != "")
	182	+ {$oLayer->set("connection",$dataLayer["connection"]);}
159	183	$oLayer->set("status",MS_DEFAULT);
160	184	if($dataLayer["visible"] == "false")
161	185	{$oLayer->set("status",MS_OFF);}
	186	+ $opacidade = ($dataLayer["transparency"] * 100) / 255;
	187	+ $oLayer->set("opacity",$opacidade);
	188	+ if($dataLayer["minScale"] > 0)
	189	+ {$oLayer->set("minscaledenom",$dataLayer["minScale"]);}
	190	+ if($dataLayer["maxScale"] > 0)
	191	+ {$oLayer->set("maxscaledenom",$dataLayer["maxScale"]);}
	192	+
162	193	$tipo = $dataLayer["legenda"]["classes"][0]["className"];
163	194	$oLayer->set("type",1);
164	195	if($tipo == "com.iver.cit.gvsig.fmap.core.symbols.SimpleMarkerSymbol")
...	...	@@ -172,7 +203,10 @@ class gvsig2mapfile{
172	203	$estilo->set("symbolname","ponto");
173	204	}
174	205	$ncor = explode(",",$data["color"]);
175		- $cor = $estilo->color;
	206	+ if($data["hasFill"] == "true")
	207	+ {$cor = $estilo->color;}
	208	+ else
	209	+ {$cor = $estilo->outlinecolor;}
176	210	$cor->setrgb($ncor[0],$ncor[1],$ncor[2]);
177	211	if($data["size"] != false)
178	212	{$estilo->set("size",$data["size"]);}
...	...
1	1	<?php
2	2	include_once("class.gvsig2mapfile.php");
3	3	error_reporting(E_ALL);
4		- $gm = new gvsig2mapfile("C:\ms4w\Apache\htdocs\i3geo\pacotes\gvsig\projetoteste.gvp");
	4	+ $gm = new gvsig2mapfile("C:\ms4w\Apache\htdocs\i3geo\pacotes\gvsig\gvsig2mapfile\projetoteste.gvp");
5	5	echo "<pre>";
6	6	$nomes = $gm->getViewsNames();
7	7	$view = $gm->getViewByName($nomes[0]);
...	...	@@ -11,5 +11,5 @@
11	11	echo "Camadas: ".(implode(",",$dataView["layerNames"]))."\n";
12	12	foreach($dataView["layerNames"] as $lname)
13	13	{var_dump($gm->getLayerData($nomes[0],$lname));}
14		- //localhost/i3geo/ms_criamapa.php?gvsiggvp=C:\ms4w\Apache\htdocs\i3geo\pacotes\gvsig\projetoteste.gvp&gvsigview=teste 1&temasa=
	14	+ //localhost/i3geo/ms_criamapa.php?gvsiggvp=C:\ms4w\Apache\htdocs\i3geo\pacotes\gvsig\gvsig2mapfile\projetoteste.gvp&gvsigview=teste 1&temasa=
15	15	?>
16	16	\ No newline at end of file
...	...
...	...	@@ -6,15 +6,19 @@
6	6	<property key="creationDate" value="Mar 25, 2011"/>
7	7	<property key="numExtents" value="0"/>
8	8	<property key="numCameras" value="0"/>
9		- <property key="data-source-count" value="25"/>
	9	+ <property key="data-source-count" value="30"/>
10	10	<property key="numDocuments" value="2"/>
11		- <property key="modificationDate" value="Mar 28, 2011"/>
	11	+ <property key="modificationDate" value="Apr 7, 2011"/>
12	12	<property key="name" value="projetoteste.gvp"/>
13	13	<property key="owner" value="Dono do projeto"/>
14	14	<property key="selectionColor" value="255,255,0,255"/>
15	15	<property key="projection" value="EPSG:27700"/>
16	16	<property key="followHeaderEncoding" value="true"/>
17	17	<xml-tag>
	18	+ <property key="type" value="sameDriverFile"/>
	19	+ <property key="gdbmsname" value="gdbms574d1a22_12f31209ac8__7ff4"/>
	20	+ </xml-tag>
	21	+ <xml-tag>
18	22	<property key="type" value="otherDriverFile"/>
19	23	<property key="gdbmsname" value="gdbms_3efbdd4f_12efe5773d1__7ff1"/>
20	24	<property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\RIO_INTERMITENTE.dbf"/>
...	...	@@ -28,6 +32,12 @@
28	32	</xml-tag>
29	33	<xml-tag>
30	34	<property key="type" value="otherDriverFile"/>
	35	+ <property key="gdbmsname" value="gdbms574d1a22_12f31209ac8__7ff3"/>
	36	+ <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.dbf"/>
	37	+ <property key="driverName" value="gdbms dbf driver"/>
	38	+ </xml-tag>
	39	+ <xml-tag>
	40	+ <property key="type" value="otherDriverFile"/>
31	41	<property key="gdbmsname" value="gdbms_3efbdd4f_12efe5773d1__7ff3"/>
32	42	<property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.dbf"/>
33	43	<property key="driverName" value="gdbms dbf driver"/>
...	...	@@ -76,14 +86,14 @@
76	86	</xml-tag>
77	87	<xml-tag>
78	88	<property key="type" value="otherDriverFile"/>
79		- <property key="gdbmsname" value="gdbms760b52d1_12eee43d099__7ffa"/>
80		- <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\CURVA_NIVEL_INTERMEDIARIA_400.dbf"/>
	89	+ <property key="gdbmsname" value="gdbms1cc05f5b_12efd076fd8__7ff5"/>
	90	+ <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AEROPORTO_CAMPO_DE_POUSO.dbf"/>
81	91	<property key="driverName" value="gdbms dbf driver"/>
82	92	</xml-tag>
83	93	<xml-tag>
84	94	<property key="type" value="otherDriverFile"/>
85		- <property key="gdbmsname" value="gdbms1cc05f5b_12efd076fd8__7ff5"/>
86		- <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AEROPORTO_CAMPO_DE_POUSO.dbf"/>
	95	+ <property key="gdbmsname" value="gdbms760b52d1_12eee43d099__7ffa"/>
	96	+ <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\CURVA_NIVEL_INTERMEDIARIA_400.dbf"/>
87	97	<property key="driverName" value="gdbms dbf driver"/>
88	98	</xml-tag>
89	99	<xml-tag>
...	...	@@ -165,6 +175,22 @@
165	175	<property key="driverName" value="gdbms dbf driver"/>
166	176	</xml-tag>
167	177	<xml-tag>
	178	+ <property key="type" value="sameDriverFile"/>
	179	+ <property key="gdbmsname" value="gdbms72533b10_12f313e0c95__7ff1"/>
	180	+ </xml-tag>
	181	+ <xml-tag>
	182	+ <property key="type" value="otherDriverFile"/>
	183	+ <property key="gdbmsname" value="gdbms72533b10_12f313e0c95__7ff3"/>
	184	+ <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AREA_PARQUE.dbf"/>
	185	+ <property key="driverName" value="gdbms dbf driver"/>
	186	+ </xml-tag>
	187	+ <xml-tag>
	188	+ <property key="type" value="otherDriverFile"/>
	189	+ <property key="gdbmsname" value="gdbms72533b10_12f313e0c95__7ff2"/>
	190	+ <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\sc22\AREA_PARQUE.dbf"/>
	191	+ <property key="driverName" value="gdbms dbf driver"/>
	192	+ </xml-tag>
	193	+ <xml-tag>
168	194	<property key="className" value="ProjectView"/>
169	195	<property key="comment" value="Comentário"/>
170	196	<property key="creationDate" value="3/25/11 3:24 PM"/>
...	...	@@ -176,13 +202,13 @@
176	202	<property key="className" value="com.iver.cit.gvsig.fmap.MapContext"/>
177	203	<xml-tag>
178	204	<property key="className" value="com.iver.cit.gvsig.fmap.ViewPort"/>
179		- <property key="adjustedExtentX" value="-51.90943376137458"/>
	205	+ <property key="adjustedExtentX" value="-52.25357561684568"/>
180	206	<property key="adjustedExtentY" value="-11.25304171250298"/>
181		- <property key="adjustedExtentW" value="2.6466687325602045"/>
	207	+ <property key="adjustedExtentW" value="3.3349524435024023"/>
182	208	<property key="adjustedExtentH" value="1.9368478730191256"/>
183	209	<property key="backColor" value="255,255,255,255"/>
184		- <property key="dist1pixel" value="0.003566938918083906"/>
185		- <property key="dist3pixel" value="0.010700816288590431"/>
	210	+ <property key="dist1pixel" value="0.0026280160527676344"/>
	211	+ <property key="dist3pixel" value="0.00788404792547226"/>
186	212	<property key="distanceUnits" value="1"/>
187	213	<property key="extentX" value="-51.72729379915035"/>
188	214	<property key="extentY" value="-11.25304171250298"/>
...	...	@@ -192,7 +218,7 @@
192	218	<property key="offsetX" value="0.0"/>
193	219	<property key="offsetY" value="0.0"/>
194	220	<property key="proj" value="EPSG:4291"/>
195		- <property key="scale" value="280.35242600317434"/>
	221	+ <property key="scale" value="380.5151712050451"/>
196	222	<xml-tag>
197	223	<property key="className" value="com.iver.cit.gvsig.fmap.ExtentHistory"/>
198	224	<property key="num" value="6"/>
...	...	@@ -232,22 +258,22 @@
232	258	<property key="visible" value="true"/>
233	259	<property key="transparency" value="255"/>
234	260	<property key="isInTOC" value="true"/>
235		- <property key="numLayers" value="5"/>
236		- <property key="LayerNames" value="estados.shp ,AREA_PARQUE.shp ,RIO_INTERMITENTE.shp ,RIO_PERMANENTE.shp ,Aeroportos"/>
	261	+ <property key="numLayers" value="6"/>
	262	+ <property key="LayerNames" value="teste.vegetacao ,AREA_PARQUE.shp ,RIO_INTERMITENTE.shp ,RIO_PERMANENTE.shp ,Aeroportos ,estados.shp"/>
237	263	<xml-tag>
238	264	<property key="className" value="com.iver.cit.gvsig.fmap.layers.FLyrVect"/>
239		- <property key="active" value="false"/>
240		- <property key="name" value="estados.shp"/>
241		- <property key="minScale" value="-1.0"/>
	265	+ <property key="active" value="true"/>
	266	+ <property key="name" value="teste.vegetacao"/>
	267	+ <property key="minScale" value="500000.0"/>
242	268	<property key="maxScale" value="-1.0"/>
243	269	<property key="visible" value="true"/>
244	270	<property key="proj" value="EPSG:4291"/>
245	271	<property key="transparency" value="255"/>
246	272	<property key="isInTOC" value="true"/>
247	273	<property key="type" value="vectorial"/>
248		- <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.shp"/>
249		- <property key="recordset-name" value="gdbms_3efbdd4f_12efe5773d1__7ff3"/>
250		- <property key="driverName" value="gvSIG shp driver"/>
	274	+ <property key="db" value="PostGIS JDBC Driver"/>
	275	+ <property key="recordset-name" value="gdbms574d1a22_12f31209ac8__7ff4"/>
	276	+ <property key="driverName" value="PostGIS JDBC Driver"/>
251	277	<property key="isLabeled" value="false"/>
252	278	<xml-tag>
253	279	<property key="childName" value="properties"/>
...	...	@@ -258,7 +284,7 @@
258	284	<xml-tag>
259	285	<property key="className" value="org.gvsig.hyperlink.config.LinkConfig"/>
260	286	<property key="actionCode" value="Txt_format"/>
261		- <property key="fieldName" value="ESTADO"/>
	287	+ <property key="fieldName" value="gid"/>
262	288	<property key="extension" value=""/>
263	289	</xml-tag>
264	290	</xml-tag>
...	...	@@ -267,9 +293,9 @@
267	293	<property key="className" value="com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend"/>
268	294	<xml-tag>
269	295	<property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol"/>
270		- <property key="color" value="249,233,179,255"/>
	296	+ <property key="color" value="193,200,127,255"/>
271	297	<property key="hasFill" value="true"/>
272		- <property key="desc" value=""/>
	298	+ <property key="desc"/>
273	299	<property key="isShapeVisible" value="true"/>
274	300	<property key="referenceSystem" value="0"/>
275	301	<property key="unit" value="-1"/>
...	...	@@ -300,14 +326,34 @@
300	326	<property key="numBitSet" value="0"/>
301	327	</xml-tag>
302	328	<xml-tag>
	329	+ <property key="className" value="com.iver.cit.gvsig.fmap.drivers.jdbc.postgis.PostGisDriver"/>
	330	+ <property key="catalog"/>
	331	+ <property key="username" value="postgres"/>
	332	+ <property key="driverclass" value="org.postgresql.Driver"/>
	333	+ <property key="schema" value="teste"/>
	334	+ <property key="tablename" value="vegetacao"/>
	335	+ <property key="fields" value="gid ,nome ,tipo ,desc_tipo ,sigla ,fonte"/>
	336	+ <property key="FID" value="gid"/>
	337	+ <property key="THE_GEOM" value="the_geom"/>
	338	+ <property key="whereclause" value=""/>
	339	+ <property key="SRID" value="4291"/>
	340	+ <property key="host" value="localhost"/>
	341	+ <property key="port" value="5432"/>
	342	+ <property key="dbName" value="postgis"/>
	343	+ <property key="literalDBName" value="true"/>
	344	+ <property key="connName" value="teste"/>
	345	+ </xml-tag>
	346	+ <xml-tag>
303	347	<property key="className" value="com.iver.cit.gvsig.fmap.rendering.styling.labeling.AttrInTableLabelingStrategy"/>
304	348	<property key="labelingStrategy" value="labelingStrategy"/>
305		- <property key="TextField" value="ESTADO"/>
	349	+ <property key="HeightField" value="gid"/>
	350	+ <property key="ColorField" value="gid"/>
	351	+ <property key="TextField" value="gid"/>
306	352	<property key="fontSize" value="8"/>
307	353	<property key="fontName" value="Segoe UI"/>
308	354	<property key="fontStyle" value="0"/>
309		- <property key="useFixedSize" value="true"/>
310		- <property key="useFixedColor" value="true"/>
	355	+ <property key="useFixedSize" value="false"/>
	356	+ <property key="useFixedColor" value="false"/>
311	357	<property key="fixedColor" value="0,0,0,255"/>
312	358	<property key="fixedSize" value="10.0"/>
313	359	<property key="Unit" value="1"/>
...	...	@@ -322,7 +368,7 @@
322	368	</xml-tag>
323	369	<xml-tag>
324	370	<property key="className" value="com.iver.cit.gvsig.fmap.layers.FLyrVect"/>
325		- <property key="active" value="true"/>
	371	+ <property key="active" value="false"/>
326	372	<property key="name" value="AREA_PARQUE.shp"/>
327	373	<property key="minScale" value="-1.0"/>
328	374	<property key="maxScale" value="-1.0"/>
...	...	@@ -353,7 +399,7 @@
353	399	<property key="className" value="com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend"/>
354	400	<xml-tag>
355	401	<property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol"/>
356		- <property key="color" value="102,255,51,255"/>
	402	+ <property key="color" value="102,255,51,130"/>
357	403	<property key="hasFill" value="true"/>
358	404	<property key="desc" value=""/>
359	405	<property key="isShapeVisible" value="true"/>
...	...	@@ -703,6 +749,92 @@
703	749	<property key="typeLink" value="0"/>
704	750	</xml-tag>
705	751	</xml-tag>
	752	+ <xml-tag>
	753	+ <property key="className" value="com.iver.cit.gvsig.fmap.layers.FLyrVect"/>
	754	+ <property key="active" value="false"/>
	755	+ <property key="name" value="estados.shp"/>
	756	+ <property key="minScale" value="-1.0"/>
	757	+ <property key="maxScale" value="-1.0"/>
	758	+ <property key="visible" value="true"/>
	759	+ <property key="proj" value="EPSG:4291"/>
	760	+ <property key="transparency" value="255"/>
	761	+ <property key="isInTOC" value="true"/>
	762	+ <property key="type" value="vectorial"/>
	763	+ <property key="file" value="C:\ms4w\Apache\htdocs\i3geo\aplicmap\dados\estados.shp"/>
	764	+ <property key="recordset-name" value="gdbms_3efbdd4f_12efe5773d1__7ff3"/>
	765	+ <property key="driverName" value="gvSIG shp driver"/>
	766	+ <property key="isLabeled" value="false"/>
	767	+ <xml-tag>
	768	+ <property key="childName" value="properties"/>
	769	+ <xml-tag>
	770	+ <property key="className" value="org.gvsig.hyperlink.config.LayerLinkConfig"/>
	771	+ <property key="enabled" value="false"/>
	772	+ <property key="layerPropertyName" value="org.gvsig.hyperlink.config"/>
	773	+ <xml-tag>
	774	+ <property key="className" value="org.gvsig.hyperlink.config.LinkConfig"/>
	775	+ <property key="actionCode" value="Txt_format"/>
	776	+ <property key="fieldName" value="ESTADO"/>
	777	+ <property key="extension" value=""/>
	778	+ </xml-tag>
	779	+ </xml-tag>
	780	+ </xml-tag>
	781	+ <xml-tag>
	782	+ <property key="className" value="com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend"/>
	783	+ <xml-tag>
	784	+ <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol"/>
	785	+ <property key="color" value="249,233,179,255"/>
	786	+ <property key="hasFill" value="false"/>
	787	+ <property key="desc" value=""/>
	788	+ <property key="isShapeVisible" value="true"/>
	789	+ <property key="referenceSystem" value="0"/>
	790	+ <property key="unit" value="-1"/>
	791	+ <property key="hasOutline" value="true"/>
	792	+ <xml-tag>
	793	+ <property key="className" value="com.iver.cit.gvsig.fmap.core.symbols.SimpleLineSymbol"/>
	794	+ <property key="isShapeVisible" value="true"/>
	795	+ <property key="desc"/>
	796	+ <property key="unit" value="-1"/>
	797	+ <property key="referenceSystem" value="0"/>
	798	+ <property key="color" value="128,128,128,255"/>
	799	+ <xml-tag>
	800	+ <property key="className" value="com.iver.cit.gvsig.fmap.core.styles.SimpleLineStyle"/>
	801	+ <property key="desc"/>
	802	+ <property key="lineWidth" value="3.0"/>
	803	+ <property key="dashPhase" value="0.0"/>
	804	+ <property key="endCap" value="0"/>
	805	+ <property key="lineJoin" value="2"/>
	806	+ <property key="miterLimit" value="10.0"/>
	807	+ <property key="offset" value="0.0"/>
	808	+ <property key="unit" value="0"/>
	809	+ </xml-tag>
	810	+ </xml-tag>
	811	+ </xml-tag>
	812	+ </xml-tag>
	813	+ <xml-tag>
	814	+ <property key="className" value="com.iver.cit.gvsig.fmap.layers.SelectionSupport"/>
	815	+ <property key="numBitSet" value="0"/>
	816	+ </xml-tag>
	817	+ <xml-tag>
	818	+ <property key="className" value="com.iver.cit.gvsig.fmap.rendering.styling.labeling.AttrInTableLabelingStrategy"/>
	819	+ <property key="labelingStrategy" value="labelingStrategy"/>
	820	+ <property key="TextField" value="ESTADO"/>
	821	+ <property key="fontSize" value="8"/>
	822	+ <property key="fontName" value="Segoe UI"/>
	823	+ <property key="fontStyle" value="0"/>
	824	+ <property key="useFixedSize" value="true"/>
	825	+ <property key="useFixedColor" value="true"/>
	826	+ <property key="fixedColor" value="0,0,0,255"/>
	827	+ <property key="fixedSize" value="10.0"/>
	828	+ <property key="Unit" value="1"/>
	829	+ <property key="referenceSystem" value="0"/>
	830	+ </xml-tag>
	831	+ <xml-tag>
	832	+ <property key="typeChild" value="linkProperties"/>
	833	+ <property key="extName"/>
	834	+ <property key="fieldName"/>
	835	+ <property key="typeLink" value="0"/>
	836	+ </xml-tag>
	837	+ </xml-tag>
706	838	</xml-tag>
707	839	</xml-tag>
708	840	<xml-tag>
...	...	@@ -1227,8 +1359,8 @@
1227	1359	<property key="name" value="ViewInfoProperties"/>
1228	1360	<property key="X" value="0"/>
1229	1361	<property key="Y" value="0"/>
1230		- <property key="Width" value="1073"/>
1231		- <property key="Height" value="569"/>
	1362	+ <property key="Width" value="1600"/>
	1363	+ <property key="Height" value="763"/>
1232	1364	<property key="isVisible" value="true"/>
1233	1365	<property key="isResizable" value="true"/>
1234	1366	<property key="isMaximizable" value="true"/>
...	...	@@ -1248,26 +1380,26 @@
1248	1380	<xml-tag>
1249	1381	<property key="name" value="windowData"/>
1250	1382	<property key="GraphicLocator.isPalette" value="false"/>
1251		- <property key="GraphicLocator.Height" value="226"/>
	1383	+ <property key="GraphicLocator.Height" value="382"/>
1252	1384	<property key="MainDivider.Y" value="0"/>
1253	1385	<property key="MainDivider.X" value="0"/>
1254		- <property key="MapControl.Height" value="543"/>
1255		- <property key="TOCDivider.Location" value="309"/>
1256		- <property key="TOC.Height" value="308"/>
	1386	+ <property key="MapControl.Height" value="737"/>
	1387	+ <property key="TOCDivider.Location" value="347"/>
	1388	+ <property key="TOC.Height" value="346"/>
1257	1389	<property key="TOCDivider.Y" value="1"/>
1258	1390	<property key="TOCDivider.X" value="1"/>
1259	1391	<property key="MainDivider.Location" value="322"/>
1260		- <property key="MainDivider.Width" value="1072"/>
	1392	+ <property key="MainDivider.Width" value="1599"/>
1261	1393	<property key="MainWindow.X" value="0"/>
1262		- <property key="TOCDivider.Height" value="543"/>
	1394	+ <property key="TOCDivider.Height" value="737"/>
1263	1395	<property key="TOC.Width" value="319"/>
1264		- <property key="MainWindow.Width" value="1072"/>
	1396	+ <property key="MainWindow.Width" value="1599"/>
1265	1397	<property key="TOCDivider.Width" value="321"/>
1266	1398	<property key="MainWindow.Y" value="0"/>
1267		- <property key="MapControl.Width" value="742"/>
	1399	+ <property key="MapControl.Width" value="1269"/>
1268	1400	<property key="GraphicLocator.Width" value="319"/>
1269		- <property key="MainWindow.Height" value="545"/>
1270		- <property key="MainDivider.Height" value="545"/>
	1401	+ <property key="MainWindow.Height" value="739"/>
	1402	+ <property key="MainDivider.Height" value="739"/>
1271	1403	</xml-tag>
1272	1404	</xml-tag>
1273	1405	</xml-tag>
...	...
...	...	@@ -17,7 +17,9 @@
17	17	<form id=i3GEOupload target="i3GEOuploadiframe" action="upload.php" method="post" ENCTYPE="multipart/form-data">
18	18	<p class="paragrafo" >Arquivo de projeto gvSig (.gvp). Será utilizada a primeira "view" existente no projeto.<br>
19	19	A conversão ainda é experimental, caso ocorra algum erro, envie o seu projeto para o e-mail: edmar.moretti@gmail.com<br>
20		- Não há garantias de sigilo em relação ao arquivo enviado ao servidor. Evite utilizar dados restritos, como endereços e senhas.<br><br>
	20	+ Não há garantias de sigilo em relação ao arquivo enviado ao servidor. Evite utilizar dados restritos, como endereços e senhas.<br>
	21	+ No caso de camadas baseadas em conexões com banco de dados, a senha colocada em CONNECTION é igual ao nome do usuário, uma vez
	22	+ que não é armazenada no arquivo .gvp<br><br>
21	23	<input type="file" size=42 name="i3GEOuploadfile" style="top:0px;left:0px;cursor:pointer;"></p>
22	24	<input type="submit" value="Upload" size=12 name="submit">
23	25	<input type="hidden" name="MAX_FILE_SIZE" value="100000">
...	...