Commit a777a13a5afceb6021c3bf18281ebd4232643adb

Authored by Edmar Moretti
1 parent 816db044
Exists in master

--no commit message

Showing 1 changed file with 10 additions and 7 deletions   Show diff stats
classesphp/classe_toponimia.php
@@ -177,6 +177,7 @@ Retorno: @@ -177,6 +177,7 @@ Retorno:
177 error_reporting(0); 177 error_reporting(0);
178 if(!$this->layer){return "erro";} 178 if(!$this->layer){return "erro";}
179 $this->removeToponimia(); 179 $this->removeToponimia();
  180 +
180 if (!isset($tipo)){$tipo = "";} 181 if (!isset($tipo)){$tipo = "";}
181 if ($item != "") //o layer nao tem tabela mas tem toponimia 182 if ($item != "") //o layer nao tem tabela mas tem toponimia
182 { 183 {
@@ -186,7 +187,7 @@ Retorno: @@ -186,7 +187,7 @@ Retorno:
186 $nomer = nomeRandomico(); 187 $nomer = nomeRandomico();
187 $novolayer->set("name",$nomer); 188 $novolayer->set("name",$nomer);
188 $novolayer->set("group",""); 189 $novolayer->set("group","");
189 - $novolayer->set("type",MS_LAYER_ANNOTATION); 190 + $novolayer->set("type",$this->layer->type);
190 $nclasses = $novolayer->numclasses; 191 $nclasses = $novolayer->numclasses;
191 for ($i=0; $i < $nclasses; ++$i){ 192 for ($i=0; $i < $nclasses; ++$i){
192 $c = $novolayer->getclass($i); 193 $c = $novolayer->getclass($i);
@@ -242,13 +243,15 @@ Retorno: @@ -242,13 +243,15 @@ Retorno:
242 } 243 }
243 if ($fonte != "bitmap") 244 if ($fonte != "bitmap")
244 { 245 {
245 - $label->set("type",MS_TRUETYPE); 246 + //$label->set("type",MS_TRUETYPE);
  247 + $label->updatefromstring("LABEL TYPE TRUETYPE END");
246 $label->set("font",$fonte); 248 $label->set("font",$fonte);
247 $label->set("size",$tamanho); 249 $label->set("size",$tamanho);
248 } 250 }
249 else 251 else
250 { 252 {
251 - $label->set("type",MS_BITMAP); 253 + //$label->set("type",MS_BITMAP);
  254 + $label->updatefromstring("LABEL TYPE BITMAP END");
252 //$label->set("font",$fonte); 255 //$label->set("font",$fonte);
253 $t = MS_TINY; 256 $t = MS_TINY;
254 if ($tamanho > 5 ){$t = MS_TINY;} 257 if ($tamanho > 5 ){$t = MS_TINY;}
@@ -261,10 +264,10 @@ Retorno: @@ -261,10 +264,10 @@ Retorno:
261 if($angulo > 0){ 264 if($angulo > 0){
262 $label->set("angle",$angulo); 265 $label->set("angle",$angulo);
263 } 266 }
264 - if($angulo == "AUTO")  
265 - {$label->updatefromstring("LABEL ANGLE AUTO END");}  
266 - if (strtoupper($angulo) == "CURVO" || strtoupper($angulo) == "FOLLOW")  
267 - { 267 + if($angulo == "AUTO"){
  268 + $label->updatefromstring("LABEL ANGLE AUTO END");
  269 + }
  270 + if (strtoupper($angulo) == "CURVO" || strtoupper($angulo) == "FOLLOW"){
268 $label->updatefromstring("LABEL ANGLE FOLLOW END"); 271 $label->updatefromstring("LABEL ANGLE FOLLOW END");
269 } 272 }
270 corE($label,$cor,"color"); 273 corE($label,$cor,"color");