Commit bf08a7a7e3bc2f25c19defb3d6e5cdfc784400fe
1 parent
fc14fe1e
Exists in
master
and in
7 other branches
--no commit message
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
admin/php/parsemapfile.php
| @@ -103,7 +103,7 @@ function legendaValorUnico($layername) | @@ -103,7 +103,7 @@ function legendaValorUnico($layername) | ||
| 103 | $valor = array(); | 103 | $valor = array(); |
| 104 | // | 104 | // |
| 105 | $classe = $layer->getclass(0); | 105 | $classe = $layer->getclass(0); |
| 106 | - $expressao = $classe->getExpression(); | 106 | + $expressao = $classe->getExpressionString(); |
| 107 | $item = preg_replace('/.*\[|\].*/i','\1', $expressao); | 107 | $item = preg_replace('/.*\[|\].*/i','\1', $expressao); |
| 108 | for($i=0;$i<$nclasses;++$i) | 108 | for($i=0;$i<$nclasses;++$i) |
| 109 | { | 109 | { |
classesphp/classe_temas.php
| @@ -436,7 +436,7 @@ $testa - Testa o filtro e retorna uma imagem. | @@ -436,7 +436,7 @@ $testa - Testa o filtro e retorna uma imagem. | ||
| 436 | function insereFiltro($filtro,$testa="") | 436 | function insereFiltro($filtro,$testa="") |
| 437 | { | 437 | { |
| 438 | if(!$this->layer){return "erro";} | 438 | if(!$this->layer){return "erro";} |
| 439 | - $fil = $this->layer->getfilter(); | 439 | + $fil = $this->layer->getFilterString(); |
| 440 | $filtro = str_replace("|","'",$filtro); | 440 | $filtro = str_replace("|","'",$filtro); |
| 441 | if ($this->layer->connectiontype == MS_POSTGIS) | 441 | if ($this->layer->connectiontype == MS_POSTGIS) |
| 442 | { | 442 | { |
pacotes/kmlmapserver/classes/layerserver.class.php
| @@ -629,7 +629,7 @@ class LayerServer { | @@ -629,7 +629,7 @@ class LayerServer { | ||
| 629 | $style['icon'] = $this->get_icon_url($layer, $class->name,$i); | 629 | $style['icon'] = $this->get_icon_url($layer, $class->name,$i); |
| 630 | $style['icon_width'] = $_style->size; // Points | 630 | $style['icon_width'] = $_style->size; // Points |
| 631 | } | 631 | } |
| 632 | - $style['expression'] = $class->getExpression(); | 632 | + $style['expression'] = $class->getExpressionString(); |
| 633 | // Set description_template if any | 633 | // Set description_template if any |
| 634 | $style['description_template'] = $description_template; | 634 | $style['description_template'] = $description_template; |
| 635 | // Get icon for lines if any | 635 | // Get icon for lines if any |