Commit a777a13a5afceb6021c3bf18281ebd4232643adb
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 | 177 | error_reporting(0); |
178 | 178 | if(!$this->layer){return "erro";} |
179 | 179 | $this->removeToponimia(); |
180 | + | |
180 | 181 | if (!isset($tipo)){$tipo = "";} |
181 | 182 | if ($item != "") //o layer nao tem tabela mas tem toponimia |
182 | 183 | { |
... | ... | @@ -186,7 +187,7 @@ Retorno: |
186 | 187 | $nomer = nomeRandomico(); |
187 | 188 | $novolayer->set("name",$nomer); |
188 | 189 | $novolayer->set("group",""); |
189 | - $novolayer->set("type",MS_LAYER_ANNOTATION); | |
190 | + $novolayer->set("type",$this->layer->type); | |
190 | 191 | $nclasses = $novolayer->numclasses; |
191 | 192 | for ($i=0; $i < $nclasses; ++$i){ |
192 | 193 | $c = $novolayer->getclass($i); |
... | ... | @@ -242,13 +243,15 @@ Retorno: |
242 | 243 | } |
243 | 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 | 248 | $label->set("font",$fonte); |
247 | 249 | $label->set("size",$tamanho); |
248 | 250 | } |
249 | 251 | else |
250 | 252 | { |
251 | - $label->set("type",MS_BITMAP); | |
253 | + //$label->set("type",MS_BITMAP); | |
254 | + $label->updatefromstring("LABEL TYPE BITMAP END"); | |
252 | 255 | //$label->set("font",$fonte); |
253 | 256 | $t = MS_TINY; |
254 | 257 | if ($tamanho > 5 ){$t = MS_TINY;} |
... | ... | @@ -261,10 +264,10 @@ Retorno: |
261 | 264 | if($angulo > 0){ |
262 | 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 | 271 | $label->updatefromstring("LABEL ANGLE FOLLOW END"); |
269 | 272 | } |
270 | 273 | corE($label,$cor,"color"); | ... | ... |