"
- ins += (geraLinhas2(d,param,"salvarEstilo"));
- ins += ""
- ins += ""
- $i(divestilos).innerHTML = ins
- }
- }
- ativaLegenda()
+
}
var p = "../php/temas.php?funcao=pegaEstilos&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer;
cPaint.call(p,"",retorna);
diff --git a/admin/php/admin.php b/admin/php/admin.php
index 31185a4..d2be65d 100644
--- a/admin/php/admin.php
+++ b/admin/php/admin.php
@@ -51,6 +51,7 @@ error_reporting(E_ALL);
//carrega o phpmapscript
//
include_once ($locaplic."/classesphp/carrega_ext.php");
+include_once ($locaplic."/classesphp/funcoes_gerais.php");
//
//verifica se o cliente pode editar
//se funcao for verificaEditores vai para case específico
diff --git a/admin/php/atlas.php b/admin/php/atlas.php
index 4a29ff3..04fcd76 100644
--- a/admin/php/atlas.php
+++ b/admin/php/atlas.php
@@ -29,7 +29,6 @@ File: i3geo/admin/sistemas.php
*/
include_once("admin.php");
-$cp = new cpaint();
//faz a busca da função que deve ser executada
switch ($funcao)
{
@@ -103,8 +102,8 @@ switch ($funcao)
break;
case "importarXmlAtlas":
- $cp->set_data(importarXmlAtlas());
- $cp->return_data();
+ retornaJSON(importarXmlAtlas());
+ exit;
break;
}
function movimentaNo()
diff --git a/admin/php/editormapfile.php b/admin/php/editormapfile.php
index b4121c9..03c8351 100644
--- a/admin/php/editormapfile.php
+++ b/admin/php/editormapfile.php
@@ -31,7 +31,7 @@ File: i3geo/admin/sistemas.php
include_once("admin.php");
include_once("../../ms_configura.php");
include_once("../../classesphp/funcoes_gerais.php");
-error_reporting(0);
+error_reporting(E_ALL);
//faz a busca da função que deve ser executada
switch ($funcao)
{
@@ -97,6 +97,15 @@ switch ($funcao)
retornaJSON(listaEstilos());
exit;
break;
+ case "pegaEstilo":
+ retornaJSON(pegaEstilo());
+ exit;
+ break;
+ case "alterarEstilo":
+ alterarEstilo();
+ retornaJSON(pegaEstilo());
+ exit;
+ break;
case "pegaConexao":
retornaJSON(pegaConexao());
exit;
@@ -138,6 +147,61 @@ switch ($funcao)
retornaJSON(pegaClasseLabel());
exit;
break;
+ case "alterarClasseLabel":
+ alterarClasseLabel();
+ retornaJSON(pegaClasseLabel());
+ exit;
+ break;
+ case "movimentaNo":
+ $res = sobeDesce();
+ retornaJSON($res);
+ exit;
+ break;
+}
+function sobeDesce()
+{
+ global $movimento,$tipo,$codigoMap,$codigoLayer,$indiceClasse,$indiceEstilo,$locaplic;
+ $mapfile = $locaplic."/temas/".$codigoMap.".map";
+ $mapa = ms_newMapObj($mapfile);
+ $layer = $mapa->getlayerbyname($codigoLayer);
+ if($movimento == "sobe")
+ {
+ if($tipo == "layer")
+ {
+ $indice = $layer->index;
+ $mapa->moveLayerUp($indice);
+ }
+ if($tipo == "classe")
+ {
+ $layer->moveclassup($indiceClasse);
+ }
+ if($tipo == "estilo")
+ {
+ $classe = $layer->getclass($indiceClasse);
+ $classe->movestyleup($indiceEstilo);
+ }
+
+ }
+ if($movimento == "desce")
+ {
+ if($tipo == "layer")
+ {
+ $indice = $layer->index;
+ $mapa->moveLayerDown($indice);
+ }
+ if($tipo == "classe")
+ {
+ $layer->moveclassdown($indiceClasse);
+ }
+ if($tipo == "estilo")
+ {
+ $classe = $layer->getclass($indiceClasse);
+ $classe->movestyledown($indiceEstilo);
+ }
+ }
+ $mapa->save($mapfile);
+ removeCabecalho($mapfile);
+ return "ok";
}
function criarNovoMap()
{
@@ -345,18 +409,7 @@ function pegaMetadados()
$dados["aplicaextensao"] = $layer->getmetadata("aplicaextensao");
$dados["codigoMap"] = $codigoMap;
$dados["codigoLayer"] = $codigoLayer;
- $colunas = "";
- if($layer->type < 3)
- {
- if(@$layer->open())
- {
- $layer->open();
- $colunas = implode(", ",$layer->getitems());
- $layer->close();
- }
- }
- $dados["colunas"] = $colunas;
-
+ $dados["colunas"] = implode(" ,",pegaItens($layer));
return $dados;
}
function alterarMetadados()
@@ -417,21 +470,11 @@ function pegaGeral()
$dados["sizeunits"] = $layer->sizeunits;
$dados["projection"] = $layer->getProjection();
$dados["name"] = $layer->name;
- $colunas = "";
- if($layer->type < 3)
- {
- if(@$layer->open())
- {
- $layer->open();
- $colunas = implode(", ",$layer->getitems());
- $layer->close();
- }
- }
if($dados["projection"] == "null")
$dados["projection"] = "";
- $dados["colunas"] = $colunas;
$dados["codigoMap"] = $codigoMap;
$dados["codigoLayer"] = $codigoLayer;
+ $dados["colunas"] = implode(" ,",pegaItens($layer));
return $dados;
}
function alterarGeral()
@@ -496,16 +539,7 @@ function pegaClasseGeral()
$dados["codigoMap"] = $codigoMap;
$dados["codigoLayer"] = $codigoLayer;
$dados["indiceClasse"] = $indiceClasse;
- $colunas = "";
- if($layer->type < 3)
- {
- if(@$layer->open())
- {
- $layer->open();
- $colunas = implode(", ",$layer->getitems());
- $layer->close();
- }
- }
+ $dados["colunas"] = implode(" ,",pegaItens($layer));
return $dados;
}
function alterarClasseGeral()
@@ -569,144 +603,118 @@ function pegaClasseLabel()
$dados["codigoMap"] = $codigoMap;
$dados["codigoLayer"] = $codigoLayer;
$dados["indiceClasse"] = $indiceClasse;
- $colunas = "";
- if($layer->type < 3)
- {
- if(@$layer->open())
- {
- $layer->open();
- $colunas = implode(", ",$layer->getitems());
- $layer->close();
- }
- }
- return $dados;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-function pegaFontes()
-{
- $arq = "../../symbols/fontes.txt";
+ $dados["colunas"] = implode(" ,",pegaItens($layer));
+ $arq = $locaplic."/symbols/fontes.txt";
$h = fopen ($arq,"r");
while ($i = fscanf ($h, "%s\t%s\t"))
{
list ($f,$g) = $i;
$nome[] = $f;
}
- return $nome;
+ $dados["fontes"] = $nome;
+ return $dados;
}
-function alteraEstilo()
+function alterarClasseLabel()
{
- global $codigoMap,$codigoLayer,$classe,$estilo,$parametro,$valor;
- $mapfile = "../../temas/".$codigoMap.".map";
+ global $codigoMap,$codigoLayer,$indiceClasse,$locaplic,$autoangle,$encoding,$force,$partials,$mindistance,$minfeaturesize,$wrap,$antialias,$buffer,$angle,$offsety,$offsetx,$position,$maxsize,$minsize,$size,$backgroundshadowsizey,$backgroundshadowsizex,$shadowsizey,$shadowsizex,$shadowcolor,$outlinecolor,$color,$backgroundshadowcolor,$backgroundcolor,$type,$font;
+ $dados = array();
+ $mapfile = $locaplic."/temas/".$codigoMap.".map";
$mapa = ms_newMapObj($mapfile);
$layer = $mapa->getlayerbyname($codigoLayer);
- $classe = $layer->getclass($classe);
- $estilo = $classe->getstyle($estilo);
- $ok = false;
- $cor = "";
- switch ($parametro)
- {
- case "backgroundcolor":
- $cor = $estilo->backgroundcolor;
- $ok = true;
- break;
- case "color":
- $cor = $estilo->color;
- $ok = true;
- break;
- case "outlinecolor":
- $cor = $estilo->outlinecolor;
- $ok = true;
- break;
- default:
- if(!$ok)$estilo->set($parametro,$valor);
- }
- if ($cor != "")
+ $classe = $layer->getclass($indiceClasse);
+ $label = $classe->label;
+ if ($label != "")
{
- $c = explode(",",$valor);
- if(count($c) < 3)
- $c = explode(" ",$valor);
- $cor->setrgb($c[0],$c[1],$c[2]);
+ $label->set("font",$font);
+ $label->set("type",$type);
+ corE($label,$backgroundcolor,"backgroundcolor");
+ corE($label,$backgroundshadowcolor,"backgroundshadowcolor");
+ corE($label,$color,"color");
+ corE($label,$outlinecolor,"outlinecolor");
+ corE($label,$shadowcolor,"shadowcolor");
+ $label->set("shadowsizex",$shadowsizex);
+ $label->set("shadowsizey",$shadowsizey);
+ $label->set("backgroundshadowsizex",$backgroundshadowsizex);
+ $label->set("backgroundshadowsizey",$backgroundshadowsizey);
+ $label->set("size",$size);
+ $label->set("minsize",$minsize);
+ $label->set("maxsize",$maxsize);
+ $label->set("position",$position);
+ $label->set("offsetx",$offsetx);
+ $label->set("offsety",$offsety);
+ $label->set("angle",$angle);
+ $label->set("autoangle",$autoangle);
+ $label->set("buffer",$buffer);
+ $label->set("antialias",$antialias);
+ $label->set("wrap",$wrap);
+ $label->set("minfeaturesize",$minfeaturesize);
+ //$label->set("autominfeaturesize",$autominfeaturesize);
+ $label->set("mindistance",$mindistance);
+ $label->set("partials",$partials);
+ $label->set("force",$force);
+ $label->set("encoding",$encoding);
+ $label->set("autoangle",$autoangle);
}
$mapa->save($mapfile);
removeCabecalho($mapfile);
return "ok";
}
-
-function alteraClasseLabel()
+function pegaEstilo()
{
- global $codigoMap,$codigoLayer,$classe,$parametro,$valor;
- $mapfile = "../../temas/".$codigoMap.".map";
+ global $codigoMap,$codigoLayer,$indiceClasse,$indiceEstilo,$locaplic;
+ $dados = array();
+ $mapfile = $locaplic."/temas/".$codigoMap.".map";
$mapa = ms_newMapObj($mapfile);
$layer = $mapa->getlayerbyname($codigoLayer);
- $classe = $layer->getclass($classe);
- $label = $classe->label;
- $ok = false;
- $cor = "";
- switch ($parametro)
- {
- case "backgroundcolor":
- $cor = $label->backgroundcolor;
- $ok = true;
- break;
- case "backgroundshadowcolor":
- $cor = $label->backgroundshadowcolor;
- $ok = true;
- break;
- case "color":
- $cor = $label->color;
- $ok = true;
- break;
- case "outlinecolor":
- $cor = $label->outlinecolor;
- $ok = true;
- break;
- case "shadowcolor":
- $cor = $label->shadowcolor;
- $ok = true;
- break;
- case "shadowsizex":
- $cor = $label->shadowsizex;
- $ok = true;
- break;
- case "shadowsizey":
- $cor = $label->shadowsizey;
- $ok = true;
- break;
- case "backgroundshadowsizex":
- $cor = $label->backgroundshadowsizex;
- $ok = true;
- break;
- case "backgroundshadowsizey":
- $cor = $label->backgroundshadowsizey;
- $ok = true;
- break;
- default:
- if(!$ok)$label->set($parametro,$valor);
- }
- if ($cor != "")
- {
- $c = explode(",",$valor);
- if(count($c) < 3)
- $c = explode(" ",$valor);
- $cor->setrgb($c[0],$c[1],$c[2]);
- }
+ $nclasses = $layer->numclasses;
+ $classe = $layer->getclass($indiceClasse);
+ $estilo = $classe->getstyle($indiceEstilo);
+ $dados["symbolname"] = $estilo->symbolname;
+ $dados["color"] = $estilo->color->red.",".$estilo->color->green.",".$estilo->color->blue;
+ $dados["size"] = $estilo->size;
+ $dados["minsize"] = $estilo->minsize;
+ $dados["maxsize"] = $estilo->maxsize;
+ $dados["offsetx"] = $estilo->offsetx;
+ $dados["offsety"] = $estilo->offsety;
+ $dados["antialias"] = $estilo->antialias;
+ $dados["backgroundcolor"] = $estilo->backgroundcolor->red.",".$estilo->backgroundcolor->green.",".$estilo->backgroundcolor->blue;
+ $dados["outlinecolor"] = $estilo->outlinecolor->red.",".$estilo->outlinecolor->green.",".$estilo->outlinecolor->blue;
+ $dados["width"] = $estilo->width;
+ $dados["minwidth"] = $estilo->minwidth;
+ $dados["maxwidth"] = $estilo->maxwidth;
+ $dados["angle"] = $estilo->angle;
+ $dados["codigoMap"] = $codigoMap;
+ $dados["codigoLayer"] = $codigoLayer;
+ $dados["indiceClasse"] = $indiceClasse;
+ $dados["indiceEstilo"] = $indiceEstilo;
+ //$dados["opacity"] = $estilo->opacity;
+ return $dados;
+}
+function alterarEstilo()
+{
+ global $codigoMap,$codigoLayer,$indiceClasse,$indiceEstilo,$locaplic,$angle,$maxwidth,$minwidth,$width,$outlinecolor,$backgroundcolor,$antialias,$offsety,$offsetx,$maxsize,$minsize,$size,$color,$symbolname;
+ $dados = array();
+ $mapfile = $locaplic."/temas/".$codigoMap.".map";
+ $mapa = ms_newMapObj($mapfile);
+ $layer = $mapa->getlayerbyname($codigoLayer);
+ $nclasses = $layer->numclasses;
+ $classe = $layer->getclass($indiceClasse);
+ $estilo = $classe->getstyle($indiceEstilo);
+ $estilo->set("symbolname",$symbolname);
+ corE($estilo,$color,"color");
+ $estilo->set("size",$size);
+ $estilo->set("minsize",$minsize);
+ $estilo->set("maxsize",$maxsize);
+ $estilo->set("offsetx",$offsetx);
+ $estilo->set("offsety",$offsety);
+ $estilo->set("antialias",$antialias);
+ corE($estilo,$backgroundcolor,"backgroundcolor");
+ corE($estilo,$outlinecolor,"outlinecolor");
+ $estilo->set("width",$width);
+ $estilo->set("minwidth",$minwidth);
+ $estilo->set("maxwidth",$maxwidth);
+ $estilo->set("angle",$angle);
+ //$estilo->set("opacity",$opacity);
$mapa->save($mapfile);
removeCabecalho($mapfile);
return "ok";
@@ -728,58 +736,30 @@ function removeCabecalho($arq)
if(strtoupper(trim($linha)) == "LAYER")
{$grava = true;}
if($grava)
- {$final[] = rtrim($linha, "\r\n") . PHP_EOL;}//$linha."\n";}
+ {$final[] = rtrim($linha, "\r\n") . PHP_EOL;}
}
fclose($handle);
}
$handle = fopen($arq, "w+");
foreach ($final as $f)
{
- if(($f != "") && ($f != 'FILTERITEM ""') && ($f != 'LABELITEM ""'))
+ //
+ //remove resultados em branco
+ //e grava a linha
+ //
+ $teste = strtoupper($f);
+ $teste = trim($teste);
+ $teste = str_replace(" ","",$teste);
+ $teste = str_replace("'","",$teste);
+ $teste = str_replace('"',"",$teste);
+ $teste = preg_replace('/[\n\r\t ]*/', '', $teste);
+ $testar = array("SYMBOL","LABELITEM","FILTERITEM","GROUP","ENCODING","TIP","CLASSE","ITENSDESC","CLASSESNOME","ITENSLINK","ESCALA","CLASSESSIMBOLO","MENSAGEM","EXTENSAO","CLASSESITEM","ESCONDIDO","CLASSESCOR","DOWNLOAD","CLASSESTAMANHO","ITENS","TEMA","APLICAEXTENSAO","IDENTIFICA");
+ $passou = true;
+ foreach ($testar as $t)
+ {if($teste == $t){$passou = false;}}
+ if($passou)
fwrite($handle,$f);
}
fclose($handle);
}
-
-function pegaDadosEstilo()
-{
- global $codigoMap,$codigoLayer;
- $dados = array();
- $mapfile = "../../temas/".$codigoMap.".map";
- $mapa = ms_newMapObj($mapfile);
- $layer = $mapa->getlayerbyname($codigoLayer);
- $nclasses = $layer->numclasses;
- for($i=0;$i<$nclasses;++$i)
- {
- $classe = $layer->getclass($i);
- $numestilos = $classe->numstyles;
- $estilos = array();
- for($j=0;$j<$numestilos;++$j)
- {
- $estilo = $classe->getstyle($j);
- $temp["symbolname"] = $estilo->symbolname;
- $temp["color"] = $estilo->color->red.",".$estilo->color->green.",".$estilo->color->blue;
- $temp["size"] = $estilo->size;
- $temp["minsize"] = $estilo->minsize;
- $temp["maxsize"] = $estilo->maxsize;
- $temp["offsetx"] = $estilo->offsetx;
- $temp["offsety"] = $estilo->offsety;
- $temp["antialias"] = $estilo->antialias;
- $temp["backgroundcolor"] = $estilo->backgroundcolor->red.",".$estilo->backgroundcolor->green.",".$estilo->backgroundcolor->blue;
- $temp["outlinecolor"] = $estilo->outlinecolor->red.",".$estilo->outlinecolor->green.",".$estilo->outlinecolor->blue;
- $temp["width"] = $estilo->width;
- $temp["minwidth"] = $estilo->minwidth;
- $temp["maxwidth"] = $estilo->maxwidth;
- $temp["angle"] = $estilo->angle;
- $temp["angleitem"] = $estilo->angleitem;
- $temp["sizeitem"] = $estilo->sizeitem;
- $temp["minvalue"] = $estilo->minvalue;
- $temp["maxvalue"] = $estilo->maxvalue;
- $estilos[] = array("estilo"=>$j,"dados"=>$temp);
- }
- $dados[] = array("classe"=>$i,"estilos"=>$estilos);
- }
- return $dados;
-}
-
?>
\ No newline at end of file
diff --git a/admin/php/identifica.php b/admin/php/identifica.php
index d6ff910..9adc26c 100644
--- a/admin/php/identifica.php
+++ b/admin/php/identifica.php
@@ -28,7 +28,6 @@ File: i3geo/admin/identifica.php
*/
include_once("admin.php");
-$cp = new cpaint();
//faz a busca da função que deve ser executada
switch ($funcao)
{
@@ -57,8 +56,8 @@ switch ($funcao)
break;
case "importarXmlI":
- $cp->set_data(importarXmlI());
- $cp->return_data();
+ retornaJSON(importarXmlI());
+ exit;;
break;
}
/*
diff --git a/admin/php/mapas.php b/admin/php/mapas.php
index bd0ecc0..e2f7514 100644
--- a/admin/php/mapas.php
+++ b/admin/php/mapas.php
@@ -31,12 +31,6 @@ include_once("admin.php");
//faz a busca da função que deve ser executada
switch ($funcao)
{
- //verifica os editores
- case "verificaEditores":
- $cp->set_data(verificaEditores($editores));
- $cp->return_data();
- break;
-
case "pegaMapas":
retornaJSON(pegaDados('SELECT id_mapa,nome_mapa,ordem_mapa from i3geoadmin_mapas order by ordem_mapa'));
exit;
@@ -61,8 +55,8 @@ switch ($funcao)
break;
case "importarXmlMapas":
- $cp->set_data(importarXmlMapas());
- $cp->return_data();
+ retornaJSON(importarXmlMapas());
+ exit;
break;
}
/*
diff --git a/admin/php/menutemas.php b/admin/php/menutemas.php
index 418748f..0138afe 100644
--- a/admin/php/menutemas.php
+++ b/admin/php/menutemas.php
@@ -39,8 +39,8 @@ switch ($funcao)
break;
case "importarXmlMenu":
- $cp->set_data(importarXmlMenu());
- $cp->return_data();
+ retornaJSON(importarXmlMenu());
+ exit;
break;
case "pegaMenus":
@@ -57,6 +57,7 @@ switch ($funcao)
case "pegaPerfis":
$dados = pegaDados('SELECT * from i3geoadmin_perfis order by perfil');
+ if(count($dados) == 0){$dados[] = "nenhum";}
retornaJSON($dados);
break;
@@ -777,10 +778,13 @@ function importarXmlMenu()
//importa os temas
//
$temasExistentes = array();
- $q = $dbhw->query("select * from i3geoadmin_subgrupos");
+ $q = $dbhw->query("select * from i3geoadmin_temas");
$resultado = $q->fetchAll();
foreach($resultado as $r)
- {$temasExistentes[$r["codigo_tema"]] = 0;}
+ {
+ if($r["codigo_tema"])
+ $temasExistentes[$r["codigo_tema"]] = 0;
+ }
foreach($xml->TEMA as $tema)
{
$nome = ixml($tema,"TNOME");
@@ -896,7 +900,7 @@ function importarXmlMenu()
$listaDeTags = array_unique($listaDeTags);
foreach ($listaDeTags as $t)
{
- if(!(verificaDuplicados("select * from i3geoadmin_tags where nome = '$t'",$dbh)))
+ if($t != "" && !(verificaDuplicados("select * from i3geoadmin_tags where nome = '$t'",$dbh)))
$dbhw->query("INSERT INTO i3geoadmin_tags (nome) VALUES ('$t')");
}
$dbhw = null;
diff --git a/admin/php/parsemapfile.php b/admin/php/parsemapfile.php
index a5234a4..75d50a7 100644
--- a/admin/php/parsemapfile.php
+++ b/admin/php/parsemapfile.php
@@ -321,6 +321,7 @@ function mapfile()
$dstring = $d[0];
$dstring = str_replace("the_geom","",$dstring);
$dstring = str_replace("*",$colunas,$dstring);
+ $xml .= "
$colunas ";
$xml .= "
$dstring \n";
$string = preg_replace('/.*from\s*(.+).*/i', '\1', $d[0]);
$s = explode("WHERE",$string);
diff --git a/admin/php/sistemas.php b/admin/php/sistemas.php
index b33fe1b..9ea251e 100644
--- a/admin/php/sistemas.php
+++ b/admin/php/sistemas.php
@@ -28,7 +28,6 @@ File: i3geo/admin/sistemas.php
*/
include_once("admin.php");
-$cp = new cpaint();
//faz a busca da função que deve ser executada
switch ($funcao)
{
@@ -88,8 +87,8 @@ switch ($funcao)
break;
case "importarXmlSistemas":
- $cp->set_data(importarXmlSistemas());
- $cp->return_data();
+ retornaJSON(importarXmlSistemas());
+ exit;
break;
}
/*
diff --git a/admin/php/webservices.php b/admin/php/webservices.php
index 6762cac..0a116c0 100644
--- a/admin/php/webservices.php
+++ b/admin/php/webservices.php
@@ -27,7 +27,7 @@ File: i3geo/admin/webservices.php
19/6/2007
*/
-error_reporting(E_ALL);
+error_reporting(0);
include_once("admin.php");
//faz a busca da função que deve ser executada
switch ($funcao)
@@ -55,8 +55,8 @@ switch ($funcao)
break;
case "importarXmlWS":
- $cp->set_data(importarXmlWS());
- $cp->return_data();
+ retornaJSON(importarXmlWS());
+ exit;
break;
}
/*
diff --git a/aplicmap/ogc_wmc_output.cml b/aplicmap/ogc_wmc_output.cml
new file mode 100644
index 0000000..34aeaaf
--- /dev/null
+++ b/aplicmap/ogc_wmc_output.cml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+ I3Geo Brasil MMA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/aplicmap/ogcws.map b/aplicmap/ogcws.map
index 1f0b670..5e5207f 100644
--- a/aplicmap/ogcws.map
+++ b/aplicmap/ogcws.map
@@ -39,6 +39,7 @@ WEB
TEMPLATE "none.htm"
METADATA
"ows_title" "I3Geo Brasil MMA"
+ "wms_title" "I3Geo Brasil MMA"
"ows_abstract" "Web services gerados da base de dados do I3Geo. Para chamar um tema especificamente, veja o sistema de ajuda, digitando ogc.php?ajuda="
"ows_keywordlist" ""
"ows_onlineresource" ""
diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php
index feeeda4..b16a3d4 100644
--- a/classesphp/funcoes_gerais.php
+++ b/classesphp/funcoes_gerais.php
@@ -1197,13 +1197,20 @@ $layer - objeto layer
*/
function pegaItens($layer)
{
- global $locaplic,$imgdir,$dir_tmp;
+ $sopen = $layer->open();
+ if($sopen != MS_FAILURE)
+ $items = $layer->getItems();
+ else
+ $items = array();
+ return $items;
+/*
if ($layer->type != 3)
{$layer->open();}
$items = $layer->getItems();
if ($layer->type != 3)
{$layer->close();}
- return $items;
+ return $items;
+*/
}
/*
function: buscaRapida
diff --git a/menutemas/admin.db b/menutemas/admin.db
index c9a8d43..e58e3db 100644
Binary files a/menutemas/admin.db and b/menutemas/admin.db differ
diff --git a/menutemas/geopr.xml b/menutemas/geopr.xml
index b02d62a..0c5285f 100644
--- a/menutemas/geopr.xml
+++ b/menutemas/geopr.xml
@@ -6,7 +6,7 @@
Agência Nacional de Energia Elétrica
- GSI WMS
+ ANEEL
geopr_aneel_reservatorios
Reservatórios
@@ -259,7 +259,7 @@
geopr_ana_reghidro1
Região Hidrográfica Nível 1
- http://200.140.135.184/cgi-bin/mapserv?map=/usr/local/www/apache22/data/hidro/wshidro.map&request=getcapabilities&version=1.1.1
+ http://200.140.135.184/cgi-bin/mapserv?map=/usr/local/www/apache22/data/hidro/wshidro.map&request=getcapabilities&version=1.1.1&service=wms
WMS
rio
@@ -267,7 +267,7 @@
geopr_ana_microbacias
Micro-bacias
- http://200.140.135.184/cgi-bin/mapserv?map=/usr/local/www/apache22/data/hidro/wshidro.map&request=getcapabilities&version=1.1.1
+ http://200.140.135.184/cgi-bin/mapserv?map=/usr/local/www/apache22/data/hidro/wshidro.map&request=getcapabilities&version=1.1.1&service=wms
WMS
bacia
@@ -275,7 +275,7 @@
geopr_ana_federais
Rios Federais
- http://200.140.135.184/cgi-bin/mapserv?map=/usr/local/www/apache22/data/hidro/wshidro.map&request=getcapabilities&version=1.1.1
+ http://200.140.135.184/cgi-bin/mapserv?map=/usr/local/www/apache22/data/hidro/wshidro.map&request=getcapabilities&version=1.1.1&service=wms
WMS
rio
diff --git a/temas/atlas_biomas.map b/temas/atlas_biomas.map
index 351ab8e..a6965b5 100644
--- a/temas/atlas_biomas.map
+++ b/temas/atlas_biomas.map
@@ -7,31 +7,15 @@ FONTSET "../symbols/fontes.txt"
METADATA
"wms_srs" "EPSG:4291 EPSG:4326"
"wms_exceptions_format" "application/vnd.ogc.se_xml"
- "tip" ""
"CLASSE" "SIM"
- "itensdesc" ""
- "itenslink" ""
- "escala" ""
- "classesnome" ""
"wms_force_separate_request" "1"
"wms_name" "bioma"
"formatosinfo" "text/plain,application/vnd.ogc.gml"
- "extensao" ""
- "mensagem" ""
- "classessimbolo" ""
- "classesitem" ""
- "escondido" ""
"wms_formatlist" "image/gif,image/png,image/png; mode=24bit,image/jpeg,image/wbmp,image/tiff"
"wms_format" "image/png"
- "download" ""
- "classescor" ""
- "classestamanho" ""
"wms_connectiontimeout" "30"
- "itens" ""
"TEMA" "Biomas segundo IBGE-MMA"
"wms_server_version" "1.1.0"
- "identifica" ""
- "aplicaextensao" ""
"wms_style" "default"
END
NAME "atlas_biomas"
@@ -44,8 +28,6 @@ FONTSET "../symbols/fontes.txt"
NAME "testevvvvv"
KEYIMAGE ""
END
- CLASS
- END
END
END
diff --git a/temas/bioma.map b/temas/bioma.map
index 77a72e6..a88222e 100644
--- a/temas/bioma.map
+++ b/temas/bioma.map
@@ -1,207 +1,91 @@
SYMBOLSET ../symbols/simbolos.sym
FONTSET "../symbols/fontes.txt"
LAYER
-
CONNECTION "user=geodados password=geodados dbname=geodados host=pgsql1.mma.gov.br port=5432"
-
CONNECTIONTYPE POSTGIS
-
DATA "the_geom FROM (select * FROM brasil.brareg1) as foo USING UNIQUE gid USING SRID=4291"
-
+ LABELITEM "cd_legenda"
METADATA
-
"CLASSE" "SIM"
-
"ITENSDESC" "Nome"
-
"ESCALA" "5000000"
-
"EXTENSAO" "-75.233614607 -33.7515829981 -27.592958622 5.272156"
-
"ITENS" "cd_legenda"
-
"TEMA" "Bioma"
-
END
-
NAME "bioma"
-
STATUS OFF
-
TEMPLATE "none.htm"
-
OPACITY 80
-
TYPE POLYGON
-
UNITS METERS
-
CLASS
-
- NAME "Amazônia"
-
- EXPRESSION ('[id]'eq '1')
-
+ NAME "Cerrado"
+ EXPRESSION ('[id]'eq '3')
STYLE
-
ANGLE 360
-
- BACKGROUNDCOLOR 255 0 0
-
- COLOR 255 0 0
-
+ COLOR 244 214 0
+ OPACITY 100
+ OUTLINECOLOR 50 50 50
+ SYMBOL 0
+ END
+ END
+ CLASS
+ NAME "Pantanal"
+ EXPRESSION ('[id]'eq '6')
+ STYLE
+ ANGLE 360
+ COLOR 200 200 241
OPACITY 100
-
- OUTLINECOLOR 255 0 0
-
+ OUTLINECOLOR 50 50 50
SYMBOL 0
-
- WIDTH 5
-
- OFFSET -20 -20
-
END
-
END
-
CLASS
-
- NAME "Caatingaxxxx"
-
- EXPRESSION ('[id]'eq '2')
-
+ NAME "Amaz"
+ EXPRESSION ('[id]'eq '1')
+ KEYIMAGE ""
LABEL
-
- SIZE TINY
-
+ SIZE MEDIUM
TYPE BITMAP
-
BUFFER 0
-
- COLOR 0 0 255
-
+ COLOR 0 255 0
FORCE FALSE
-
MINDISTANCE -1
-
MINFEATURESIZE -1
-
OFFSET 0 0
-
PARTIALS TRUE
-
POSITION CC
-
END
-
STYLE
-
ANGLE 360
-
- COLOR 0 0 246
-
- OPACITY 100
-
- OUTLINECOLOR 255 255 255
-
- SYMBOL 0
-
- END
-
- END
-
- CLASS
-
- NAME "Cerrado"
-
- EXPRESSION ('[id]'eq '3')
-
- STYLE
-
- ANGLE 360
-
- COLOR 244 214 0
-
- OPACITY 100
-
- OUTLINECOLOR 50 50 50
-
- SYMBOL 0
-
- END
-
- END
-
- CLASS
-
- NAME "Pantanal"
-
- EXPRESSION ('[id]'eq '6')
-
- STYLE
-
- ANGLE 360
-
- COLOR 200 200 241
-
+ COLOR 255 0 0
OPACITY 100
-
- OUTLINECOLOR 50 50 50
-
- SYMBOL 0
-
END
-
END
-
CLASS
-
NAME "Pampa"
-
EXPRESSION ('[id]'eq '5')
-
STYLE
-
ANGLE 360
-
COLOR 143 189 192
-
OPACITY 100
-
OUTLINECOLOR 50 50 50
-
SYMBOL 0
-
END
-
END
-
CLASS
-
NAME "Mata Atlântica"
-
EXPRESSION ('[id]'eq '4')
-
STYLE
-
ANGLE 360
-
COLOR 218 255 216
-
OPACITY 100
-
OUTLINECOLOR 50 50 50
-
SYMBOL 0
-
END
-
END
-
END
-
-
END
-
-
+
--
libgit2 0.21.2