From 67b386fda3faef3cdb48069a15c5f1b9aeb12598 Mon Sep 17 00:00:00 2001 From: edmarmoretti Date: Mon, 27 Mar 2017 21:51:09 -0300 Subject: [PATCH] Inclusão de botão para ativação da tela de parâmetros, referente à ferramenta animagif, no editor gráfico de mapfiles --- admin/admin.db | Bin 340992 -> 0 bytes admin1/catalogo/mapfile/opcoes/exec.php | 0 admin1/catalogo/mapfile/teste/exec.php | 608 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- admin1/php/checaLogin.php | 6 +++++- admin1/php/funcoesAdmin.php | 2 +- ferramentas/atalhosedicao/index.js | 12 ++++++++++++ ferramentas/atalhosedicao/template_mst.html | 6 ++++-- temas/_lbiomashp.map | 31 ++++++++++++++++--------------- 8 files changed, 462 insertions(+), 203 deletions(-) mode change 100644 => 100755 admin1/catalogo/mapfile/opcoes/exec.php diff --git a/admin/admin.db b/admin/admin.db index bedead7..4ea9a9e 100755 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin1/catalogo/mapfile/opcoes/exec.php b/admin1/catalogo/mapfile/opcoes/exec.php old mode 100644 new mode 100755 index 35729b8..35729b8 --- a/admin1/catalogo/mapfile/opcoes/exec.php +++ b/admin1/catalogo/mapfile/opcoes/exec.php diff --git a/admin1/catalogo/mapfile/teste/exec.php b/admin1/catalogo/mapfile/teste/exec.php index 4aff163..04650ac 100755 --- a/admin1/catalogo/mapfile/teste/exec.php +++ b/admin1/catalogo/mapfile/teste/exec.php @@ -1,43 +1,45 @@ numlayers; $dados = ""; - for ($i=0;$i < $numlayers;$i++){ - $layern = $nmapa->getlayer($i); - $layern->set("status",MS_DEFAULT); - error_reporting (E_ALL); - if($layern->classitem != "" && $layern->connectiontype == 7 && $layern->numclasses > 0 && $layern->getmetadata("wms_sld_body") == ""){ + for($i = 0; $i < $numlayers; $i ++) { + $layern = $nmapa->getlayer ( $i ); + $layern->set ( "status", MS_DEFAULT ); + error_reporting ( E_ALL ); + if ($layern->classitem != "" && $layern->connectiontype == 7 && $layern->numclasses > 0 && $layern->getmetadata ( "wms_sld_body" ) == "") { $tipotemp = $layern->type; - $tiporep = $layern->getmetadata("tipooriginal"); - $layern->set("type",MS_LAYER_POLYGON); - if ($tiporep == "linear"){ - $layern->set("type",MS_LAYER_LINE); + $tiporep = $layern->getmetadata ( "tipooriginal" ); + $layern->set ( "type", MS_LAYER_POLYGON ); + if ($tiporep == "linear") { + $layern->set ( "type", MS_LAYER_LINE ); } - if ($tiporep == "pontual"){ - $layern->set("type",MS_LAYER_POINT); + if ($tiporep == "pontual") { + $layern->set ( "type", MS_LAYER_POINT ); } - $sld = $layern->generateSLD(); - if($sld != ""){ - $layern->setmetadata("wms_sld_body",str_replace('"',"'",$sld)); + $sld = $layern->generateSLD (); + if ($sld != "") { + $layern->setmetadata ( "wms_sld_body", str_replace ( '"', "'", $sld ) ); } - $layern->set("type",$tipotemp); + $layern->set ( "type", $tipotemp ); } - $layerAdicionado = ms_newLayerObj($mapa, $layern); + $layerAdicionado = ms_newLayerObj ( $mapa, $layern ); $pegarext = $layern->name; } - zoomTema($pegarext,$mapa); - include_once($_SESSION["locaplic"]."/classesphp/classe_atributos.php"); + zoomTema ( $pegarext, $mapa ); + include_once ($_SESSION ["locaplic"] . "/classesphp/classe_atributos.php"); - $t = new Atributos($mapa,$layern->name); + $t = new Atributos ( $mapa, $layern->name ); - $r = $t->itensTexto(); - $colunas = explode(";",$r["itens"]); + $r = $t->itensTexto (); + $colunas = explode ( ";", $r ["itens"] ); - $ncolunas = count($colunas); - $registros = $r["valores"]; - $nregistros = count($registros); + $ncolunas = count ( $colunas ); + $registros = $r ["valores"]; + $nregistros = count ( $registros ); $error = ""; - $error = ms_GetErrorObj(); + $error = ms_GetErrorObj (); $tab = ""; - while($error && $error->code != MS_NOERR){ + while ( $error && $error->code != MS_NOERR ) { $tab .= "
Error in %s: %s
"; $tab .= $error->routine; $tab .= $error->message; - $error = $error->next(); + $error = $error->next (); } $tab .= "Registros em ISO-8859-1 são convertidos para UTF8
"; - $tab .= "Registros: ".$nregistros;"
"; + $tab .= "Registros: " . $nregistros; + "
"; $tab .= "
Tempo leitura (s): "; - $tab .= microtime(true) - $tempo; + $tab .= microtime ( true ) - $tempo; $tab .= ""; $tab .= ""; $tab .= ""; - foreach($colunas as $co){ - $tab .= ""; + foreach ( $colunas as $co ) { + $tab .= ""; } $tab .= ""; - foreach($registros as $reg){ + foreach ( $registros as $reg ) { $tab .= ""; - $cc = explode(";",$reg); - foreach($cc as $c){ + $cc = explode ( ";", $reg ); + foreach ( $cc as $c ) { if (mb_detect_encoding ( $c, 'UTF-8, ISO-8859-1' ) == "ISO-8859-1") { $c = utf8_encode ( $c ); } - $tab .= ""; + $tab .= ""; } $tab .= ""; } $tab .= "
".$co."" . $co . "
".$c."" . $c . "
"; $tab .= "
Tempo total (montagem da tabela) (s): "; - $tab .= microtime(true) - $tempo; + $tab .= microtime ( true ) - $tempo; $tab .= ""; return $tab; } -function testaMapaImg($tema){ - global $versao,$base,$tempo; - $dir_tmp = $_SESSION["dir_tmp"]; - $postgis_mapa = $_SESSION["postgis_mapa"]; - $locaplic = $_SESSION["locaplic"]; - $base = mapaBase($_SESSION["locaplic"],$versao,$base); - $mapa = ms_newMapObj($base); - error_reporting (E_ALL); - ms_ResetErrorList(); +function testaMapaImg($tema) { + global $versao, $base, $tempo; + $dir_tmp = $_SESSION ["dir_tmp"]; + $postgis_mapa = $_SESSION ["postgis_mapa"]; + $locaplic = $_SESSION ["locaplic"]; + $base = mapaBase ( $_SESSION ["locaplic"], $versao, $base ); + $mapa = ms_newMapObj ( $base ); + error_reporting ( E_ALL ); + ms_ResetErrorList (); try { ms_newMapObj ( $tema ); } catch ( Exception $e ) { - return array("imgMapa"=>"","imgLegenda"=>"","tempo"=> (microtime(true) - $tempo),"erro"=>"Objeto map nao pode ser criado. Erro fatal."); - } - if(@ms_newMapObj($tema)){ - $nmapa = ms_newMapObj($tema); + return array ( + "imgMapa" => "", + "imgLegenda" => "", + "tempo" => (microtime ( true ) - $tempo), + "erro" => "Objeto map nao pode ser criado. Erro fatal." + ); } - else{ + if (@ms_newMapObj ( $tema )) { + $nmapa = ms_newMapObj ( $tema ); + } else { $erro = ""; - $error = ms_GetErrorObj(); - while($error && $error->code != MS_NOERR){ + $error = ms_GetErrorObj (); + while ( $error && $error->code != MS_NOERR ) { $erro .= "
Error in %s: %s
\n"; - $erro .= "
".$error->routine; - $erro .= "
".$error->message; - $error = $error->next(); + $erro .= "
" . $error->routine; + $erro .= "
" . $error->message; + $error = $error->next (); } - return array("imgMapa"=>"","imgLegenda"=>"","tempo"=> (microtime(true) - $tempo),"erro"=>$erro); + return array ( + "imgMapa" => "", + "imgLegenda" => "", + "tempo" => (microtime ( true ) - $tempo), + "erro" => $erro + ); } - \admin\php\funcoesAdmin\substituiConObj($mapa,$postgis_mapa); - \admin\php\funcoesAdmin\substituiConObj($nmapa,$postgis_mapa); + \admin\php\funcoesAdmin\substituiConObj ( $mapa, $postgis_mapa ); + \admin\php\funcoesAdmin\substituiConObj ( $nmapa, $postgis_mapa ); $numlayers = $nmapa->numlayers; $dados = ""; - $simbolos = array(); - for ($i=0;$i < $numlayers;$i++){ - $layern = $nmapa->getlayer($i); - $layern->set("status",MS_DEFAULT); - autoClasses($layern,$nmapa); - error_reporting (E_ALL); - if($layern->classitem != "" && $layern->connectiontype == 7 && $layern->numclasses > 0 && $layern->getmetadata("wms_sld_body") == ""){ + $simbolos = array (); + for($i = 0; $i < $numlayers; $i ++) { + $layern = $nmapa->getlayer ( $i ); + $layern->set ( "status", MS_DEFAULT ); + autoClasses ( $layern, $nmapa ); + error_reporting ( E_ALL ); + if ($layern->classitem != "" && $layern->connectiontype == 7 && $layern->numclasses > 0 && $layern->getmetadata ( "wms_sld_body" ) == "") { $tipotemp = $layern->type; - $tiporep = $layern->getmetadata("tipooriginal"); - $layern->set("type",MS_LAYER_POLYGON); - if ($tiporep == "linear"){ - $layern->set("type",MS_LAYER_LINE); + $tiporep = $layern->getmetadata ( "tipooriginal" ); + $layern->set ( "type", MS_LAYER_POLYGON ); + if ($tiporep == "linear") { + $layern->set ( "type", MS_LAYER_LINE ); } - if ($tiporep == "pontual"){ - $layern->set("type",MS_LAYER_POINT); + if ($tiporep == "pontual") { + $layern->set ( "type", MS_LAYER_POINT ); } - $sld = $layern->generateSLD(); - if($sld != ""){ - $layern->setmetadata("wms_sld_body",str_replace('"',"'",$sld)); + $sld = $layern->generateSLD (); + if ($sld != "") { + $layern->setmetadata ( "wms_sld_body", str_replace ( '"', "'", $sld ) ); } - $layern->set("type",$tipotemp); + $layern->set ( "type", $tipotemp ); } - //pega simbolos locais e aplica no novo mapa - cloneInlineSymbol($layern,$nmapa,$mapa); + // pega simbolos locais e aplica no novo mapa + cloneInlineSymbol ( $layern, $nmapa, $mapa ); - $layerAdicionado = ms_newLayerObj($mapa, $layern); + $layerAdicionado = ms_newLayerObj ( $mapa, $layern ); - corrigeLayerGrid($layern,$layerAdicionado); + corrigeLayerGrid ( $layern, $layerAdicionado ); $pegarext = $layern->name; } - zoomTema($pegarext,$mapa); - $mapa->setsize(500,500); + zoomTema ( $pegarext, $mapa ); + $mapa->setsize ( 500, 500 ); $sca = $mapa->scalebar; - $sca->set("status",MS_OFF); - $objImagem = @$mapa->draw(); - //corrige o titulo da legenda + $sca->set ( "status", MS_OFF ); + $objImagem = @$mapa->draw (); + // corrige o titulo da legenda $numlayers = $mapa->numlayers; - for ($j=0;$j < $numlayers;$j++){ - $l = $mapa->getlayer($j); - if($l->type != 3 && $l->type != 4){ + for($j = 0; $j < $numlayers; $j ++) { + $l = $mapa->getlayer ( $j ); + if ($l->type != 3 && $l->type != 4) { $nclass = $l->numclasses; - for($i=0;$i<$nclass;$i++){ - $classe = $l->getclass($i); - if($classe->title === ""){ + for($i = 0; $i < $nclass; $i ++) { + $classe = $l->getclass ( $i ); + if ($classe->title === "") { $classe->title = $classe->name; } } } } - $objImagemLegenda = @$mapa->drawLegend(); - if (!$objImagem){ + $objImagemLegenda = @$mapa->drawLegend (); + if (! $objImagem) { $error = ""; $erro = ""; - $error = ms_GetErrorObj(); - while($error && $error->code != MS_NOERR){ - $erro .= "
Error in %s: %s
"; + $error = ms_GetErrorObj (); + while ( $error && $error->code != MS_NOERR ) { + $erro .= "
Error in %s: %s
"; $erro .= "
" . $error->routine; $erro .= "
" . $error->message; - $error = $error->next(); + $error = $error->next (); } - return array("imgMapa"=>"","imgLegenda"=>"","tempo"=> (microtime(true) - $tempo),"erro"=>$erro); + return array ( + "imgMapa" => "", + "imgLegenda" => "", + "tempo" => (microtime ( true ) - $tempo), + "erro" => $erro + ); } - if($objImagem->imagepath == ""){ - return array("imgMapa"=>"","imgLegenda"=>"","tempo"=> (microtime(true) - $tempo),"erro"=>"Erro IMAGEPATH vazio"); + if ($objImagem->imagepath == "") { + return array ( + "imgMapa" => "", + "imgLegenda" => "", + "tempo" => (microtime ( true ) - $tempo), + "erro" => "Erro IMAGEPATH vazio" + ); } - $nomec = ($objImagem->imagepath).\admin\php\funcoesAdmin\nomeRandomico()."teste.png"; - $objImagem->saveImage($nomec); + $nomec = ($objImagem->imagepath) . \admin\php\funcoesAdmin\nomeRandomico () . "teste.png"; + $objImagem->saveImage ( $nomec ); - $nomel = ($objImagemLegenda->imagepath).\admin\php\funcoesAdmin\nomeRandomico()."testel.png"; - $objImagemLegenda->saveImage($nomel); + $nomel = ($objImagemLegenda->imagepath) . \admin\php\funcoesAdmin\nomeRandomico () . "testel.png"; + $objImagemLegenda->saveImage ( $nomel ); $erro = ""; $error = ""; - $error = ms_GetErrorObj(); - while($error && $error->code != MS_NOERR){ + $error = ms_GetErrorObj (); + while ( $error && $error->code != MS_NOERR ) { $erro .= "
Error in %s: %s
"; $erro .= "
" . $error->routine; $erro .= "
" . $error->message; - $error = $error->next(); + $error = $error->next (); } - return array("imgMapa"=>($objImagem->imageurl).basename($nomec),"imgLegenda"=>($objImagemLegenda->imageurl).basename($nomel),"tempo"=> (microtime(true) - $tempo),"erro"=>$erro); + return array ( + "imgMapa" => ($objImagem->imageurl) . basename ( $nomec ), + "imgLegenda" => ($objImagemLegenda->imageurl) . basename ( $nomel ), + "tempo" => (microtime ( true ) - $tempo), + "erro" => $erro + ); } -function zoomTema($nomelayer,&$mapa){ - $layer = $mapa->getlayerbyname($nomelayer); - if($layer->data == "" && $layer->connection == "") - {return;} - $prjMapa = $mapa->getProjection(); - $prjTema = $layer->getProjection(); +function zoomTema($nomelayer, &$mapa) { + $layer = $mapa->getlayerbyname ( $nomelayer ); + if ($layer->data == "" && $layer->connection == "") { + return; + } + $prjMapa = $mapa->getProjection (); + $prjTema = $layer->getProjection (); $extatual = $mapa->extent; - $ret = $layer->getmetadata("extensao"); - if($layer->type > 2 && $ret == "") - {return;} + $ret = $layer->getmetadata ( "extensao" ); + if ($layer->type > 2 && $ret == "") { + return; + } $ct = $layer->connectiontype; - if(($ret == "") && ($ct != 1)) - {return;} - if ($ret == ""){ - $ret = $layer->getextent(); - //reprojeta o retangulo - if (($prjTema != "") && ($prjMapa != $prjTema)){ - $projInObj = ms_newprojectionobj($prjTema); - $projOutObj = ms_newprojectionobj($prjMapa); - $ret->project($projInObj, $projOutObj); + if (($ret == "") && ($ct != 1)) { + return; + } + if ($ret == "") { + $ret = $layer->getextent (); + // reprojeta o retangulo + if (($prjTema != "") && ($prjMapa != $prjTema)) { + $projInObj = ms_newprojectionobj ( $prjTema ); + $projOutObj = ms_newprojectionobj ( $prjMapa ); + $ret->project ( $projInObj, $projOutObj ); + } + $extatual->setextent ( $ret->minx, $ret->miny, $ret->maxx, $ret->maxy ); + } else { + $ret = explode ( " ", $ret ); + $extatual->setextent ( $ret [0], $ret [1], $ret [2], $ret [3] ); + } +} +function autoClasses(&$nlayer, $mapa, $locaplic = null) { + $postgis_mapa = $_SESSION ["postgis_mapa"]; + ; + $substituicon = "nao"; + if ($nlayer->connectiontype == MS_POSTGIS) { + if ($nlayer->connection == " ") { + $nlayer->set ( "connection", $postgis_mapa ); + $substituicon = "sim"; + } + } + // + // gera classes automaticamente (temas vetoriais) + if ($nlayer->getmetadata ( "classesitem" ) != "") { + $itemnome = $nlayer->getmetadata ( "classesnome" ); + $itemid = $nlayer->getmetadata ( "classesitem" ); + $itemcor = $nlayer->getmetadata ( "classescor" ); + $itemsimbolo = $nlayer->getmetadata ( "classesimbolo" ); + $itemtamanho = $nlayer->getmetadata ( "classestamanho" ); + $classeoriginal = $nlayer->getclass ( 0 ); + // + // pega a extensao geografica que devera ser utilizada + // + $prjMapa = $mapa->getProjection (); + $prjTema = $nlayer->getProjection (); + $ret = $nlayer->getmetadata ( "extensao" ); + if ($ret == "") { + $ret = $nlayer->getextent (); + // reprojeta o retangulo + if (($prjTema != "") && ($prjMapa != $prjTema)) { + $projInObj = ms_newprojectionobj ( $prjTema ); + $projOutObj = ms_newprojectionobj ( $prjMapa ); + $ret->project ( $projInObj, $projOutObj ); + } + } else { + $temp = explode ( " ", $ret ); + $ret = ms_newRectObj (); + $ret->setextent ( $temp [0], $temp [1], $temp [2], $temp [3] ); + } + // + $sopen = $nlayer->open (); + if ($sopen == MS_FAILURE) { + return "erro"; + } + + $status = $nlayer->whichShapes ( $ret ); + $parametrosClasses = array (); + if ($status == 0) { + while ( $shape = $nlayer->nextShape () ) { + $id = trim ( $shape->values [$itemid] ); + if (! $parametrosClasses [$id]) { + $nome = ""; + if ($itemnome != "") + $nome = trim ( $shape->values [$itemnome] ); + $cor = ""; + if ($itemcor != "") + $cor = explode ( ",", trim ( $shape->values [$itemcor] ) ); + if (count ( $cor ) != 3) + $cor = explode ( " ", trim ( $shape->values [$itemcor] ) ); + $tamanho = ""; + if ($itemtamanho != "") + $tamanho = trim ( $shape->values [$itemtamanho] ); + $simbolo = ""; + if ($itemsimbolo != "") + $simbolo = trim ( $shape->values [$itemsimbolo] ); + $parametrosClasses [$id] = array ( + "nome" => $nome, + "cor" => $cor, + "tamanho" => $tamanho, + "simbolo" => $simbolo + ); + } + } + $fechou = $nlayer->close (); + // echo "
";var_dump($parametrosClasses);
+			if (count ( $parametrosClasses ) > 0) {
+				$ids = array_keys ( $parametrosClasses );
+				for($i = 0; $i < count ( $parametrosClasses ); ++ $i) {
+					$p = $parametrosClasses [$ids [$i]];
+					// echo "
";var_dump($p);
+					$nclasse = ms_newClassObj ( $nlayer, $classeoriginal );
+					if ($p ["nome"] != "")
+						$nclasse->set ( "name", $p ["nome"] );
+					$estilo = $nclasse->getstyle ( 0 );
+					if ($p ["cor"] != "") {
+						$cor = $p ["cor"];
+						$ncor = $estilo->color;
+						if ($ncor == "")
+							$ncor = $estilo->outlinecolor;
+						$ncor->setrgb ( $cor [0], $cor [1], $cor [2] );
+					}
+					if ($p ["tamanho"] != "")
+						$estilo->set ( "size", $p ["tamanho"] );
+					if ($p ["simbolo"] != "")
+						$estilo->set ( "symbolname", $p ["simbolo"] );
+					$strE = "('[" . $itemid . "]'eq'" . $ids [$i] . "')";
+					$nclasse->setexpression ( $strE );
+				}
+				$classeoriginal->set ( "status", MS_DELETE );
+			}
+		}
+		if ($substituicon == "sim") {
+			$nlayer->set ( "connection", " " );
 		}
-		$extatual->setextent($ret->minx,$ret->miny,$ret->maxx,$ret->maxy);
 	}
-	else{
-		$ret = explode(" ",$ret);
-		$extatual->setextent($ret[0],$ret[1],$ret[2],$ret[3]);
+	$pf = $nlayer->getmetadata ( "palletefile" );
+	if ($pf != "") {
+		if (! file_exists ( $pf )) {
+			return;
+		}
+		$ps = $nlayer->getmetadata ( "palletesteps" );
+		if ($ps == "")
+			$ps = 8;
+			//
+			// pega os valores do arquivo
+			//
+		$rules = array ();
+		$abre = fopen ( $pf, "r" );
+		$paletteRules = array ();
+		while ( ! feof ( $abre ) ) {
+			$line = trim ( fgets ( $abre ) );
+			$pos = strpos ( $line, "#" );
+			if ($pos === false || $pos > 0) {
+				$paletteEntry = explode ( " ", $line );
+				$rules [] = array (
+						"v0" => $paletteEntry [0],
+						"v1" => $paletteEntry [1],
+						"r0" => $paletteEntry [2],
+						"g0" => $paletteEntry [3],
+						"b0" => $paletteEntry [4],
+						"r1" => $paletteEntry [5],
+						"g1" => $paletteEntry [6],
+						"b1" => $paletteEntry [7]
+				);
+			}
+		}
+		fclose ( $abre );
+		foreach ( $rules as $rule ) {
+			$delta = ceil ( ($rule ["v1"] - $rule ["v0"]) / $ps );
+			$legenda = true;
+			for($value = $rule ["v0"]; $value < $rule ["v1"]; $value += $delta) {
+				$class = ms_newClassObj ( $nlayer );
+				$style = ms_newStyleObj ( $class );
+				if ($legenda) {
+					$class->set ( name, round ( $value, 0 ) );
+					$legenda = true;
+				}
+				$expression = "([pixel] > " . round ( $value, 0 ) . " AND [pixel] <= " . round ( $value + $delta, 0 ) . ")";
+				$class->setExpression ( $expression );
+				$rgb = getRGBpallete ( $rule, $value );
+				$style->color->setRGB ( $rgb [0], $rgb [1], $rgb [2] );
+			}
+		}
 	}
+	return;
 }
+function getRGBpallete($rule, $value) {
+	$escala = ($value - $rule ["v0"]) / ($rule ["v1"] - $rule ["v0"]);
+	$r = $rule ["r0"] + round ( ($rule ["r1"] - $rule ["r0"]) * $escala, 0 );
+	$g = $rule ["g0"] + round ( ($rule ["g1"] - $rule ["g0"]) * $escala, 0 );
+	$b = $rule ["b0"] + round ( ($rule ["b1"] - $rule ["b0"]) * $escala, 0 );
+	return array (
+			$r,
+			$g,
+			$b
+	);
+}
+function cloneInlineSymbol($layern, $nmapa, $mapa) {
+	$numclasses = $layern->numclasses;
+	for($ci = 0; $ci < $numclasses; $ci ++) {
+		$classe = $layern->getclass ( $ci );
+		$numestilos = $classe->numstyles;
+		for($ei = 0; $ei < $numestilos; $ei ++) {
+			$estilo = $classe->getstyle ( $ei );
+			if ($estilo->symbolname != "") {
+				$nomesimbolo = $estilo->symbolname;
+				$simbolo = $nmapa->getSymbolObjectById ( $nmapa->getSymbolByName ( $nomesimbolo ) );
+				if ($simbolo->inmapfile == MS_TRUE || file_exists ( $nomesimbolo )) {
+					$simbolon = new symbolObj ( $mapa, $nomesimbolo );
+					$simbolon->set ( "inmapfile", MS_TRUE );
+
+					$simbolon->setImagePath ( $simbolo->imagepath );
+					$simbolon->setPoints ( $simbolo->getPointsArray () );
+					// $simbolon->setPattern($simbolo->getPatternArray());
+					$simbolon->set ( "type", $simbolo->type );
+					// $simbolon->set("antialias",$simbolo->antialias);
+					$simbolon->set ( "character", $simbolo->character );
+					$simbolon->set ( "filled", $simbolo->filled );
 
+					// $simbolon->set("font",$simbolo->font);
+					// $simbolon->set("position",$simbolo->position);
+					$simbolon->set ( "sizex", $simbolo->sizex );
+					$simbolon->set ( "sizey", $simbolo->sizey );
+					$simbolon->set ( "transparent", $simbolo->transparent );
+					$simbolon->set ( "transparentcolor", $simbolo->transparentcolor );
+					// $simbolon->set("anchorpoint",$simbolo->anchorpoint);
+				}
+			}
+		}
+	}
+}
+function corrigeLayerGrid($layerOrigem,$layerDestino){
+	if($layerOrigem->connectiontype == MS_GRATICULE){
+		ms_newgridobj($layerDestino);
+		$layerDestino->grid->set("labelformat", $layerOrigem->grid->labelformat);
+		$layerDestino->grid->set("mininterval", $layerOrigem->grid->mininterval);
+		$layerDestino->grid->set("maxinterval", $layerOrigem->grid->maxinterval);
+		$layerDestino->grid->set("minsubdivide", $layerOrigem->grid->minsubdivide);
+		$layerDestino->grid->set("maxsubdivide", $layerOrigem->grid->maxsubdivide);
+		$layerDestino->grid->set("minarcs", $layerOrigem->grid->minarcs);
+		$layerDestino->grid->set("maxarcs", $layerOrigem->grid->maxarcs);
+		//$layerDestino->updatefromstring("LAYER GRID LABELFORMAT '" . $layerOrigem->grid->labelformat . "' END END");
+	}
+}
 ?>
diff --git a/admin1/php/checaLogin.php b/admin1/php/checaLogin.php
index 49d9ef4..f221267 100755
--- a/admin1/php/checaLogin.php
+++ b/admin1/php/checaLogin.php
@@ -53,7 +53,10 @@ function checaLogin(){
 		session_id ( $_COOKIE ["i3geocodigologin"] );
 		session_start ();
 		if(empty($_SESSION["locaplic"])){
-			header ( "HTTP/1.1 403 Inicie o sistema pela pagina principal" );
+			if(defined("ONDEI3GEO")){
+				header("Location:" . ONDEI3GEO . "/admin1/index.php");
+			}
+			//header ( "HTTP/1.1 403 Inicie o sistema pela pagina principal" );
 			exit;
 		}
 		//verifica tambem se o usuario entrou pela pagina de administracao principal
@@ -71,6 +74,7 @@ function checaLogin(){
 		}
 	} else {
 		header ( "HTTP/1.1 403 Usuario nao logado" );
+		//header("Location:");
 		exit ();
 	}
 	// verifica se o login pode ser realizado
diff --git a/admin1/php/funcoesAdmin.php b/admin1/php/funcoesAdmin.php
index e5e27bb..8b67a7b 100755
--- a/admin1/php/funcoesAdmin.php
+++ b/admin1/php/funcoesAdmin.php
@@ -506,7 +506,7 @@ function substituiCon($map_file,$postgis_mapa)
 	}
 	return true;
 }
-function substituiConObj($mapa,$postgis_mapa){
+function substituiConObj($objMap,$postgis_mapa){
 	error_reporting (E_ALL);
 	if (!empty($postgis_mapa)){
 		$numlayers = $objMap->numlayers;
diff --git a/ferramentas/atalhosedicao/index.js b/ferramentas/atalhosedicao/index.js
index 7703cef..703d300 100755
--- a/ferramentas/atalhosedicao/index.js
+++ b/ferramentas/atalhosedicao/index.js
@@ -132,6 +132,7 @@ i3GEOF.atalhosedicao =
 			}
 		});
 		$i("i3GEOFatalhosedicaoTme-button").style.width = "200px";
+
 		new YAHOO.widget.Button("i3GEOFatalhosedicaoStorymap", {
 			onclick : {
 				fn : function() {
@@ -142,6 +143,17 @@ i3GEOF.atalhosedicao =
 		});
 		$i("i3GEOFatalhosedicaoStorymap-button").style.width = "200px";
 
+
+		new YAHOO.widget.Button("i3GEOFatalhosedicaoAnimagif", {
+			onclick : {
+				fn : function() {
+					i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;
+					i3GEO.tema.dialogo.animagif(i3GEOF.atalhosedicao.tema);
+				}
+			}
+		});
+		$i("i3GEOFatalhosedicaoAnimagif-button").style.width = "200px";
+
 		new YAHOO.widget.Button("i3GEOFatalhosedicaoTemaComGrafico", {
 			onclick : {
 				fn : function() {
diff --git a/ferramentas/atalhosedicao/template_mst.html b/ferramentas/atalhosedicao/template_mst.html
index 9ebf34b..da108a8 100755
--- a/ferramentas/atalhosedicao/template_mst.html
+++ b/ferramentas/atalhosedicao/template_mst.html
@@ -80,8 +80,10 @@
 	

 		
 	

-	

-		

+	

 		
 	

+	

+		
+	

 
\ No newline at end of file
diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map
index 8cb9e3f..6cca83a 100755
--- a/temas/_lbiomashp.map
+++ b/temas/_lbiomashp.map
@@ -6,38 +6,38 @@ MAP
     DATA "/var/www/i3geo/aplicmap/dados/biomas.shp"
     METADATA
       "METAESTAT_ID_MEDIDA_VARIAVEL"	""
-      "cache"	"SIM"
       "TIP"	"CD_LEGENDA"
+      "cache"	"SIM"
       "CLASSE"	"sim"
-      "permitekmz"	"SIM"
       "temporizador"	""
-      "ITENSDESC"	"Teste de acentuação"
+      "permitekmz"	"SIM"
       "iconetema"	""
-      "editavel"	""
-      "ESCALA"	"250000"
+      "ITENSDESC"	"Teste de acentuação"
       "TILES"	"SIM"
+      "ESCALA"	"250000"
+      "editavel"	""
       "METAESTAT_CODIGO_TIPO_REGIAO"	""
       "extensao"	"-73.990940816816 -33.74827031115 -34.822855820777 5.272224303909"
       "permitedownload"	"SIM"
       "permitecomentario"	"NAO"
-      "metaestat"	""
       "escondido"	"NAO"
-      "esquematabelaeditavel"	""
+      "metaestat"	""
       "download"	"SIM"
+      "esquematabelaeditavel"	""
       "itembuscarapida"	"CD_LEGENDA"
-      "arquivokmz"	""
-      "arquivodownload"	""
       "ITENS"	"CD_LEGENDA"
-      "transitioneffect"	"NAO"
-      "permiteogc"	"SIM"
+      "arquivodownload"	""
+      "arquivokmz"	""
       "permitekml"	"SIM"
-      "TEMA"	"Biomas shapefile (acentuação)"
+      "permiteogc"	"SIM"
+      "transitioneffect"	"NAO"
       "convcaracter"	"SIM"
-      "colunageometria"	""
-      "colunaidunico"	""
+      "TEMA"	"Biomas shapefile (acentuação)"
       "cortepixels"	""
-      "aplicaextensao"	"NAO"
+      "colunaidunico"	""
+      "colunageometria"	""
       "identifica"	"sim"
+      "aplicaextensao"	"NAO"
       "tabelaeditavel"	""
     END # METADATA
     NAME "_lbiomashp"
@@ -46,6 +46,7 @@ MAP
     PROCESSING "POLYLINE_NO_CLIP=True"
     STATUS DEFAULT
     TEMPLATE "none.htm"
+    TILEITEM "location"
     OPACITY 90
     TYPE POLYGON
     UNITS METERS
--
libgit2 0.21.2