Correção no conversor gvp para mapfile no processamento de camadas lineares

Edmar Moretti
1 parent 5aed408a
Showing 2 changed files with 9 additions and 4 deletions Show diff stats
pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php
pacotes/gvsig/gvsig2mapfile/gvsig2mapfile.zip
@@ -165,7 +165,7 @@ class gvsig2mapfile{
 	function VectorialUniqueValueLegend($result,$path1,$coluna,$tipocoluna,$valores,$nomes){
 		$valores = ",".str_replace(" ,",",",$valores);
 		$valores = explode(",",$valores);
-		$nomes = ",".str_replace(" ,",",",$nomes);
+		$nomes = ",".str_replace(" ,",",",$nomes);
 		$nomes = explode(",",$nomes);
 		$classes = array();
 		$c = 0;
@@ -187,8 +187,8 @@ class gvsig2mapfile{
 			$classe["markerStyle"] = (string) $this->getValue($path1,"markerStyle",$c);
 			$classe["hasFill"] = (string) $this->getValue($path1,"hasFill",$c);
 			$classe["hasOutline"] = (string) $this->getValue($path1,"hasOutline",$c);
-			if($classe["hasOutline"] == "true"){
-				$classe["outline"] = (string) $this->getValue($path1."/tag:xml-tag","color",0);
+			if($classe["hasOutline"] == "true"){
+				$classe["outline"] = (string) $this->getValue($path1."/tag:xml-tag","color",0);
 			}
 			else{
 				$classe["outline"] = (string) $this->getValue($path1,"color",$c);
@@ -299,13 +299,18 @@ class gvsig2mapfile{
 					$cor = $estilo->outlinecolor;
 					$cor->setrgb($ncor[0],$ncor[1],$ncor[2]);
 				}
+
+				if($data["hasFill"] == "" && $data["hasOutline"] == ""){
+					$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"]);}
 		}
-
 		return $oLayer;
 	}
 	function findAttribute($object, $attribute) {
...	...	@@ -165,7 +165,7 @@ class gvsig2mapfile{
165	165	function VectorialUniqueValueLegend($result,$path1,$coluna,$tipocoluna,$valores,$nomes){
166	166	$valores = ",".str_replace(" ,",",",$valores);
167	167	$valores = explode(",",$valores);
168		- $nomes = ",".str_replace(" ,",",",$nomes);
	168	+ $nomes = ",".str_replace(" ,",",",$nomes);
169	169	$nomes = explode(",",$nomes);
170	170	$classes = array();
171	171	$c = 0;
...	...	@@ -187,8 +187,8 @@ class gvsig2mapfile{
187	187	$classe["markerStyle"] = (string) $this->getValue($path1,"markerStyle",$c);
188	188	$classe["hasFill"] = (string) $this->getValue($path1,"hasFill",$c);
189	189	$classe["hasOutline"] = (string) $this->getValue($path1,"hasOutline",$c);
190		- if($classe["hasOutline"] == "true"){
191		- $classe["outline"] = (string) $this->getValue($path1."/tag:xml-tag","color",0);
	190	+ if($classe["hasOutline"] == "true"){
	191	+ $classe["outline"] = (string) $this->getValue($path1."/tag:xml-tag","color",0);
192	192	}
193	193	else{
194	194	$classe["outline"] = (string) $this->getValue($path1,"color",$c);
...	...	@@ -299,13 +299,18 @@ class gvsig2mapfile{
299	299	$cor = $estilo->outlinecolor;
300	300	$cor->setrgb($ncor[0],$ncor[1],$ncor[2]);
301	301	}
	302	+
	303	+ if($data["hasFill"] == "" && $data["hasOutline"] == ""){
	304	+ $ncor = explode(",",$data["color"]);
	305	+ $cor = $estilo->color;
	306	+ $cor->setrgb($ncor[0],$ncor[1],$ncor[2]);
	307	+ }
302	308	}
303	309	if($data["size"] != false)
304	310	{$estilo->set("size",$data["size"]);}
305	311	if($data["exp"] != false)
306	312	{$classe->setExpression($data["exp"]);}
307	313	}
308		-
309	314	return $oLayer;
310	315	}
311	316	function findAttribute($object, $attribute) {
...	...