Commit d6320fb04a1df38e634ac7a5b67f48ec65927968
1 parent
905b7958
Exists in
master
and in
7 other branches
--no commit message
Showing
1 changed file
with
12 additions
and
23 deletions
Show diff stats
classesphp/classe_toponimia.php
| ... | ... | @@ -188,8 +188,7 @@ Retorno: |
| 188 | 188 | $novolayer->set("group",""); |
| 189 | 189 | $novolayer->set("type",MS_LAYER_ANNOTATION); |
| 190 | 190 | $nclasses = $novolayer->numclasses; |
| 191 | - for ($i=0; $i < $nclasses; ++$i) | |
| 192 | - { | |
| 191 | + for ($i=0; $i < $nclasses; ++$i){ | |
| 193 | 192 | $c = $novolayer->getclass($i); |
| 194 | 193 | $c->set("status",MS_DELETE); |
| 195 | 194 | } |
| ... | ... | @@ -212,7 +211,10 @@ Retorno: |
| 212 | 211 | //$novac = $this->layer->getclass(0); |
| 213 | 212 | $nomer = $this->layer->name; |
| 214 | 213 | } |
| 215 | - $nclasses = $this->layer->numclasses; | |
| 214 | + if(!$this->vi >= 60200){ | |
| 215 | + $this->layer->set("labelitem",$item); | |
| 216 | + } | |
| 217 | + $this->layer->set("labelitem",$item); | |
| 216 | 218 | for ($i=0; $i < $nclasses; ++$i){ |
| 217 | 219 | $novac = $this->layer->getclass($i); |
| 218 | 220 | if($this->vi >= 60200){ |
| ... | ... | @@ -289,29 +291,16 @@ Retorno: |
| 289 | 291 | else |
| 290 | 292 | {return($nomer);} |
| 291 | 293 | } |
| 294 | + //TODO nao funciona nas versoes antigas | |
| 292 | 295 | function removeToponimia(){ |
| 293 | 296 | $nclasses = $this->layer->numclasses; |
| 294 | - for ($i=0; $i < $nclasses; ++$i){ | |
| 295 | - $classe = $this->layer->getclass($i); | |
| 296 | - while($classe->numlabels > 0){ | |
| 297 | - $classe->removeLabel(0); | |
| 298 | - } | |
| 299 | - /* | |
| 300 | - $nlabel = $classe->numlabels; | |
| 301 | - for($i=0;$i<$nlabel;$i++){ | |
| 302 | - if($this->vi >= 60200){ | |
| 303 | - $label = $classe->getLabel($i); | |
| 304 | - } | |
| 305 | - else{ | |
| 306 | - $label = $classe->label; | |
| 307 | - } | |
| 308 | - $label->set("type",MS_TRUETYPE); | |
| 309 | - $label->set("font","arial"); | |
| 310 | - $label->set("size",0); | |
| 311 | - $s = "CLASS LABEL TEXT '' END END"; | |
| 312 | - $classe->updateFromString($s); | |
| 297 | + if($this->vi >= 60200){ | |
| 298 | + for ($i=0; $i < $nclasses; ++$i){ | |
| 299 | + $classe = $this->layer->getclass($i); | |
| 300 | + while($classe->numlabels > 0){ | |
| 301 | + $classe->removeLabel(0); | |
| 302 | + } | |
| 313 | 303 | } |
| 314 | - */ | |
| 315 | 304 | } |
| 316 | 305 | if ($this->layer){ |
| 317 | 306 | $this->layer->setMetaData("cache",""); | ... | ... |