From bf08a7a7e3bc2f25c19defb3d6e5cdfc784400fe Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Wed, 9 Jun 2010 08:30:24 +0000 Subject: [PATCH] --- admin/php/parsemapfile.php | 2 +- classesphp/classe_temas.php | 2 +- pacotes/kmlmapserver/classes/layerserver.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/php/parsemapfile.php b/admin/php/parsemapfile.php index bdff9b8..c87df65 100644 --- a/admin/php/parsemapfile.php +++ b/admin/php/parsemapfile.php @@ -103,7 +103,7 @@ function legendaValorUnico($layername) $valor = array(); // $classe = $layer->getclass(0); - $expressao = $classe->getExpression(); + $expressao = $classe->getExpressionString(); $item = preg_replace('/.*\[|\].*/i','\1', $expressao); for($i=0;$i<$nclasses;++$i) { diff --git a/classesphp/classe_temas.php b/classesphp/classe_temas.php index 17140cc..3a0a05c 100644 --- a/classesphp/classe_temas.php +++ b/classesphp/classe_temas.php @@ -436,7 +436,7 @@ $testa - Testa o filtro e retorna uma imagem. function insereFiltro($filtro,$testa="") { if(!$this->layer){return "erro";} - $fil = $this->layer->getfilter(); + $fil = $this->layer->getFilterString(); $filtro = str_replace("|","'",$filtro); if ($this->layer->connectiontype == MS_POSTGIS) { diff --git a/pacotes/kmlmapserver/classes/layerserver.class.php b/pacotes/kmlmapserver/classes/layerserver.class.php index 03405f0..1d3c8ae 100644 --- a/pacotes/kmlmapserver/classes/layerserver.class.php +++ b/pacotes/kmlmapserver/classes/layerserver.class.php @@ -629,7 +629,7 @@ class LayerServer { $style['icon'] = $this->get_icon_url($layer, $class->name,$i); $style['icon_width'] = $_style->size; // Points } - $style['expression'] = $class->getExpression(); + $style['expression'] = $class->getExpressionString(); // Set description_template if any $style['description_template'] = $description_template; // Get icon for lines if any -- libgit2 0.21.2