Download as
Browse Code »

Commit e8b9c39cdaf5bca95e3a757b4aadc43c883b258a

Authored by Edmar Moretti
1 parent c821f80e
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

#242

Showing 17 changed files with 95 additions and 95 deletions   Show diff stats
admin/php/editormapfile.php
  Diff comments   View file @e8b9c39
@@ -580,21 +580,21 @@ function pegaGeral() @@ -580,21 +580,21 @@ function pegaGeral()
580 $mapa = ms_newMapObj($mapfile); 580 $mapa = ms_newMapObj($mapfile);
581 $layer = $mapa->getlayerbyname($codigoLayer); 581 $layer = $mapa->getlayerbyname($codigoLayer);
582 $dados["type"] = $layer->type; 582 $dados["type"] = $layer->type;
583 - $dados["filter"] = $layer->getfilter(); 583 + $dados["filter"] = $layer->getfilterstring();
584 if($dados["filter"]== ""){$dados["filter"] = "";} 584 if($dados["filter"]== ""){$dados["filter"] = "";}
585 $dados["filteritem"] = $layer->filteritem; 585 $dados["filteritem"] = $layer->filteritem;
586 $dados["group"] = $layer->group; 586 $dados["group"] = $layer->group;
587 //$dados["labelangleitem"] = $layer->labelangleitem; 587 //$dados["labelangleitem"] = $layer->labelangleitem;
588 $dados["labelitem"] = $layer->labelitem; 588 $dados["labelitem"] = $layer->labelitem;
589 - $dados["labelmaxscale"] = $layer->labelmaxscale;  
590 - $dados["labelmaxscale"] = $layer->labelmaxscale;  
591 - $dados["labelminscale"] = $layer->labelminscale; 589 + $dados["labelmaxscale"] = $layer->labelmaxscaledenom;
  590 + $dados["labelmaxscale"] = $layer->labelmaxscaledenom;
  591 + $dados["labelminscale"] = $layer->labelminscaledenom;
592 //$dados["labelsizeitem"] = $layer->labelsizeitem; 592 //$dados["labelsizeitem"] = $layer->labelsizeitem;
593 - $dados["maxscale"] = $layer->maxscale;  
594 - $dados["minscale"] = $layer->minscale; 593 + $dados["maxscale"] = $layer->maxscaledenom;
  594 + $dados["minscale"] = $layer->minscaledenom;
595 $dados["offsite"] = $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue; 595 $dados["offsite"] = $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue;
596 $v["principal"] == "4" ? $dados["opacity"] = $layer->transparency : $dados["opacity"] = $layer->opacity; 596 $v["principal"] == "4" ? $dados["opacity"] = $layer->transparency : $dados["opacity"] = $layer->opacity;
597 - $dados["symbolscale"] = $layer->symbolscale; 597 + $dados["symbolscale"] = $layer->symbolscaledenom;
598 $dados["tolerance"] = $layer->tolerance; 598 $dados["tolerance"] = $layer->tolerance;
599 $dados["toleranceunits"] = $layer->toleranceunits; 599 $dados["toleranceunits"] = $layer->toleranceunits;
600 $dados["status"] = $layer->status; 600 $dados["status"] = $layer->status;
@@ -629,11 +629,11 @@ function alterarGeral() @@ -629,11 +629,11 @@ function alterarGeral()
629 $layer->set("group",$group); 629 $layer->set("group",$group);
630 //$layer->set("labelangleitem",$labelangleitem); 630 //$layer->set("labelangleitem",$labelangleitem);
631 $layer->set("labelitem",$labelitem); 631 $layer->set("labelitem",$labelitem);
632 - $layer->set("labelmaxscale",$labelmaxscale);  
633 - $layer->set("labelminscale",$labelminscale); 632 + $layer->set("labelmaxscaledenom",$labelmaxscale);
  633 + $layer->set("labelminscaledenom",$labelminscale);
634 //$layer->set("labelsizeitem",$labelsizeitem); 634 //$layer->set("labelsizeitem",$labelsizeitem);
635 - $layer->set("maxscale",$maxscale);  
636 - $layer->set("minscale",$minscale); 635 + $layer->set("maxscaledenom",$maxscale);
  636 + $layer->set("minscaledenom",$minscale);
637 $cor = $layer->offsite; 637 $cor = $layer->offsite;
638 $c = explode(",",$offsite); 638 $c = explode(",",$offsite);
639 if(count($c) < 3) 639 if(count($c) < 3)
@@ -642,7 +642,7 @@ function alterarGeral() @@ -642,7 +642,7 @@ function alterarGeral()
642 $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue; 642 $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue;
643 $v["principal"] == "4" ? $layer->set("transparency",$opacity) : $layer->set("opacity",$opacity); 643 $v["principal"] == "4" ? $layer->set("transparency",$opacity) : $layer->set("opacity",$opacity);
644 644
645 - $layer->set("symbolscale",$symbolscale); 645 + $layer->set("symbolscaledenom",$symbolscale);
646 $layer->set("tolerance",$tolerance); 646 $layer->set("tolerance",$tolerance);
647 $layer->set("toleranceunits",$toleranceunits); 647 $layer->set("toleranceunits",$toleranceunits);
648 $layer->set("status",$status); 648 $layer->set("status",$status);
@@ -679,15 +679,15 @@ function pegaClasseGeral() @@ -679,15 +679,15 @@ function pegaClasseGeral()
679 $classe = $layer->getclass($indiceClasse); 679 $classe = $layer->getclass($indiceClasse);
680 $dados["name"] = $classe->name; 680 $dados["name"] = $classe->name;
681 $dados["title"] = $classe->title; 681 $dados["title"] = $classe->title;
682 - $temp = $classe->getExpression(); 682 + $temp = $classe->getExpressionString();
683 $temp = str_replace("[","_C",$temp); 683 $temp = str_replace("[","_C",$temp);
684 $temp = str_replace("]","C_",$temp); 684 $temp = str_replace("]","C_",$temp);
685 $temp = str_replace("'","_A_",$temp); 685 $temp = str_replace("'","_A_",$temp);
686 //substitui caracteres que dão problemas 686 //substitui caracteres que dão problemas
687 $dados["expression"] = $temp; 687 $dados["expression"] = $temp;
688 $dados["keyimage"] = $classe->keyimage; 688 $dados["keyimage"] = $classe->keyimage;
689 - $dados["maxscale"] = $classe->maxscale;  
690 - $dados["minscale"] = $classe->minscale; 689 + $dados["maxscale"] = $classe->maxscaledenom;
  690 + $dados["minscale"] = $classe->minscaledenom;
691 $dados["status"] = $classe->status; 691 $dados["status"] = $classe->status;
692 //$dados["text"] = $classe->getTextString(); 692 //$dados["text"] = $classe->getTextString();
693 $dados["codigoMap"] = $codigoMap; 693 $dados["codigoMap"] = $codigoMap;
@@ -711,8 +711,8 @@ function alterarClasseGeral() @@ -711,8 +711,8 @@ function alterarClasseGeral()
711 $temp = str_replace("_A_","'",$temp); 711 $temp = str_replace("_A_","'",$temp);
712 $classe->setexpression($temp); 712 $classe->setexpression($temp);
713 $classe->set("keyimage",$keyimage); 713 $classe->set("keyimage",$keyimage);
714 - $classe->set("maxscale",$maxscale);  
715 - $classe->set("minscale",$minscale); 714 + $classe->set("maxscaledenom",$maxscale);
  715 + $classe->set("minscaledenom",$minscale);
716 $classe->set("status",$status); 716 $classe->set("status",$status);
717 $mapa->save($mapfile); 717 $mapa->save($mapfile);
718 removeCabecalho($mapfile); 718 removeCabecalho($mapfile);
admin/php/parsemapfile.php
  Diff comments   View file @e8b9c39
@@ -60,7 +60,7 @@ function tipoLegenda($layername) @@ -60,7 +60,7 @@ function tipoLegenda($layername)
60 if($nclasses == 1) 60 if($nclasses == 1)
61 { 61 {
62 $classe = $layer->getclass(0); 62 $classe = $layer->getclass(0);
63 - $expressao = $classe->getExpression(); 63 + $expressao = $classe->getExpressionString();
64 if($expressao == "") 64 if($expressao == "")
65 {return "simples";exit;} 65 {return "simples";exit;}
66 $expressao = str_replace("'eq'","="); 66 $expressao = str_replace("'eq'","=");
@@ -74,7 +74,7 @@ function tipoLegenda($layername) @@ -74,7 +74,7 @@ function tipoLegenda($layername)
74 for($i=0;$i<$nclasses;++$i) 74 for($i=0;$i<$nclasses;++$i)
75 { 75 {
76 $classe = $layer->getclass($i); 76 $classe = $layer->getclass($i);
77 - $expressao = $classe->getExpression(); 77 + $expressao = $classe->getExpressionString();
78 if(count(explode("[",$expressao)) > 2) 78 if(count(explode("[",$expressao)) > 2)
79 { 79 {
80 return "intervalo"; 80 return "intervalo";
@@ -114,7 +114,7 @@ function legendaValorUnico($layername) @@ -114,7 +114,7 @@ function legendaValorUnico($layername)
114 $outlinecolor[] = "'".$cor->red.",".$cor->green.",".$cor->blue.",255'"; 114 $outlinecolor[] = "'".$cor->red.",".$cor->green.",".$cor->blue.",255'";
115 $cor = $estilo->color; 115 $cor = $estilo->color;
116 $color[] = "'".$cor->red.",".$cor->green.",".$cor->blue.",255'"; 116 $color[] = "'".$cor->red.",".$cor->green.",".$cor->blue.",255'";
117 - $expressao = $classe->getExpression(); 117 + $expressao = $classe->getExpressionString();
118 $expressao = str_replace("'eq","=",$expressao); 118 $expressao = str_replace("'eq","=",$expressao);
119 $expressao = str_replace("'eq ","=",$expressao); 119 $expressao = str_replace("'eq ","=",$expressao);
120 $expressao = str_replace("' eq","=",$expressao); 120 $expressao = str_replace("' eq","=",$expressao);
@@ -339,22 +339,22 @@ function mapfile() @@ -339,22 +339,22 @@ function mapfile()
339 $xml .= "<tabela>".$esquemaTabela[1]."</tabela>"; 339 $xml .= "<tabela>".$esquemaTabela[1]."</tabela>";
340 $xml .= "<where>".$s[1]."</where>"; 340 $xml .= "<where>".$s[1]."</where>";
341 $xml .= "<type>".$objlayertypes[$layer->type]."</type>\n"; 341 $xml .= "<type>".$objlayertypes[$layer->type]."</type>\n";
342 - $xml .= "<filter>".$layer->getfilter()."</filter>\n"; 342 + $xml .= "<filter>".$layer->getfilterstring()."</filter>\n";
343 $xml .= "<filteritem>$layer->filteritem</filteritem>\n"; 343 $xml .= "<filteritem>$layer->filteritem</filteritem>\n";
344 $xml .= "<labelangleitem>$layer->labelangleitem</labelangleitem>\n"; 344 $xml .= "<labelangleitem>$layer->labelangleitem</labelangleitem>\n";
345 $xml .= "<labelitem>$layer->labelitem</labelitem>\n"; 345 $xml .= "<labelitem>$layer->labelitem</labelitem>\n";
346 - $xml .= "<labelmaxscale>$layer->labelmaxscale</labelmaxscale>\n";  
347 - $xml .= "<labelminscale>$layer->labelminscale</labelminscale>\n";  
348 - $xml .= "<labelsizeitem>$layer->labelsizeitem</labelsizeitem>\n"; 346 + $xml .= "<labelmaxscale>$layer->labelmaxscaledenom</labelmaxscale>\n";
  347 + $xml .= "<labelminscale>$layer->labelminscaledenom</labelminscale>\n";
  348 + $xml .= "<labelsizeitem></labelsizeitem>\n";
349 } 349 }
350 $xml .= "<group>$layer->group</group>\n"; 350 $xml .= "<group>$layer->group</group>\n";
351 - $xml .= "<maxscale>$layer->maxscale</maxscale>\n";  
352 - $xml .= "<minscale>$layer->minscale</minscale>\n"; 351 + $xml .= "<maxscale>$layer->maxscaledenom</maxscale>\n";
  352 + $xml .= "<minscale>$layer->minscaledenom</minscale>\n";
353 $xml .= "<offsite>".$layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue."</offsite>\n"; 353 $xml .= "<offsite>".$layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue."</offsite>\n";
354 $xml .= "<opacity>$layer->opacity</opacity>\n"; 354 $xml .= "<opacity>$layer->opacity</opacity>\n";
355 if($ct != "MS_WMS") 355 if($ct != "MS_WMS")
356 { 356 {
357 - $xml .= "<symbolscale>$layer->symbolscale</symbolscale>\n"; 357 + $xml .= "<symbolscale>$layer->symbolscaledenom</symbolscale>\n";
358 $xml .= "<tileindex>$layer->tileindex</tileindex>\n"; 358 $xml .= "<tileindex>$layer->tileindex</tileindex>\n";
359 $xml .= "<tileitem>$layer->tileitem</tileitem>\n"; 359 $xml .= "<tileitem>$layer->tileitem</tileitem>\n";
360 $xml .= "<tolerance>$layer->tolerance</tolerance>\n"; 360 $xml .= "<tolerance>$layer->tolerance</tolerance>\n";
@@ -381,7 +381,7 @@ function pegaClasses($xml) @@ -381,7 +381,7 @@ function pegaClasses($xml)
381 $xml .= "<classe>\n"; 381 $xml .= "<classe>\n";
382 $classe = $layer->getclass($i); 382 $classe = $layer->getclass($i);
383 $xml .= "<name>".mb_convert_encoding(($classe->name),"UTF-8","ISO-8859-1")."</name>\n"; 383 $xml .= "<name>".mb_convert_encoding(($classe->name),"UTF-8","ISO-8859-1")."</name>\n";
384 - $xml .= "<expression>".$classe->getExpression()."</expression>\n"; 384 + $xml .= "<expression>".$classe->getExpressionString()."</expression>\n";
385 $xml .= "<keyimage>$classe->keyimage</keyimage>\n"; 385 $xml .= "<keyimage>$classe->keyimage</keyimage>\n";
386 $xml .= "<size>$classe->size</size>\n"; 386 $xml .= "<size>$classe->size</size>\n";
387 $xml .= "<symbolname>$classe->symbolname</symbolname>\n"; 387 $xml .= "<symbolname>$classe->symbolname</symbolname>\n";
admin/php/temas.php
  Diff comments   View file @e8b9c39
@@ -413,21 +413,21 @@ function pegaCaracteristicasGerais() @@ -413,21 +413,21 @@ function pegaCaracteristicasGerais()
413 $dados["connectiontype"] = $layer->connectiontype; 413 $dados["connectiontype"] = $layer->connectiontype;
414 $dados["data"] = $layer->data; 414 $dados["data"] = $layer->data;
415 $dados["type"] = $layer->type; 415 $dados["type"] = $layer->type;
416 - $dados["filter"] = $layer->getfilter(); 416 + $dados["filter"] = $layer->getfilterstring();
417 if($dados["filter"]== ""){$dados["filter"] = "";} 417 if($dados["filter"]== ""){$dados["filter"] = "";}
418 $dados["filteritem"] = $layer->filteritem; 418 $dados["filteritem"] = $layer->filteritem;
419 $dados["group"] = $layer->group; 419 $dados["group"] = $layer->group;
420 $dados["labelangleitem"] = $layer->labelangleitem; 420 $dados["labelangleitem"] = $layer->labelangleitem;
421 $dados["labelitem"] = $layer->labelitem; 421 $dados["labelitem"] = $layer->labelitem;
422 - $dados["labelmaxscale"] = $layer->labelmaxscale;  
423 - $dados["labelmaxscale"] = $layer->labelmaxscale;  
424 - $dados["labelminscale"] = $layer->labelminscale;  
425 - $dados["labelsizeitem"] = $layer->labelsizeitem;  
426 - $dados["maxscale"] = $layer->maxscale;  
427 - $dados["minscale"] = $layer->minscale; 422 + $dados["labelmaxscale"] = $layer->labelmaxscaledenom;
  423 + $dados["labelmaxscale"] = $layer->labelmaxscaledenom;
  424 + $dados["labelminscale"] = $layer->labelminscaledenom;
  425 + //$dados["labelsizeitem"] = $layer->labelsizeitem;
  426 + $dados["maxscale"] = $layer->maxscaledenom;
  427 + $dados["minscale"] = $layer->minscaledenom;
428 $dados["offsite"] = $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue; 428 $dados["offsite"] = $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue;
429 $dados["opacity"] = $layer->opacity; 429 $dados["opacity"] = $layer->opacity;
430 - $dados["symbolscale"] = $layer->symbolscale; 430 + $dados["symbolscale"] = $layer->symbolscaledenom;
431 $dados["tileindex"] = $layer->tileindex; 431 $dados["tileindex"] = $layer->tileindex;
432 $dados["tileitem"] = $layer->tileitem; 432 $dados["tileitem"] = $layer->tileitem;
433 $dados["tolerance"] = $layer->tolerance; 433 $dados["tolerance"] = $layer->tolerance;
@@ -484,10 +484,10 @@ function pegaClasses() @@ -484,10 +484,10 @@ function pegaClasses()
484 { 484 {
485 $classe = $layer->getclass($i); 485 $classe = $layer->getclass($i);
486 $temp["name"] = mb_convert_encoding(($classe->name),"UTF-8","ISO-8859-1"); 486 $temp["name"] = mb_convert_encoding(($classe->name),"UTF-8","ISO-8859-1");
487 - $temp["expression"] = $classe->getExpression(); 487 + $temp["expression"] = $classe->getExpressionString();
488 $temp["keyimage"] = $classe->keyimage; 488 $temp["keyimage"] = $classe->keyimage;
489 - $temp["maxscale"] = $classe->maxscale;  
490 - $temp["minscale"] = $classe->minscale; 489 + $temp["maxscale"] = $classe->maxscaledenom;
  490 + $temp["minscale"] = $classe->minscaledenom;
491 $temp["maxsize"] = $classe->maxsize; 491 $temp["maxsize"] = $classe->maxsize;
492 $temp["minsize"] = $classe->minsize; 492 $temp["minsize"] = $classe->minsize;
493 $temp["size"] = $classe->size; 493 $temp["size"] = $classe->size;
classesphp/classe_analise.php
  Diff comments   View file @e8b9c39
@@ -969,7 +969,7 @@ $locaplic - Localização do I3geo. @@ -969,7 +969,7 @@ $locaplic - Localização do I3geo.
969 { 969 {
970 $result = $layerPt->getResult($i); 970 $result = $layerPt->getResult($i);
971 $shp_index = $result->shapeindex; 971 $shp_index = $result->shapeindex;
972 - $shape = $layerPt->getshape(-1, $shp_index); 972 + $shape = $layerPt->getfeature($shp_index,-1);
973 $pontos[] = $shape; 973 $pontos[] = $shape;
974 } 974 }
975 $layerPt->close(); 975 $layerPt->close();
@@ -1032,7 +1032,7 @@ $locaplic - Localização do I3geo. @@ -1032,7 +1032,7 @@ $locaplic - Localização do I3geo.
1032 { 1032 {
1033 $result = $layer->getResult(0); 1033 $result = $layer->getResult(0);
1034 $shp_index = $result->shapeindex; 1034 $shp_index = $result->shapeindex;
1035 - $shape = $layer->getshape(-1, $shp_index); 1035 + $shape = $layer->getfeature($shp_index,-1);
1036 foreach ($itens as $item) 1036 foreach ($itens as $item)
1037 {$reg[] = $shape->values[$item];} 1037 {$reg[] = $shape->values[$item];}
1038 } 1038 }
@@ -1231,7 +1231,7 @@ nome do layer criado com o buffer. @@ -1231,7 +1231,7 @@ nome do layer criado com o buffer.
1231 { 1231 {
1232 $result = $this->layer->getResult($i); 1232 $result = $this->layer->getResult($i);
1233 $shp_index = $result->shapeindex; 1233 $shp_index = $result->shapeindex;
1234 - $shape = $this->layer->getshape(-1, $shp_index); 1234 + $shape = $this->layer->getfeature($shp_index,-1);
1235 //calcula a extensão geografica 1235 //calcula a extensão geografica
1236 $rect = $shape->bounds; 1236 $rect = $shape->bounds;
1237 $projInObj = ms_newprojectionobj("proj=latlong"); 1237 $projInObj = ms_newprojectionobj("proj=latlong");
@@ -1344,7 +1344,7 @@ $locaplic - Localização do I3geo. @@ -1344,7 +1344,7 @@ $locaplic - Localização do I3geo.
1344 { 1344 {
1345 $result = $this->layer->getResult($i); 1345 $result = $this->layer->getResult($i);
1346 $shp_index = $result->shapeindex; 1346 $shp_index = $result->shapeindex;
1347 - $shape = $this->layer->getshape(-1, $shp_index); 1347 + $shape = $this->layer->getfeature($shp_index,-1);
1348 $LineObj = ms_newLineObj(); 1348 $LineObj = ms_newLineObj();
1349 $LineObj->add($shape->getCentroid()); 1349 $LineObj->add($shape->getCentroid());
1350 $ShapeObj = ms_newShapeObj(MS_SHAPE_POINT); 1350 $ShapeObj = ms_newShapeObj(MS_SHAPE_POINT);
@@ -1645,7 +1645,7 @@ $npty - Número de pontos em Y (opcional) @@ -1645,7 +1645,7 @@ $npty - Número de pontos em Y (opcional)
1645 $novolayer->set("data",$nomeshp.".shp"); 1645 $novolayer->set("data",$nomeshp.".shp");
1646 $novolayer->setmetadata("DOWNLOAD","SIM"); 1646 $novolayer->setmetadata("DOWNLOAD","SIM");
1647 $novolayer->setmetadata("TEMALOCAL","SIM"); 1647 $novolayer->setmetadata("TEMALOCAL","SIM");
1648 - $novolayer->set("transparency","50"); 1648 + $novolayer->set("opacity","50");
1649 if (file_exists(($this->arquivo)."qy")) 1649 if (file_exists(($this->arquivo)."qy"))
1650 {unlink (($this->arquivo)."qy");} 1650 {unlink (($this->arquivo)."qy");}
1651 return("ok"); 1651 return("ok");
@@ -1798,7 +1798,7 @@ $npty - Número de pontos em Y (opcional) @@ -1798,7 +1798,7 @@ $npty - Número de pontos em Y (opcional)
1798 $novolayer->set("data",$nomeshp.".shp"); 1798 $novolayer->set("data",$nomeshp.".shp");
1799 $novolayer->setmetadata("DOWNLOAD","SIM"); 1799 $novolayer->setmetadata("DOWNLOAD","SIM");
1800 $novolayer->setmetadata("TEMALOCAL","SIM"); 1800 $novolayer->setmetadata("TEMALOCAL","SIM");
1801 - $novolayer->set("transparency","50"); 1801 + $novolayer->set("opacity","50");
1802 if (file_exists(($this->arquivo)."qy")) 1802 if (file_exists(($this->arquivo)."qy"))
1803 {unlink (($this->arquivo)."qy");} 1803 {unlink (($this->arquivo)."qy");}
1804 return("ok"); 1804 return("ok");
@@ -1867,7 +1867,7 @@ $locaplic - Localização do I3geo @@ -1867,7 +1867,7 @@ $locaplic - Localização do I3geo
1867 $novolayer->set("data",$nomeshp.".shp"); 1867 $novolayer->set("data",$nomeshp.".shp");
1868 $novolayer->setmetadata("DOWNLOAD","SIM"); 1868 $novolayer->setmetadata("DOWNLOAD","SIM");
1869 $novolayer->setmetadata("TEMALOCAL","SIM"); 1869 $novolayer->setmetadata("TEMALOCAL","SIM");
1870 - $novolayer->set("transparency","80"); 1870 + $novolayer->set("opacity","80");
1871 if (file_exists(($this->arquivo)."qy")) 1871 if (file_exists(($this->arquivo)."qy"))
1872 {unlink (($this->arquivo)."qy");} 1872 {unlink (($this->arquivo)."qy");}
1873 return("ok"); 1873 return("ok");
@@ -1903,7 +1903,7 @@ Salva o mapa acrescentando um novo layer com o resultado. @@ -1903,7 +1903,7 @@ Salva o mapa acrescentando um novo layer com o resultado.
1903 { 1903 {
1904 $result = $this->layer->getResult($i); 1904 $result = $this->layer->getResult($i);
1905 $shp_index = $result->shapeindex; 1905 $shp_index = $result->shapeindex;
1906 - $shape = $this->layer->getshape(-1, $shp_index); 1906 + $shape = $this->layer->getfeature($shp_index,-1);
1907 if($item != "") 1907 if($item != "")
1908 $valor = $shape->values[$item]; 1908 $valor = $shape->values[$item];
1909 else 1909 else
@@ -1921,7 +1921,7 @@ Salva o mapa acrescentando um novo layer com o resultado. @@ -1921,7 +1921,7 @@ Salva o mapa acrescentando um novo layer com o resultado.
1921 { 1921 {
1922 foreach ($i as $indice) 1922 foreach ($i as $indice)
1923 { 1923 {
1924 - $shape = $this->layer->getshape(-1, $indice); 1924 + $shape = $this->layer->getfeature($indice,-1);
1925 if($item != "") 1925 if($item != "")
1926 $valor = $shape->values[$item]; 1926 $valor = $shape->values[$item];
1927 else 1927 else
@@ -2023,7 +2023,7 @@ $locaplic - Localização do I3geo @@ -2023,7 +2023,7 @@ $locaplic - Localização do I3geo
2023 { 2023 {
2024 $result = $this->layer->getResult($i); 2024 $result = $this->layer->getResult($i);
2025 $shp_index = $result->shapeindex; 2025 $shp_index = $result->shapeindex;
2026 - $shape = $this->layer->getshape(-1, $shp_index); 2026 + $shape = $this->layer->getfeature($shp_index,-1);
2027 if($item != "") 2027 if($item != "")
2028 $valor = $shape->values[$item]; 2028 $valor = $shape->values[$item];
2029 else 2029 else
@@ -2044,7 +2044,7 @@ $locaplic - Localização do I3geo @@ -2044,7 +2044,7 @@ $locaplic - Localização do I3geo
2044 { 2044 {
2045 foreach ($i as $indice) 2045 foreach ($i as $indice)
2046 { 2046 {
2047 - $shape = $this->layer->getshape(-1, $indice); 2047 + $shape = $this->layer->getfeature($indice,-1);
2048 if($item != "") 2048 if($item != "")
2049 $valor = $shape->values[$item]; 2049 $valor = $shape->values[$item];
2050 else 2050 else
@@ -2427,7 +2427,7 @@ function gravaCoordenadasPt($tema,$limitepontos=&quot;TRUE&quot;,$extendelimite) @@ -2427,7 +2427,7 @@ function gravaCoordenadasPt($tema,$limitepontos=&quot;TRUE&quot;,$extendelimite)
2427 { 2427 {
2428 $result = $layerPt->getResult($i); 2428 $result = $layerPt->getResult($i);
2429 $shp_index = $result->shapeindex; 2429 $shp_index = $result->shapeindex;
2430 - $shape = $layerPt->getshape(-1, $shp_index); 2430 + $shape = $layerPt->getfeature($shp_index,-1);
2431 $lineo = $shape->line(0); 2431 $lineo = $shape->line(0);
2432 $pt = $lineo->point(0); 2432 $pt = $lineo->point(0);
2433 if (($prjTema != "") && ($prjMapa != $prjTema)) 2433 if (($prjTema != "") && ($prjMapa != $prjTema))
classesphp/classe_atributos.php
  Diff comments   View file @e8b9c39
@@ -156,7 +156,7 @@ $registro - Índice do registro que será consultado. @@ -156,7 +156,7 @@ $registro - Índice do registro que será consultado.
156 if (@$this->layer->queryByrect($this->mapa->extent) == MS_SUCCESS) 156 if (@$this->layer->queryByrect($this->mapa->extent) == MS_SUCCESS)
157 { 157 {
158 $this->layer->open(); 158 $this->layer->open();
159 - $shape = $this->layer->getshape(-1, $registro); 159 + $shape = $this->layer->getfeature($registro,-1);
160 $fechou = $this->layer->close(); 160 $fechou = $this->layer->close();
161 $ext = $this->extensaoShape($shape); 161 $ext = $this->extensaoShape($shape);
162 } 162 }
@@ -230,7 +230,7 @@ $tipo - Tipo de busca brasil|null @@ -230,7 +230,7 @@ $tipo - Tipo de busca brasil|null
230 { 230 {
231 $result = $this->layer->getResult($i); 231 $result = $this->layer->getResult($i);
232 $shp_index = $result->shapeindex; 232 $shp_index = $result->shapeindex;
233 - $shape = $this->layer->getshape(-1, $shp_index); 233 + $shape = $this->layer->getfeature($shp_index,-1);
234 $v = trim($shape->values[$item]); 234 $v = trim($shape->values[$item]);
235 if (function_exists("mb_convert_encoding")) 235 if (function_exists("mb_convert_encoding"))
236 {$v = mb_convert_encoding($v,"UTF-8","ISO-8859-1");} 236 {$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 @@ -304,7 +304,7 @@ $tipolista - Indica se serão mostrados todos os registros ou apenas os seleciona
304 { 304 {
305 $result = $this->layer->getResult($i); 305 $result = $this->layer->getResult($i);
306 $shp_index = $result->shapeindex; 306 $shp_index = $result->shapeindex;
307 - $shape = $this->layer->getshape(-1, $shp_index); 307 + $shape = $this->layer->getfeature($shp_index,-1);
308 $valori = trim($shape->values[$item]); 308 $valori = trim($shape->values[$item]);
309 if (function_exists("mb_convert_encoding")) 309 if (function_exists("mb_convert_encoding"))
310 {$valori = mb_convert_encoding($valori,"UTF-8","ISO-8859-1");} 310 {$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 @@ -342,7 +342,7 @@ $tipolista - Indica se serão mostrados todos os registros ou apenas os seleciona
342 { 342 {
343 $result = $this->layer->getResult($i); 343 $result = $this->layer->getResult($i);
344 $shp_index = $result->shapeindex; 344 $shp_index = $result->shapeindex;
345 - $shape = $this->layer->getshape(-1, $shp_index); 345 + $shape = $this->layer->getfeature($shp_index,-1);
346 $valori = ""; 346 $valori = "";
347 if(@$shape->values[$item]) 347 if(@$shape->values[$item])
348 { 348 {
@@ -411,7 +411,7 @@ $onde - Tipo de abrangência espacial (brasil ou mapa) @@ -411,7 +411,7 @@ $onde - Tipo de abrangência espacial (brasil ou mapa)
411 $this->layer = $l; 411 $this->layer = $l;
412 if ($l->data == "") 412 if ($l->data == "")
413 {return "Erro. O tema não tem tabela";} 413 {return "Erro. O tema não tem tabela";}
414 - $filtro = $l->getfilter(); 414 + $filtro = $l->getfilterstring();
415 if ($filtro != ""){$l->setfilter("");} 415 if ($filtro != ""){$l->setfilter("");}
416 $buscas = "ÁÃÓÕÔáàãâóòôõúûíéêç"; 416 $buscas = "ÁÃÓÕÔáàãâóòôõúûíéêç";
417 $buscasUTF = mb_convert_encoding($buscas,"UTF-8","ISO-8859-1"); 417 $buscasUTF = mb_convert_encoding($buscas,"UTF-8","ISO-8859-1");
@@ -481,7 +481,7 @@ Include: @@ -481,7 +481,7 @@ Include:
481 $this->layer->set("template","none.htm"); 481 $this->layer->set("template","none.htm");
482 $items = pegaItens($this->layer); 482 $items = pegaItens($this->layer);
483 $valores = array(); 483 $valores = array();
484 - $filtro = $this->layer->getfilter(); 484 + $filtro = $this->layer->getfilterstring();
485 if ($filtro != ""){$this->layer->setfilter("");} 485 if ($filtro != ""){$this->layer->setfilter("");}
486 //le o arquivo de query se existir e checa se existe sele&ccedil;&atilde;o para o tema 486 //le o arquivo de query se existir e checa se existe sele&ccedil;&atilde;o para o tema
487 $existesel = "nao"; 487 $existesel = "nao";
@@ -498,7 +498,7 @@ Include: @@ -498,7 +498,7 @@ Include:
498 { 498 {
499 $result = $this->layer->getResult($i); 499 $result = $this->layer->getResult($i);
500 $shp_index = $result->shapeindex; 500 $shp_index = $result->shapeindex;
501 - $shape = $this->layer->getshape(-1, $shp_index); 501 + $shape = $this->layer->getfeature($shp_index,-1);
502 $v = $shape->values[$item]; 502 $v = $shape->values[$item];
503 $valores[] = $v; 503 $valores[] = $v;
504 } 504 }
@@ -1020,7 +1020,7 @@ function identificaQBP($tema,$x,$y,$map_file,$resolucao,$item=&quot;&quot;,$tiporetorno=&quot;&quot; @@ -1020,7 +1020,7 @@ function identificaQBP($tema,$x,$y,$map_file,$resolucao,$item=&quot;&quot;,$tiporetorno=&quot;&quot;
1020 $valori = array(); 1020 $valori = array();
1021 $result = $layer->getResult($i); 1021 $result = $layer->getResult($i);
1022 $shp_index = $result->shapeindex; 1022 $shp_index = $result->shapeindex;
1023 - $shape = $layer->getshape(-1, $shp_index); 1023 + $shape = $layer->getfeature($shp_index,-1);
1024 if ($tiporetorno == "shape") 1024 if ($tiporetorno == "shape")
1025 { 1025 {
1026 $layer->close(); 1026 $layer->close();
@@ -1259,7 +1259,7 @@ function identificaQBP2($tema,$x,$y,$map_file,$resolucao,$item=&quot;&quot;,$tiporetorno=&quot; @@ -1259,7 +1259,7 @@ function identificaQBP2($tema,$x,$y,$map_file,$resolucao,$item=&quot;&quot;,$tiporetorno=&quot;
1259 $valori = array(); 1259 $valori = array();
1260 $result = $layer->getResult($i); 1260 $result = $layer->getResult($i);
1261 $shp_index = $result->shapeindex; 1261 $shp_index = $result->shapeindex;
1262 - $shape = $layer->getshape(-1, $shp_index); 1262 + $shape = $layer->getfeature($shp_index,-1);
1263 $conta = 0; 1263 $conta = 0;
1264 foreach ($itens as $it) 1264 foreach ($itens as $it)
1265 { 1265 {
classesphp/classe_legenda.php
  Diff comments   View file @e8b9c39
@@ -306,7 +306,7 @@ array @@ -306,7 +306,7 @@ array
306 $nomeclasse = $classe->name; 306 $nomeclasse = $classe->name;
307 if (function_exists("mb_convert_encoding")) 307 if (function_exists("mb_convert_encoding"))
308 {$nomeclasse = mb_convert_encoding($nomeclasse,"UTF-8","ISO-8859-1");} 308 {$nomeclasse = mb_convert_encoding($nomeclasse,"UTF-8","ISO-8859-1");}
309 - $nomeexp = $classe->getexpression(); 309 + $nomeexp = $classe->getExpressionString();
310 if (function_exists("mb_convert_encoding")) 310 if (function_exists("mb_convert_encoding"))
311 {$nomeexp = mb_convert_encoding($nomeexp,"UTF-8","ISO-8859-1");} 311 {$nomeexp = mb_convert_encoding($nomeexp,"UTF-8","ISO-8859-1");}
312 312
classesphp/classe_mapa.php
  Diff comments   View file @e8b9c39
@@ -125,7 +125,7 @@ Grava a imagem do mapa atual @@ -125,7 +125,7 @@ Grava a imagem do mapa atual
125 $nome = ($imgo->imagepath).nomeRandomico().".png"; 125 $nome = ($imgo->imagepath).nomeRandomico().".png";
126 $imgo->saveImage($nome); 126 $imgo->saveImage($nome);
127 $nome = ($imgo->imageurl).basename($nome); 127 $nome = ($imgo->imageurl).basename($nome);
128 - $imgo->free(); 128 + //$imgo->free();
129 return ($nome); 129 return ($nome);
130 } 130 }
131 /* 131 /*
@@ -185,13 +185,13 @@ string - javascript com os parametros @@ -185,13 +185,13 @@ string - javascript com os parametros
185 //verifica se existe restrição de escala 185 //verifica se existe restrição de escala
186 // 186 //
187 $contextoescala = "nao"; 187 $contextoescala = "nao";
188 - if(($oLayer->minscale > 0) || ($oLayer->maxscale > 0)) 188 + if(($oLayer->minscaledenom > 0) || ($oLayer->maxscaledenom > 0))
189 {$contextoescala = "sim";} 189 {$contextoescala = "sim";}
190 $temas[] = array( 190 $temas[] = array(
191 "name"=>($oLayer->name), 191 "name"=>($oLayer->name),
192 "status"=>($oLayer->status), 192 "status"=>($oLayer->status),
193 "tema"=>(mb_convert_encoding(($oLayer->getmetadata("tema")),"UTF-8","ISO-8859-1")), 193 "tema"=>(mb_convert_encoding(($oLayer->getmetadata("tema")),"UTF-8","ISO-8859-1")),
194 - "transparency"=>($oLayer->transparency), 194 + "transparency"=>($oLayer->opacity),
195 "type"=>($oLayer->type), 195 "type"=>($oLayer->type),
196 "sel"=>$sel, 196 "sel"=>$sel,
197 "escala"=>$escala, 197 "escala"=>$escala,
@@ -345,7 +345,7 @@ Include: @@ -345,7 +345,7 @@ Include:
345 $nomer = $locmapserv."?map=".$this->arquivo."&mode=map&".nomeRandomico(); 345 $nomer = $locmapserv."?map=".$this->arquivo."&mode=map&".nomeRandomico();
346 } 346 }
347 $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."'"; 347 $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."'";
348 - $imgo->free(); 348 + //$imgo->free();
349 return $res; 349 return $res;
350 } 350 }
351 /* 351 /*
@@ -366,7 +366,7 @@ string - javascript com as variáveis para redesenho do mapa @@ -366,7 +366,7 @@ string - javascript com as variáveis para redesenho do mapa
366 $e = $this->mapa->extent; 366 $e = $this->mapa->extent;
367 $w = $this->mapa->width; 367 $w = $this->mapa->width;
368 $h = $this->mapa->height; 368 $h = $this->mapa->height;
369 - $s = $this->mapa->scale; 369 + $s = $this->mapa->scaledenom;
370 $this->mapa = desligamargem($this->mapa); 370 $this->mapa = desligamargem($this->mapa);
371 $pt = ms_newPointObj(); 371 $pt = ms_newPointObj();
372 //desenha o leste 372 //desenha o leste
@@ -1394,7 +1394,7 @@ $arq - Nome do shape file. @@ -1394,7 +1394,7 @@ $arq - Nome do shape file.
1394 if (file_exists($arq)) 1394 if (file_exists($arq))
1395 { 1395 {
1396 $s = ms_newShapefileObj($arq,-1); 1396 $s = ms_newShapefileObj($arq,-1);
1397 - $shape = $s->getShape(0); 1397 + $shape = $s->getfeature(0);
1398 $t = $shape->type; 1398 $t = $shape->type;
1399 $tipo = MS_LAYER_POLYGON; 1399 $tipo = MS_LAYER_POLYGON;
1400 if ($t == 0) 1400 if ($t == 0)
classesphp/classe_selecao.php
  Diff comments   View file @e8b9c39
@@ -204,7 +204,7 @@ $tipo - Tipo de operação adiciona|retira|inverte|limpa @@ -204,7 +204,7 @@ $tipo - Tipo de operação adiciona|retira|inverte|limpa
204 { 204 {
205 $result = $layero->getResult($i); 205 $result = $layero->getResult($i);
206 $s = $result->shapeindex; 206 $s = $result->shapeindex;
207 - $sh = $layero->getShape(-1,$s); 207 + $sh = $layero->getfeature($s,-1);
208 $tiposh = $sh->type; 208 $tiposh = $sh->type;
209 if ($tiposh == 2) 209 if ($tiposh == 2)
210 {$ident = @$this->layer->querybyshape($sh);} 210 {$ident = @$this->layer->querybyshape($sh);}
@@ -257,9 +257,9 @@ $tipo - Tipo de operação adiciona|retira|inverte|limpa @@ -257,9 +257,9 @@ $tipo - Tipo de operação adiciona|retira|inverte|limpa
257 $conta = $layero->getNumresults(); 257 $conta = $layero->getNumresults();
258 for ($k = 0; $k < $conta; $k++) 258 for ($k = 0; $k < $conta; $k++)
259 { 259 {
260 - if (@$layero->getshape(-1,$k)) 260 + if (@$layero->getfeature($k,-1))
261 { 261 {
262 - $s = $layero->getshape(-1,$k); 262 + $s = $layero->getfeature($k,-1);
263 if ($s->type == 2) 263 if ($s->type == 2)
264 { 264 {
265 $this->layer->querybyshape($s); 265 $this->layer->querybyshape($s);
classesphp/classe_shp.php
  Diff comments   View file @e8b9c39
@@ -282,7 +282,7 @@ Include: @@ -282,7 +282,7 @@ Include:
282 if(!isset($tamanho)){$tamanho = 50;} 282 if(!isset($tamanho)){$tamanho = 50;}
283 $e->set("size",$tamanho); 283 $e->set("size",$tamanho);
284 $e->set("symbolname",$nomes); 284 $e->set("symbolname",$nomes);
285 - $pinlayer->set("transparency",MS_GD_ALPHA); 285 + $pinlayer->set("opacity",MS_GD_ALPHA);
286 $shp = ms_newshapeobj(MS_SHAPE_POINT); 286 $shp = ms_newshapeobj(MS_SHAPE_POINT);
287 $lin = ms_newlineobj(); 287 $lin = ms_newlineobj();
288 $lin->addxy($x,$y); 288 $lin->addxy($x,$y);
@@ -344,7 +344,7 @@ array(&quot;layerprj&quot;=&gt;$xylayer,&quot;mapprj&quot;=&gt;$xymapa) @@ -344,7 +344,7 @@ array(&quot;layerprj&quot;=&gt;$xylayer,&quot;mapprj&quot;=&gt;$xymapa)
344 344
345 $result = $this->layer->getResult($res_count - 1); 345 $result = $this->layer->getResult($res_count - 1);
346 $shp_index = $result->shapeindex; 346 $shp_index = $result->shapeindex;
347 - $shape = $this->layer->getshape(-1,$shp_index); 347 + $shape = $this->layer->getfeature($shp_index,-1);
348 $lin = $shape->line(0); 348 $lin = $shape->line(0);
349 $pt = $lin->point(0); 349 $pt = $lin->point(0);
350 $this->layer->close(); 350 $this->layer->close();
@@ -469,7 +469,7 @@ $para - linha|poligono @@ -469,7 +469,7 @@ $para - linha|poligono
469 if ($para == "poligono") 469 if ($para == "poligono")
470 { 470 {
471 $layer->set("type",MS_LAYER_POLYGON); 471 $layer->set("type",MS_LAYER_POLYGON);
472 - $layer->set("transparency","50"); 472 + $layer->set("opacity","50");
473 $layer->setmetadata("tema",$novonomelayer." (poligonal)"); 473 $layer->setmetadata("tema",$novonomelayer." (poligonal)");
474 } 474 }
475 return("ok"); 475 return("ok");
classesphp/classe_temas.php
  Diff comments   View file @e8b9c39
@@ -394,12 +394,12 @@ string Filtro. @@ -394,12 +394,12 @@ string Filtro.
394 function pegaFiltro() 394 function pegaFiltro()
395 { 395 {
396 if(!$this->layer){return "erro";} 396 if(!$this->layer){return "erro";}
397 - $fil = $this->layer->getfilter();  
398 - if ($this->layer->getfilter() == '"(null)"'){return " ";} 397 + $fil = $this->layer->getfilterstring();
  398 + if ($this->layer->getfilterstring() == '"(null)"'){return " ";}
399 if (function_exists("mb_convert_encoding")) 399 if (function_exists("mb_convert_encoding"))
400 - {return (mb_convert_encoding($this->layer->getfilter(),"HTML-ENTITIES","auto"));} 400 + {return (mb_convert_encoding($this->layer->getfilterstring(),"HTML-ENTITIES","auto"));}
401 else 401 else
402 - {return ($this->layer->getfilter());} 402 + {return ($this->layer->getfilterstring());}
403 } 403 }
404 /* 404 /*
405 function: insereFiltro 405 function: insereFiltro
@@ -598,7 +598,7 @@ $fonte - Fonte. @@ -598,7 +598,7 @@ $fonte - Fonte.
598 $e->set("symbolname",$marca); 598 $e->set("symbolname",$marca);
599 $pinlayer->setmetadata("tema","Poligonos inseridos"); 599 $pinlayer->setmetadata("tema","Poligonos inseridos");
600 $pinlayer->set("type",MS_LAYER_POLYGON); 600 $pinlayer->set("type",MS_LAYER_POLYGON);
601 - $pinlayer->set("transparency","50"); 601 + $pinlayer->set("opacity","50");
602 break; 602 break;
603 case "ANNOTATION": 603 case "ANNOTATION":
604 $c->set("status",MS_DELETE); 604 $c->set("status",MS_DELETE);
@@ -642,7 +642,7 @@ $fonte - Fonte. @@ -642,7 +642,7 @@ $fonte - Fonte.
642 $label->set("position",$p[$position]); 642 $label->set("position",$p[$position]);
643 $pinlayer->setmetadata("TEMA",$texto); 643 $pinlayer->setmetadata("TEMA",$texto);
644 $pinlayer->set("type",MS_LAYER_ANNOTATION); 644 $pinlayer->set("type",MS_LAYER_ANNOTATION);
645 - $pinlayer->set("transparency","100"); 645 + $pinlayer->set("opacity","100");
646 break; 646 break;
647 } 647 }
648 } 648 }
@@ -706,7 +706,7 @@ $nome - nome que será dado a geometria @@ -706,7 +706,7 @@ $nome - nome que será dado a geometria
706 $valitem = array(); 706 $valitem = array();
707 $result = $this->layer->getResult($i); 707 $result = $this->layer->getResult($i);
708 $shp_index = $result->shapeindex; 708 $shp_index = $result->shapeindex;
709 - $shape = $this->layer->getshape(-1, $shp_index); 709 + $shape = $this->layer->getfeature($shp_index,-1);
710 foreach ($items as $item) 710 foreach ($items as $item)
711 { 711 {
712 $v = trim($shape->values[$item]); 712 $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 @@ -933,7 +933,7 @@ Calcula a extensão geográfica dos elementos selecionados de um tema e ajusta o m
933 $valitem = array(); 933 $valitem = array();
934 $result = $this->layer->getResult($i); 934 $result = $this->layer->getResult($i);
935 $shp_index = $result->shapeindex; 935 $shp_index = $result->shapeindex;
936 - $shape = $this->layer->getshape(-1, $shp_index); 936 + $shape = $this->layer->getfeature($shp_index,-1);
937 $bound = $shape->bounds; 937 $bound = $shape->bounds;
938 $xmin[] = $bound->minx; 938 $xmin[] = $bound->minx;
939 $xmax[] = $bound->maxx; 939 $xmax[] = $bound->maxx;
classesphp/classe_vermultilayer.php
  Diff comments   View file @e8b9c39
@@ -101,8 +101,8 @@ class vermultilayer @@ -101,8 +101,8 @@ class vermultilayer
101 $layer = $map->getlayerbyname($temai); 101 $layer = $map->getlayerbyname($temai);
102 $testa = 0; 102 $testa = 0;
103 //verifica se o tema é visivel na escala 103 //verifica se o tema é visivel na escala
104 - $mins = $layer->minscale;  
105 - $maxs = $layer->maxscale; 104 + $mins = $layer->minscaledenom;
  105 + $maxs = $layer->maxscaledenom;
106 if ($mins != $maxs) 106 if ($mins != $maxs)
107 { 107 {
108 $testa = 1; 108 $testa = 1;
classesphp/funcoes_gerais.php
  Diff comments   View file @e8b9c39
@@ -105,7 +105,7 @@ function fusaoGrafico() @@ -105,7 +105,7 @@ function fusaoGrafico()
105 $nome = ($imgo->imagepath).nomeRandomico().".png"; 105 $nome = ($imgo->imagepath).nomeRandomico().".png";
106 $imgo->saveImage($nome); 106 $imgo->saveImage($nome);
107 $imagem = ($imgo->imageurl).basename($nome); 107 $imagem = ($imgo->imageurl).basename($nome);
108 - $imgo->free(); 108 + //$imgo->free();
109 } 109 }
110 $m = new Imagem(dirname($dir_tmp).$imagem); 110 $m = new Imagem(dirname($dir_tmp).$imagem);
111 $i = $m->fundeIm(dirname($dir_tmp).$grafico); 111 $i = $m->fundeIm(dirname($dir_tmp).$grafico);
@@ -994,7 +994,7 @@ function gravaImagemMapa($mapa) @@ -994,7 +994,7 @@ function gravaImagemMapa($mapa)
994 if ($salva != -1) 994 if ($salva != -1)
995 { 995 {
996 $retorno = array("url"=>($imgo->imageurl).basename($nome),"arquivo"=>$nome); 996 $retorno = array("url"=>($imgo->imageurl).basename($nome),"arquivo"=>$nome);
997 - $imgo->free(); 997 + //$imgo->free();
998 } 998 }
999 else 999 else
1000 {$retorno = false;} 1000 {$retorno = false;}
@@ -1032,7 +1032,7 @@ function pegaValores($mapa,$layer,$item,$numerico=false,$ignorar=&quot;&quot;) @@ -1032,7 +1032,7 @@ function pegaValores($mapa,$layer,$item,$numerico=false,$ignorar=&quot;&quot;)
1032 { 1032 {
1033 $result = $layer->getResult($i); 1033 $result = $layer->getResult($i);
1034 $shp_index = $result->shapeindex; 1034 $shp_index = $result->shapeindex;
1035 - $shape = $layer->getshape(-1, $shp_index); 1035 + $shape = $layer->getfeature($shp_index,-1);
1036 $v = trim($shape->values[$item]); 1036 $v = trim($shape->values[$item]);
1037 if ($numerico) 1037 if ($numerico)
1038 { 1038 {
@@ -1112,7 +1112,7 @@ function pegaValoresM($mapa,$layer,$itens,$exclui=&quot;nulo&quot;,$selecionados=&quot;nao&quot;) @@ -1112,7 +1112,7 @@ function pegaValoresM($mapa,$layer,$itens,$exclui=&quot;nulo&quot;,$selecionados=&quot;nao&quot;)
1112 if (($selecionados == "sim") && (array_search($shp_index,$indicesel) === FALSE)) 1112 if (($selecionados == "sim") && (array_search($shp_index,$indicesel) === FALSE))
1113 {continue;} 1113 {continue;}
1114 $considera = "sim"; 1114 $considera = "sim";
1115 - $shape = $layer->getshape(-1, $shp_index); 1115 + $shape = $layer->getfeature($shp_index,-1);
1116 //verifica se no registro deve ser considerado 1116 //verifica se no registro deve ser considerado
1117 if ($exclui != "nulo") 1117 if ($exclui != "nulo")
1118 { 1118 {
@@ -1632,10 +1632,10 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE) @@ -1632,10 +1632,10 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE)
1632 dbase_add_record($db,$reg); 1632 dbase_add_record($db,$reg);
1633 dbase_close($db); 1633 dbase_close($db);
1634 } 1634 }
1635 - $s = $layer->getshape(-1,0); 1635 + $s = $layer->getfeature(0,-1);
1636 $result = $layer->getResult(0); 1636 $result = $layer->getResult(0);
1637 $shpi = $result->shapeindex; 1637 $shpi = $result->shapeindex;
1638 - $shape = $layer->getshape(-1, $shpi); 1638 + $shape = $layer->getfeature($shpi,-1);
1639 $novoshpf = ms_newShapefileObj($nomeshp.".shp", -2); 1639 $novoshpf = ms_newShapefileObj($nomeshp.".shp", -2);
1640 $novoshpf->addShape($shape); 1640 $novoshpf->addShape($shape);
1641 $novoshpf->free(); 1641 $novoshpf->free();
@@ -1680,7 +1680,7 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE) @@ -1680,7 +1680,7 @@ function criaSHP($tema,$map_file,$locaplic,$dir_tmp,$nomeRand=TRUE)
1680 { 1680 {
1681 $result = $layer->getResult($i); 1681 $result = $layer->getResult($i);
1682 $shp_index = $result->shapeindex; 1682 $shp_index = $result->shapeindex;
1683 - $shape = $layer->getshape(-1, $shp_index); 1683 + $shape = $layer->getfeature($shp_index,-1);
1684 foreach ($items as $ni) 1684 foreach ($items as $ni)
1685 { 1685 {
1686 $reg[] = $shape->values[$ni]; 1686 $reg[] = $shape->values[$ni];
classesphp/mapa_inicia.php
  Diff comments   View file @e8b9c39
@@ -172,7 +172,7 @@ function iniciaMapa() @@ -172,7 +172,7 @@ function iniciaMapa()
172 $m->salva($map_file); 172 $m->salva($map_file);
173 $e = $m->mapa->extent; 173 $e = $m->mapa->extent;
174 $ext = ($e->minx)." ".($e->miny)." ".($e->maxx)." ".($e->maxy); 174 $ext = ($e->minx)." ".($e->miny)." ".($e->maxx)." ".($e->maxy);
175 - $escalaMapa = $m->mapa->scale; 175 + $escalaMapa = $m->mapa->scaledenom;
176 $celula = $m->mapa->cellsize; 176 $celula = $m->mapa->cellsize;
177 // 177 //
178 //pega os parametros de cada tema 178 //pega os parametros de cada tema
geraminiatura.php
  Diff comments   View file @e8b9c39
@@ -169,7 +169,7 @@ function verifica($map,$tipo) @@ -169,7 +169,7 @@ function verifica($map,$tipo)
169 echo "<br><img src='".$url.".grande.png' /><br>"; 169 echo "<br><img src='".$url.".grande.png' /><br>";
170 } 170 }
171 $objImagem->saveImage($nomec); 171 $objImagem->saveImage($nomec);
172 - $objImagem->free(); 172 + //$objImagem->free();
173 } 173 }
174 } 174 }
175 function zoomTema($nomelayer,&$mapa) 175 function zoomTema($nomelayer,&$mapa)
menutemas/admin.db
View file @e8b9c39
No preview for this file type
ms_criamapa.php
  Diff comments   View file @e8b9c39
@@ -692,7 +692,7 @@ function insereWKTUrl() @@ -692,7 +692,7 @@ function insereWKTUrl()
692 $estilo->set("size",3); 692 $estilo->set("size",3);
693 } 693 }
694 if($shape->type == 2) 694 if($shape->type == 2)
695 - {$layer->set("transparency","50");} 695 + {$layer->set("opacity","50");}
696 $cor = $estilo->color; 696 $cor = $estilo->color;
697 $cor->setRGB(255,0,0); 697 $cor->setRGB(255,0,0);
698 $salvo = $mapa->save($tmpfname); 698 $salvo = $mapa->save($tmpfname);
@@ -911,7 +911,7 @@ function inserePoligonosUrl() @@ -911,7 +911,7 @@ function inserePoligonosUrl()
911 $layer->setmetadata("classe","sim"); 911 $layer->setmetadata("classe","sim");
912 $layer->setmetadata("ATLAS","nao"); 912 $layer->setmetadata("ATLAS","nao");
913 $layer->set("type",MS_LAYER_POLYGON); 913 $layer->set("type",MS_LAYER_POLYGON);
914 - $layer->set("transparency","50"); 914 + $layer->set("opacity","50");
915 $layer->set("status",MS_DEFAULT); 915 $layer->set("status",MS_DEFAULT);
916 $classe = ms_newClassObj($layer); 916 $classe = ms_newClassObj($layer);
917 $classe->set("name"," "); 917 $classe->set("name"," ");
testamapfile.php
  Diff comments   View file @e8b9c39
@@ -285,7 +285,7 @@ function verifica($map,$solegenda) @@ -285,7 +285,7 @@ function verifica($map,$solegenda)
285 Header("Content-type: image/png"); 285 Header("Content-type: image/png");
286 ImagePng(ImageCreateFromPNG($nomec)); 286 ImagePng(ImageCreateFromPNG($nomec));
287 } 287 }
288 - $objImagem->free(); 288 + //$objImagem->free();
289 } 289 }
290 } 290 }
291 function zoomTema($nomelayer,&$mapa) 291 function zoomTema($nomelayer,&$mapa)