diff --git a/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php b/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php index 3fa0a1d..5f16670 100644 --- a/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php +++ b/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php @@ -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) { diff --git a/pacotes/gvsig/gvsig2mapfile/gvsig2mapfile.zip b/pacotes/gvsig/gvsig2mapfile/gvsig2mapfile.zip index bd38a2d..6b33d6e 100644 Binary files a/pacotes/gvsig/gvsig2mapfile/gvsig2mapfile.zip and b/pacotes/gvsig/gvsig2mapfile/gvsig2mapfile.zip differ -- libgit2 0.21.2