From e8b9c39cdaf5bca95e3a757b4aadc43c883b258a Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Wed, 16 Dec 2009 13:53:40 +0000 Subject: [PATCH] #242 --- admin/php/editormapfile.php | 34 +++++++++++++++++----------------- admin/php/parsemapfile.php | 22 +++++++++++----------- admin/php/temas.php | 22 +++++++++++----------- classesphp/classe_analise.php | 24 ++++++++++++------------ classesphp/classe_atributos.php | 18 +++++++++--------- classesphp/classe_legenda.php | 2 +- classesphp/classe_mapa.php | 12 ++++++------ classesphp/classe_selecao.php | 6 +++--- classesphp/classe_shp.php | 6 +++--- classesphp/classe_temas.php | 16 ++++++++-------- classesphp/classe_vermultilayer.php | 4 ++-- classesphp/funcoes_gerais.php | 14 +++++++------- classesphp/mapa_inicia.php | 2 +- geraminiatura.php | 2 +- menutemas/admin.db | Bin 53248 -> 0 bytes ms_criamapa.php | 4 ++-- testamapfile.php | 2 +- 17 files changed, 95 insertions(+), 95 deletions(-) diff --git a/admin/php/editormapfile.php b/admin/php/editormapfile.php index 9a4009e..73815ef 100644 --- a/admin/php/editormapfile.php +++ b/admin/php/editormapfile.php @@ -580,21 +580,21 @@ function pegaGeral() $mapa = ms_newMapObj($mapfile); $layer = $mapa->getlayerbyname($codigoLayer); $dados["type"] = $layer->type; - $dados["filter"] = $layer->getfilter(); + $dados["filter"] = $layer->getfilterstring(); if($dados["filter"]== ""){$dados["filter"] = "";} $dados["filteritem"] = $layer->filteritem; $dados["group"] = $layer->group; //$dados["labelangleitem"] = $layer->labelangleitem; $dados["labelitem"] = $layer->labelitem; - $dados["labelmaxscale"] = $layer->labelmaxscale; - $dados["labelmaxscale"] = $layer->labelmaxscale; - $dados["labelminscale"] = $layer->labelminscale; + $dados["labelmaxscale"] = $layer->labelmaxscaledenom; + $dados["labelmaxscale"] = $layer->labelmaxscaledenom; + $dados["labelminscale"] = $layer->labelminscaledenom; //$dados["labelsizeitem"] = $layer->labelsizeitem; - $dados["maxscale"] = $layer->maxscale; - $dados["minscale"] = $layer->minscale; + $dados["maxscale"] = $layer->maxscaledenom; + $dados["minscale"] = $layer->minscaledenom; $dados["offsite"] = $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue; $v["principal"] == "4" ? $dados["opacity"] = $layer->transparency : $dados["opacity"] = $layer->opacity; - $dados["symbolscale"] = $layer->symbolscale; + $dados["symbolscale"] = $layer->symbolscaledenom; $dados["tolerance"] = $layer->tolerance; $dados["toleranceunits"] = $layer->toleranceunits; $dados["status"] = $layer->status; @@ -629,11 +629,11 @@ function alterarGeral() $layer->set("group",$group); //$layer->set("labelangleitem",$labelangleitem); $layer->set("labelitem",$labelitem); - $layer->set("labelmaxscale",$labelmaxscale); - $layer->set("labelminscale",$labelminscale); + $layer->set("labelmaxscaledenom",$labelmaxscale); + $layer->set("labelminscaledenom",$labelminscale); //$layer->set("labelsizeitem",$labelsizeitem); - $layer->set("maxscale",$maxscale); - $layer->set("minscale",$minscale); + $layer->set("maxscaledenom",$maxscale); + $layer->set("minscaledenom",$minscale); $cor = $layer->offsite; $c = explode(",",$offsite); if(count($c) < 3) @@ -642,7 +642,7 @@ function alterarGeral() $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue; $v["principal"] == "4" ? $layer->set("transparency",$opacity) : $layer->set("opacity",$opacity); - $layer->set("symbolscale",$symbolscale); + $layer->set("symbolscaledenom",$symbolscale); $layer->set("tolerance",$tolerance); $layer->set("toleranceunits",$toleranceunits); $layer->set("status",$status); @@ -679,15 +679,15 @@ function pegaClasseGeral() $classe = $layer->getclass($indiceClasse); $dados["name"] = $classe->name; $dados["title"] = $classe->title; - $temp = $classe->getExpression(); + $temp = $classe->getExpressionString(); $temp = str_replace("[","_C",$temp); $temp = str_replace("]","C_",$temp); $temp = str_replace("'","_A_",$temp); //substitui caracteres que dão problemas $dados["expression"] = $temp; $dados["keyimage"] = $classe->keyimage; - $dados["maxscale"] = $classe->maxscale; - $dados["minscale"] = $classe->minscale; + $dados["maxscale"] = $classe->maxscaledenom; + $dados["minscale"] = $classe->minscaledenom; $dados["status"] = $classe->status; //$dados["text"] = $classe->getTextString(); $dados["codigoMap"] = $codigoMap; @@ -711,8 +711,8 @@ function alterarClasseGeral() $temp = str_replace("_A_","'",$temp); $classe->setexpression($temp); $classe->set("keyimage",$keyimage); - $classe->set("maxscale",$maxscale); - $classe->set("minscale",$minscale); + $classe->set("maxscaledenom",$maxscale); + $classe->set("minscaledenom",$minscale); $classe->set("status",$status); $mapa->save($mapfile); removeCabecalho($mapfile); diff --git a/admin/php/parsemapfile.php b/admin/php/parsemapfile.php index 177ec46..4d26f6c 100644 --- a/admin/php/parsemapfile.php +++ b/admin/php/parsemapfile.php @@ -60,7 +60,7 @@ function tipoLegenda($layername) if($nclasses == 1) { $classe = $layer->getclass(0); - $expressao = $classe->getExpression(); + $expressao = $classe->getExpressionString(); if($expressao == "") {return "simples";exit;} $expressao = str_replace("'eq'","="); @@ -74,7 +74,7 @@ function tipoLegenda($layername) for($i=0;$i<$nclasses;++$i) { $classe = $layer->getclass($i); - $expressao = $classe->getExpression(); + $expressao = $classe->getExpressionString(); if(count(explode("[",$expressao)) > 2) { return "intervalo"; @@ -114,7 +114,7 @@ function legendaValorUnico($layername) $outlinecolor[] = "'".$cor->red.",".$cor->green.",".$cor->blue.",255'"; $cor = $estilo->color; $color[] = "'".$cor->red.",".$cor->green.",".$cor->blue.",255'"; - $expressao = $classe->getExpression(); + $expressao = $classe->getExpressionString(); $expressao = str_replace("'eq","=",$expressao); $expressao = str_replace("'eq ","=",$expressao); $expressao = str_replace("' eq","=",$expressao); @@ -339,22 +339,22 @@ function mapfile() $xml .= "".$esquemaTabela[1].""; $xml .= "".$s[1].""; $xml .= "".$objlayertypes[$layer->type]."\n"; - $xml .= "".$layer->getfilter()."\n"; + $xml .= "".$layer->getfilterstring()."\n"; $xml .= "$layer->filteritem\n"; $xml .= "$layer->labelangleitem\n"; $xml .= "$layer->labelitem\n"; - $xml .= "$layer->labelmaxscale\n"; - $xml .= "$layer->labelminscale\n"; - $xml .= "$layer->labelsizeitem\n"; + $xml .= "$layer->labelmaxscaledenom\n"; + $xml .= "$layer->labelminscaledenom\n"; + $xml .= "\n"; } $xml .= "$layer->group\n"; - $xml .= "$layer->maxscale\n"; - $xml .= "$layer->minscale\n"; + $xml .= "$layer->maxscaledenom\n"; + $xml .= "$layer->minscaledenom\n"; $xml .= "".$layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue."\n"; $xml .= "$layer->opacity\n"; if($ct != "MS_WMS") { - $xml .= "$layer->symbolscale\n"; + $xml .= "$layer->symbolscaledenom\n"; $xml .= "$layer->tileindex\n"; $xml .= "$layer->tileitem\n"; $xml .= "$layer->tolerance\n"; @@ -381,7 +381,7 @@ function pegaClasses($xml) $xml .= "\n"; $classe = $layer->getclass($i); $xml .= "".mb_convert_encoding(($classe->name),"UTF-8","ISO-8859-1")."\n"; - $xml .= "".$classe->getExpression()."\n"; + $xml .= "".$classe->getExpressionString()."\n"; $xml .= "$classe->keyimage\n"; $xml .= "$classe->size\n"; $xml .= "$classe->symbolname\n"; diff --git a/admin/php/temas.php b/admin/php/temas.php index 62a83a1..86f4a00 100644 --- a/admin/php/temas.php +++ b/admin/php/temas.php @@ -413,21 +413,21 @@ function pegaCaracteristicasGerais() $dados["connectiontype"] = $layer->connectiontype; $dados["data"] = $layer->data; $dados["type"] = $layer->type; - $dados["filter"] = $layer->getfilter(); + $dados["filter"] = $layer->getfilterstring(); if($dados["filter"]== ""){$dados["filter"] = "";} $dados["filteritem"] = $layer->filteritem; $dados["group"] = $layer->group; $dados["labelangleitem"] = $layer->labelangleitem; $dados["labelitem"] = $layer->labelitem; - $dados["labelmaxscale"] = $layer->labelmaxscale; - $dados["labelmaxscale"] = $layer->labelmaxscale; - $dados["labelminscale"] = $layer->labelminscale; - $dados["labelsizeitem"] = $layer->labelsizeitem; - $dados["maxscale"] = $layer->maxscale; - $dados["minscale"] = $layer->minscale; + $dados["labelmaxscale"] = $layer->labelmaxscaledenom; + $dados["labelmaxscale"] = $layer->labelmaxscaledenom; + $dados["labelminscale"] = $layer->labelminscaledenom; + //$dados["labelsizeitem"] = $layer->labelsizeitem; + $dados["maxscale"] = $layer->maxscaledenom; + $dados["minscale"] = $layer->minscaledenom; $dados["offsite"] = $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue; $dados["opacity"] = $layer->opacity; - $dados["symbolscale"] = $layer->symbolscale; + $dados["symbolscale"] = $layer->symbolscaledenom; $dados["tileindex"] = $layer->tileindex; $dados["tileitem"] = $layer->tileitem; $dados["tolerance"] = $layer->tolerance; @@ -484,10 +484,10 @@ function pegaClasses() { $classe = $layer->getclass($i); $temp["name"] = mb_convert_encoding(($classe->name),"UTF-8","ISO-8859-1"); - $temp["expression"] = $classe->getExpression(); + $temp["expression"] = $classe->getExpressionString(); $temp["keyimage"] = $classe->keyimage; - $temp["maxscale"] = $classe->maxscale; - $temp["minscale"] = $classe->minscale; + $temp["maxscale"] = $classe->maxscaledenom; + $temp["minscale"] = $classe->minscaledenom; $temp["maxsize"] = $classe->maxsize; $temp["minsize"] = $classe->minsize; $temp["size"] = $classe->size; diff --git a/classesphp/classe_analise.php b/classesphp/classe_analise.php index 9762fbd..1ed3bed 100644 --- a/classesphp/classe_analise.php +++ b/classesphp/classe_analise.php @@ -969,7 +969,7 @@ $locaplic - Localização do I3geo. { $result = $layerPt->getResult($i); $shp_index = $result->shapeindex; - $shape = $layerPt->getshape(-1, $shp_index); + $shape = $layerPt->getfeature($shp_index,-1); $pontos[] = $shape; } $layerPt->close(); @@ -1032,7 +1032,7 @@ $locaplic - Localização do I3geo. { $result = $layer->getResult(0); $shp_index = $result->shapeindex; - $shape = $layer->getshape(-1, $shp_index); + $shape = $layer->getfeature($shp_index,-1); foreach ($itens as $item) {$reg[] = $shape->values[$item];} } @@ -1231,7 +1231,7 @@ nome do layer criado com o buffer. { $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); //calcula a extensão geografica $rect = $shape->bounds; $projInObj = ms_newprojectionobj("proj=latlong"); @@ -1344,7 +1344,7 @@ $locaplic - Localização do I3geo. { $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); $LineObj = ms_newLineObj(); $LineObj->add($shape->getCentroid()); $ShapeObj = ms_newShapeObj(MS_SHAPE_POINT); @@ -1645,7 +1645,7 @@ $npty - Número de pontos em Y (opcional) $novolayer->set("data",$nomeshp.".shp"); $novolayer->setmetadata("DOWNLOAD","SIM"); $novolayer->setmetadata("TEMALOCAL","SIM"); - $novolayer->set("transparency","50"); + $novolayer->set("opacity","50"); if (file_exists(($this->arquivo)."qy")) {unlink (($this->arquivo)."qy");} return("ok"); @@ -1798,7 +1798,7 @@ $npty - Número de pontos em Y (opcional) $novolayer->set("data",$nomeshp.".shp"); $novolayer->setmetadata("DOWNLOAD","SIM"); $novolayer->setmetadata("TEMALOCAL","SIM"); - $novolayer->set("transparency","50"); + $novolayer->set("opacity","50"); if (file_exists(($this->arquivo)."qy")) {unlink (($this->arquivo)."qy");} return("ok"); @@ -1867,7 +1867,7 @@ $locaplic - Localização do I3geo $novolayer->set("data",$nomeshp.".shp"); $novolayer->setmetadata("DOWNLOAD","SIM"); $novolayer->setmetadata("TEMALOCAL","SIM"); - $novolayer->set("transparency","80"); + $novolayer->set("opacity","80"); if (file_exists(($this->arquivo)."qy")) {unlink (($this->arquivo)."qy");} return("ok"); @@ -1903,7 +1903,7 @@ Salva o mapa acrescentando um novo layer com o resultado. { $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); if($item != "") $valor = $shape->values[$item]; else @@ -1921,7 +1921,7 @@ Salva o mapa acrescentando um novo layer com o resultado. { foreach ($i as $indice) { - $shape = $this->layer->getshape(-1, $indice); + $shape = $this->layer->getfeature($indice,-1); if($item != "") $valor = $shape->values[$item]; else @@ -2023,7 +2023,7 @@ $locaplic - Localização do I3geo { $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); if($item != "") $valor = $shape->values[$item]; else @@ -2044,7 +2044,7 @@ $locaplic - Localização do I3geo { foreach ($i as $indice) { - $shape = $this->layer->getshape(-1, $indice); + $shape = $this->layer->getfeature($indice,-1); if($item != "") $valor = $shape->values[$item]; else @@ -2427,7 +2427,7 @@ function gravaCoordenadasPt($tema,$limitepontos="TRUE",$extendelimite) { $result = $layerPt->getResult($i); $shp_index = $result->shapeindex; - $shape = $layerPt->getshape(-1, $shp_index); + $shape = $layerPt->getfeature($shp_index,-1); $lineo = $shape->line(0); $pt = $lineo->point(0); if (($prjTema != "") && ($prjMapa != $prjTema)) diff --git a/classesphp/classe_atributos.php b/classesphp/classe_atributos.php index ffc1da4..0e66565 100644 --- a/classesphp/classe_atributos.php +++ b/classesphp/classe_atributos.php @@ -156,7 +156,7 @@ $registro - Índice do registro que será consultado. if (@$this->layer->queryByrect($this->mapa->extent) == MS_SUCCESS) { $this->layer->open(); - $shape = $this->layer->getshape(-1, $registro); + $shape = $this->layer->getfeature($registro,-1); $fechou = $this->layer->close(); $ext = $this->extensaoShape($shape); } @@ -230,7 +230,7 @@ $tipo - Tipo de busca brasil|null { $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); $v = trim($shape->values[$item]); if (function_exists("mb_convert_encoding")) {$v = mb_convert_encoding($v,"UTF-8","ISO-8859-1");} @@ -304,7 +304,7 @@ $tipolista - Indica se serão mostrados todos os registros ou apenas os seleciona { $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); $valori = trim($shape->values[$item]); if (function_exists("mb_convert_encoding")) {$valori = mb_convert_encoding($valori,"UTF-8","ISO-8859-1");} @@ -342,7 +342,7 @@ $tipolista - Indica se serão mostrados todos os registros ou apenas os seleciona { $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); $valori = ""; if(@$shape->values[$item]) { @@ -411,7 +411,7 @@ $onde - Tipo de abrangência espacial (brasil ou mapa) $this->layer = $l; if ($l->data == "") {return "Erro. O tema não tem tabela";} - $filtro = $l->getfilter(); + $filtro = $l->getfilterstring(); if ($filtro != ""){$l->setfilter("");} $buscas = "ÁÃÓÕÔáàãâóòôõúûíéêç"; $buscasUTF = mb_convert_encoding($buscas,"UTF-8","ISO-8859-1"); @@ -481,7 +481,7 @@ Include: $this->layer->set("template","none.htm"); $items = pegaItens($this->layer); $valores = array(); - $filtro = $this->layer->getfilter(); + $filtro = $this->layer->getfilterstring(); if ($filtro != ""){$this->layer->setfilter("");} //le o arquivo de query se existir e checa se existe seleção para o tema $existesel = "nao"; @@ -498,7 +498,7 @@ Include: { $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); $v = $shape->values[$item]; $valores[] = $v; } @@ -1020,7 +1020,7 @@ function identificaQBP($tema,$x,$y,$map_file,$resolucao,$item="",$tiporetorno="" $valori = array(); $result = $layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $layer->getshape(-1, $shp_index); + $shape = $layer->getfeature($shp_index,-1); if ($tiporetorno == "shape") { $layer->close(); @@ -1259,7 +1259,7 @@ function identificaQBP2($tema,$x,$y,$map_file,$resolucao,$item="",$tiporetorno=" $valori = array(); $result = $layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $layer->getshape(-1, $shp_index); + $shape = $layer->getfeature($shp_index,-1); $conta = 0; foreach ($itens as $it) { diff --git a/classesphp/classe_legenda.php b/classesphp/classe_legenda.php index f8f1f1c..cc7644c 100644 --- a/classesphp/classe_legenda.php +++ b/classesphp/classe_legenda.php @@ -306,7 +306,7 @@ array $nomeclasse = $classe->name; if (function_exists("mb_convert_encoding")) {$nomeclasse = mb_convert_encoding($nomeclasse,"UTF-8","ISO-8859-1");} - $nomeexp = $classe->getexpression(); + $nomeexp = $classe->getExpressionString(); if (function_exists("mb_convert_encoding")) {$nomeexp = mb_convert_encoding($nomeexp,"UTF-8","ISO-8859-1");} diff --git a/classesphp/classe_mapa.php b/classesphp/classe_mapa.php index 1ca9fdf..959f9d5 100644 --- a/classesphp/classe_mapa.php +++ b/classesphp/classe_mapa.php @@ -125,7 +125,7 @@ Grava a imagem do mapa atual $nome = ($imgo->imagepath).nomeRandomico().".png"; $imgo->saveImage($nome); $nome = ($imgo->imageurl).basename($nome); - $imgo->free(); + //$imgo->free(); return ($nome); } /* @@ -185,13 +185,13 @@ string - javascript com os parametros //verifica se existe restrição de escala // $contextoescala = "nao"; - if(($oLayer->minscale > 0) || ($oLayer->maxscale > 0)) + if(($oLayer->minscaledenom > 0) || ($oLayer->maxscaledenom > 0)) {$contextoescala = "sim";} $temas[] = array( "name"=>($oLayer->name), "status"=>($oLayer->status), "tema"=>(mb_convert_encoding(($oLayer->getmetadata("tema")),"UTF-8","ISO-8859-1")), - "transparency"=>($oLayer->transparency), + "transparency"=>($oLayer->opacity), "type"=>($oLayer->type), "sel"=>$sel, "escala"=>$escala, @@ -345,7 +345,7 @@ Include: $nomer = $locmapserv."?map=".$this->arquivo."&mode=map&".nomeRandomico(); } $res = "g_locidentifica='".$locidentifica."';g_sistemas='".$locsistemas."';var g_celula=".$this->mapa->cellsize.";var mapscale = ".$this->mapa->scale.";var mapres=".$this->mapa->resolution.";var mapcellsize=".$this->mapa->cellsize.";var mapexten='".$ext."';var mapimagem='".$nomer."';var mapwidth=".$imgo->width.";var mapheight=".$imgo->height.";var mappath='".$imgo->imagepath."';var mapurl='".$imgo->imageurl."'"; - $imgo->free(); + //$imgo->free(); return $res; } /* @@ -366,7 +366,7 @@ string - javascript com as variáveis para redesenho do mapa $e = $this->mapa->extent; $w = $this->mapa->width; $h = $this->mapa->height; - $s = $this->mapa->scale; + $s = $this->mapa->scaledenom; $this->mapa = desligamargem($this->mapa); $pt = ms_newPointObj(); //desenha o leste @@ -1394,7 +1394,7 @@ $arq - Nome do shape file. if (file_exists($arq)) { $s = ms_newShapefileObj($arq,-1); - $shape = $s->getShape(0); + $shape = $s->getfeature(0); $t = $shape->type; $tipo = MS_LAYER_POLYGON; if ($t == 0) diff --git a/classesphp/classe_selecao.php b/classesphp/classe_selecao.php index 7f76f63..14f3adb 100644 --- a/classesphp/classe_selecao.php +++ b/classesphp/classe_selecao.php @@ -204,7 +204,7 @@ $tipo - Tipo de operação adiciona|retira|inverte|limpa { $result = $layero->getResult($i); $s = $result->shapeindex; - $sh = $layero->getShape(-1,$s); + $sh = $layero->getfeature($s,-1); $tiposh = $sh->type; if ($tiposh == 2) {$ident = @$this->layer->querybyshape($sh);} @@ -257,9 +257,9 @@ $tipo - Tipo de operação adiciona|retira|inverte|limpa $conta = $layero->getNumresults(); for ($k = 0; $k < $conta; $k++) { - if (@$layero->getshape(-1,$k)) + if (@$layero->getfeature($k,-1)) { - $s = $layero->getshape(-1,$k); + $s = $layero->getfeature($k,-1); if ($s->type == 2) { $this->layer->querybyshape($s); diff --git a/classesphp/classe_shp.php b/classesphp/classe_shp.php index b689b1f..f70aaaa 100644 --- a/classesphp/classe_shp.php +++ b/classesphp/classe_shp.php @@ -282,7 +282,7 @@ Include: if(!isset($tamanho)){$tamanho = 50;} $e->set("size",$tamanho); $e->set("symbolname",$nomes); - $pinlayer->set("transparency",MS_GD_ALPHA); + $pinlayer->set("opacity",MS_GD_ALPHA); $shp = ms_newshapeobj(MS_SHAPE_POINT); $lin = ms_newlineobj(); $lin->addxy($x,$y); @@ -344,7 +344,7 @@ array("layerprj"=>$xylayer,"mapprj"=>$xymapa) $result = $this->layer->getResult($res_count - 1); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1,$shp_index); + $shape = $this->layer->getfeature($shp_index,-1); $lin = $shape->line(0); $pt = $lin->point(0); $this->layer->close(); @@ -469,7 +469,7 @@ $para - linha|poligono if ($para == "poligono") { $layer->set("type",MS_LAYER_POLYGON); - $layer->set("transparency","50"); + $layer->set("opacity","50"); $layer->setmetadata("tema",$novonomelayer." (poligonal)"); } return("ok"); diff --git a/classesphp/classe_temas.php b/classesphp/classe_temas.php index fb0470f..2d1ef26 100644 --- a/classesphp/classe_temas.php +++ b/classesphp/classe_temas.php @@ -394,12 +394,12 @@ string Filtro. function pegaFiltro() { if(!$this->layer){return "erro";} - $fil = $this->layer->getfilter(); - if ($this->layer->getfilter() == '"(null)"'){return " ";} + $fil = $this->layer->getfilterstring(); + if ($this->layer->getfilterstring() == '"(null)"'){return " ";} if (function_exists("mb_convert_encoding")) - {return (mb_convert_encoding($this->layer->getfilter(),"HTML-ENTITIES","auto"));} + {return (mb_convert_encoding($this->layer->getfilterstring(),"HTML-ENTITIES","auto"));} else - {return ($this->layer->getfilter());} + {return ($this->layer->getfilterstring());} } /* function: insereFiltro @@ -598,7 +598,7 @@ $fonte - Fonte. $e->set("symbolname",$marca); $pinlayer->setmetadata("tema","Poligonos inseridos"); $pinlayer->set("type",MS_LAYER_POLYGON); - $pinlayer->set("transparency","50"); + $pinlayer->set("opacity","50"); break; case "ANNOTATION": $c->set("status",MS_DELETE); @@ -642,7 +642,7 @@ $fonte - Fonte. $label->set("position",$p[$position]); $pinlayer->setmetadata("TEMA",$texto); $pinlayer->set("type",MS_LAYER_ANNOTATION); - $pinlayer->set("transparency","100"); + $pinlayer->set("opacity","100"); break; } } @@ -706,7 +706,7 @@ $nome - nome que será dado a geometria $valitem = array(); $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); foreach ($items as $item) { $v = trim($shape->values[$item]); @@ -933,7 +933,7 @@ Calcula a extensão geográfica dos elementos selecionados de um tema e ajusta o m $valitem = array(); $result = $this->layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $this->layer->getshape(-1, $shp_index); + $shape = $this->layer->getfeature($shp_index,-1); $bound = $shape->bounds; $xmin[] = $bound->minx; $xmax[] = $bound->maxx; diff --git a/classesphp/classe_vermultilayer.php b/classesphp/classe_vermultilayer.php index 38c5084..6bd94b6 100644 --- a/classesphp/classe_vermultilayer.php +++ b/classesphp/classe_vermultilayer.php @@ -101,8 +101,8 @@ class vermultilayer $layer = $map->getlayerbyname($temai); $testa = 0; //verifica se o tema é visivel na escala - $mins = $layer->minscale; - $maxs = $layer->maxscale; + $mins = $layer->minscaledenom; + $maxs = $layer->maxscaledenom; if ($mins != $maxs) { $testa = 1; diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php index 2a51400..6e0b2be 100644 --- a/classesphp/funcoes_gerais.php +++ b/classesphp/funcoes_gerais.php @@ -105,7 +105,7 @@ function fusaoGrafico() $nome = ($imgo->imagepath).nomeRandomico().".png"; $imgo->saveImage($nome); $imagem = ($imgo->imageurl).basename($nome); - $imgo->free(); + //$imgo->free(); } $m = new Imagem(dirname($dir_tmp).$imagem); $i = $m->fundeIm(dirname($dir_tmp).$grafico); @@ -994,7 +994,7 @@ function gravaImagemMapa($mapa) if ($salva != -1) { $retorno = array("url"=>($imgo->imageurl).basename($nome),"arquivo"=>$nome); - $imgo->free(); + //$imgo->free(); } else {$retorno = false;} @@ -1032,7 +1032,7 @@ function pegaValores($mapa,$layer,$item,$numerico=false,$ignorar="") { $result = $layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $layer->getshape(-1, $shp_index); + $shape = $layer->getfeature($shp_index,-1); $v = trim($shape->values[$item]); if ($numerico) { @@ -1112,7 +1112,7 @@ function pegaValoresM($mapa,$layer,$itens,$exclui="nulo",$selecionados="nao") if (($selecionados == "sim") && (array_search($shp_index,$indicesel) === FALSE)) {continue;} $considera = "sim"; - $shape = $layer->getshape(-1, $shp_index); + $shape = $layer->getfeature($shp_index,-1); //verifica se no registro deve ser considerado if ($exclui != "nulo") { @@ -1632,10 +1632,10 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE) dbase_add_record($db,$reg); dbase_close($db); } - $s = $layer->getshape(-1,0); + $s = $layer->getfeature(0,-1); $result = $layer->getResult(0); $shpi = $result->shapeindex; - $shape = $layer->getshape(-1, $shpi); + $shape = $layer->getfeature($shpi,-1); $novoshpf = ms_newShapefileObj($nomeshp.".shp", -2); $novoshpf->addShape($shape); $novoshpf->free(); @@ -1680,7 +1680,7 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE) { $result = $layer->getResult($i); $shp_index = $result->shapeindex; - $shape = $layer->getshape(-1, $shp_index); + $shape = $layer->getfeature($shp_index,-1); foreach ($items as $ni) { $reg[] = $shape->values[$ni]; diff --git a/classesphp/mapa_inicia.php b/classesphp/mapa_inicia.php index 8bd7adf..8e8db2f 100644 --- a/classesphp/mapa_inicia.php +++ b/classesphp/mapa_inicia.php @@ -172,7 +172,7 @@ function iniciaMapa() $m->salva($map_file); $e = $m->mapa->extent; $ext = ($e->minx)." ".($e->miny)." ".($e->maxx)." ".($e->maxy); - $escalaMapa = $m->mapa->scale; + $escalaMapa = $m->mapa->scaledenom; $celula = $m->mapa->cellsize; // //pega os parametros de cada tema diff --git a/geraminiatura.php b/geraminiatura.php index 73e9719..4af3487 100644 --- a/geraminiatura.php +++ b/geraminiatura.php @@ -169,7 +169,7 @@ function verifica($map,$tipo) echo "

"; } $objImagem->saveImage($nomec); - $objImagem->free(); + //$objImagem->free(); } } function zoomTema($nomelayer,&$mapa) diff --git a/menutemas/admin.db b/menutemas/admin.db index 2191588..aa9a196 100644 Binary files a/menutemas/admin.db and b/menutemas/admin.db differ diff --git a/ms_criamapa.php b/ms_criamapa.php index 834cf2b..674de04 100644 --- a/ms_criamapa.php +++ b/ms_criamapa.php @@ -692,7 +692,7 @@ function insereWKTUrl() $estilo->set("size",3); } if($shape->type == 2) - {$layer->set("transparency","50");} + {$layer->set("opacity","50");} $cor = $estilo->color; $cor->setRGB(255,0,0); $salvo = $mapa->save($tmpfname); @@ -911,7 +911,7 @@ function inserePoligonosUrl() $layer->setmetadata("classe","sim"); $layer->setmetadata("ATLAS","nao"); $layer->set("type",MS_LAYER_POLYGON); - $layer->set("transparency","50"); + $layer->set("opacity","50"); $layer->set("status",MS_DEFAULT); $classe = ms_newClassObj($layer); $classe->set("name"," "); diff --git a/testamapfile.php b/testamapfile.php index cadd997..a788513 100644 --- a/testamapfile.php +++ b/testamapfile.php @@ -285,7 +285,7 @@ function verifica($map,$solegenda) Header("Content-type: image/png"); ImagePng(ImageCreateFromPNG($nomec)); } - $objImagem->free(); + //$objImagem->free(); } } function zoomTema($nomelayer,&$mapa) -- libgit2 0.21.2