From 2c1d3a0a8672c21acb6be8291f3ab060753e1240 Mon Sep 17 00:00:00 2001
From: edmarmoretti <edmar.moretti@gmail.com>
Date: Sat, 19 Nov 2016 11:32:03 -0200
Subject: [PATCH] Correção em ferramentas de análise cuja passagem de parâmetros estava com erros

---
 admin/admin.db                                                                          | Bin 340992 -> 0 bytes
 admin1/cadastros/identifica/templates/templateFormLista.php                             |   2 +-
 admin1/cadastros/perfis/templates/templateFormLista.php                                 |   2 +-
 admin1/cadastros/servicos/templates/templateFormLista.php                               |   2 +-
 admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php                       |   2 +-
 admin1/cadastros/sistemas/templates/templateFormLista.php                               |   2 +-
 admin1/cadastros/tags/templates/templateFormLista.php                                   |   2 +-
 admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php                    |   2 +-
 admin1/catalogo/atlas/pranchas/templates/templateFormLista.php                          |   2 +-
 admin1/catalogo/atlas/templates/templateFormLista.php                                   |   2 +-
 admin1/catalogo/mapas/templates/templateFormLista.php                                   |   2 +-
 admin1/catalogo/mapfile/exec.php                                                        | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 admin1/catalogo/mapfile/index.js                                                        | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
 admin1/catalogo/mapfile/index.php                                                       | 160 ++++++----------------------------------------------------------------------------------------------------------------------------------------------------------
 admin1/catalogo/mapfile/templates/templateClonarTema.php                                |  25 +++++++++++++++++++++++++
 admin1/catalogo/mapfile/templates/templateFiltro.php                                    |   3 +++
 admin1/catalogo/mapfile/templates/templateLista.php                                     |  36 ++++++++++++++++++++++++++++++++++++
 admin1/catalogo/mapfile/templates/templateMaisOpcoes.php                                |  26 ++++++++++++++++++++++++++
 admin1/catalogo/mapfile/templates/templateManterTema.php                                |  72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php              |   2 +-
 admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php |   2 +-
 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php                 |   2 +-
 admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php                    |   2 +-
 admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php                   |   2 +-
 admin1/catalogo/menus/grupos/templates/templateFormNos.php                              |   2 +-
 admin1/catalogo/menus/grupos/templates/templateFormRaiz.php                             |   2 +-
 admin1/catalogo/menus/templates/templateFormLista.php                                   |   2 +-
 admin1/dicionario/editormapfile.js                                                      |  12 +++++++++++-
 admin1/usuarios/cadastro/index.php                                                      |   2 +-
 admin1/usuarios/grupos/index.php                                                        |   2 +-
 admin1/usuarios/operacoes/index.php                                                     |   2 +-
 classesphp/classe_analise.php                                                           |   3 +++
 ferramentas/gradepol/exec.php                                                           |   7 ++++---
 ferramentas/selecao/exec.php                                                            |   2 +-
 pacotes/phpxbase/api_conversion.php                                                     |   3 ++-
 temas/_estadosbr.map                                                                    |  50 +++++++++++++++++++++++++++++---------------------
 temas/aaaaaa.map                                                                        |  27 +++++++++++++++++++++++++++
 37 files changed, 543 insertions(+), 232 deletions(-)
 create mode 100644 admin1/catalogo/mapfile/templates/templateClonarTema.php
 create mode 100644 admin1/catalogo/mapfile/templates/templateFiltro.php
 create mode 100644 admin1/catalogo/mapfile/templates/templateLista.php
 create mode 100644 admin1/catalogo/mapfile/templates/templateMaisOpcoes.php
 create mode 100644 admin1/catalogo/mapfile/templates/templateManterTema.php
 create mode 100644 temas/aaaaaa.map

diff --git a/admin/admin.db b/admin/admin.db
index 6c42589..83e14e4 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin1/cadastros/identifica/templates/templateFormLista.php b/admin1/cadastros/identifica/templates/templateFormLista.php
index c387e89..5c25de2 100755
--- a/admin1/cadastros/identifica/templates/templateFormLista.php
+++ b/admin1/cadastros/identifica/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-		<form id="form-edicao-{{id_i}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_i}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+		<form id="form-edicao-{{id_i}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_i}}');return false;"   class="form-horizontal" role="form" method="post"   >
 			<div class="row">
 				<div class="col-md-12">
 					<h4>{{{nome_i}}}</h4>
diff --git a/admin1/cadastros/perfis/templates/templateFormLista.php b/admin1/cadastros/perfis/templates/templateFormLista.php
index 8cd5ac2..557ad8c 100755
--- a/admin1/cadastros/perfis/templates/templateFormLista.php
+++ b/admin1/cadastros/perfis/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_perfil}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_perfil}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
+<form id="form-edicao-{{id_perfil}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_perfil}}');return false;"   class="form-horizontal" role="form"
 	method="post"  >
 	<div class="row">
 		<div class="col-md-12">
diff --git a/admin1/cadastros/servicos/templates/templateFormLista.php b/admin1/cadastros/servicos/templates/templateFormLista.php
index 5b4ea8a..792dfd1 100755
--- a/admin1/cadastros/servicos/templates/templateFormLista.php
+++ b/admin1/cadastros/servicos/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_ws}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_ws}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_ws}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_ws}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<h4>{{{nome_ws}}}</h4>
diff --git a/admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php b/admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php
index 4bacc01..70864cf 100755
--- a/admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php
+++ b/admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_funcao}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_funcao}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_funcao}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_funcao}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/cadastros/sistemas/templates/templateFormLista.php b/admin1/cadastros/sistemas/templates/templateFormLista.php
index 5061b96..f03a16d 100755
--- a/admin1/cadastros/sistemas/templates/templateFormLista.php
+++ b/admin1/cadastros/sistemas/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_sistema}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_sistema}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_sistema}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_sistema}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/cadastros/tags/templates/templateFormLista.php b/admin1/cadastros/tags/templates/templateFormLista.php
index 3b4debe..1cdaa09 100755
--- a/admin1/cadastros/tags/templates/templateFormLista.php
+++ b/admin1/cadastros/tags/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_tag}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_tag}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
+<form id="form-edicao-{{id_tag}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_tag}}');return false;"   class="form-horizontal" role="form"
 	method="post"  >
 	<div class="row">
 		<div class="col-md-12">
diff --git a/admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php b/admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php
index 94a8bdb..0ebc15c 100755
--- a/admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php
+++ b/admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_tema}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_tema}}','{{{codigo_tema}}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_tema}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_tema}}','{{{codigo_tema}}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/catalogo/atlas/pranchas/templates/templateFormLista.php b/admin1/catalogo/atlas/pranchas/templates/templateFormLista.php
index 6fd86d5..4889d8e 100755
--- a/admin1/catalogo/atlas/pranchas/templates/templateFormLista.php
+++ b/admin1/catalogo/atlas/pranchas/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_prancha}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_prancha}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_prancha}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_prancha}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/catalogo/atlas/templates/templateFormLista.php b/admin1/catalogo/atlas/templates/templateFormLista.php
index b007257..824fe72 100755
--- a/admin1/catalogo/atlas/templates/templateFormLista.php
+++ b/admin1/catalogo/atlas/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_atlas}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_atlas}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_atlas}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_atlas}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/catalogo/mapas/templates/templateFormLista.php b/admin1/catalogo/mapas/templates/templateFormLista.php
index 2627d6d..df139b6 100755
--- a/admin1/catalogo/mapas/templates/templateFormLista.php
+++ b/admin1/catalogo/mapas/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_mapa}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_mapa}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_mapa}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_mapa}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/catalogo/mapfile/exec.php b/admin1/catalogo/mapfile/exec.php
index fca3449..e2938ad 100755
--- a/admin1/catalogo/mapfile/exec.php
+++ b/admin1/catalogo/mapfile/exec.php
@@ -30,10 +30,12 @@ error_reporting ( 0 );
 include_once (dirname ( __FILE__ ) . "/../../../admin/php/login.php");
 $funcoesEdicao = array (
 		"LISTA",
+		"LISTAUNICO",
 		"ADICIONAR",
 		"EXCLUIR",
 		"LIMPACACHE",
-		"CLONARMAPFILE"
+		"CLONARMAPFILE",
+		"ALTERAR"
 );
 if (in_array ( strtoupper ( $funcao ), $funcoesEdicao )) {
 	if (verificaOperacaoSessao ( "admin/html/editormapfile" ) === false) {
@@ -43,13 +45,11 @@ if (in_array ( strtoupper ( $funcao ), $funcoesEdicao )) {
 }
 include (dirname ( __FILE__ ) . "/../../../admin/php/conexao.php");
 
-// $id_mapa = $_POST["id_mapa"];
-// testaSafeNumerico([$id_mapa]);
+$codigo = $_POST ["codigo"];
 
 $funcao = strtoupper ( $funcao );
 switch ($funcao) {
 	case "ADICIONAR" :
-		$codigo = $_POST ["codigo"];
 		$codigo = str_replace ( " ", "", removeAcentos ( $codigo ) );
 		$codigo = str_replace ( ".", "", $codigo );
 		$codigo = strip_tags ( $codigo );
@@ -59,7 +59,10 @@ switch ($funcao) {
 			header ( "HTTP/1.1 400 arquivo ja existe" );
 			exit ();
 		}
-		$novo = adicionar ( $locaplic, $_POST["titulolegenda"], $_POST ["link_tema"], $codigo, $_POST ["acessopublico"], $_POST ["metaestat"], $_POST ["titulo"], $_POST ["desc_tema"], $_POST ["tituloEN"], $_POST ["tituloES"], true, $dbhw );
+		if(empty($_POST["titulolegenda"])){
+			$_POST["titulolegenda"] = $_POST ["nome_tema"];
+		}
+		$novo = adicionar ( $locaplic, $_POST["titulolegenda"], $_POST ["link_tema"], $codigo, $_POST ["acessopublico"], $_POST ["metaestat"], $_POST ["nome_tema"], $_POST ["desc_tema"], $_POST ["en"], $_POST ["es"], true, $dbhw );
 		if ($novo === false) {
 			header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
 			exit ();
@@ -69,6 +72,30 @@ switch ($funcao) {
 		) );
 		exit ();
 		break;
+	case "ALTERAR" :
+		$codigo = str_replace ( " ", "", removeAcentos ( $codigo ) );
+		$codigo = str_replace ( ".", "", $codigo );
+		$codigo = strip_tags ( $codigo );
+		$codigo = htmlspecialchars ( $codigo, ENT_QUOTES );
+		$arq = $locaplic . "/temas/" . $codigo . ".map";
+		if ($codigo == "" || !file_exists ( $arq )) {
+			header ( "HTTP/1.1 400 arquivo nao existe" );
+			exit ();
+		}
+		if(empty($_POST["titulolegenda"])){
+			$_POST["titulolegenda"] = $_POST ["nome_tema"];
+		}
+		//quando e feita a listagem unica, o mapfile ja foi registrado no banco se nao tinha sido antes
+		$novo = alterar ( $locaplic, $_POST["id_tema"], $_POST["titulolegenda"], $_POST ["link_tema"], $codigo, $_POST ["acessopublico"], $_POST ["metaestat"], $_POST ["nome_tema"], $_POST ["desc_tema"], $_POST ["en"], $_POST ["es"], true, $dbhw );
+		if ($novo === false) {
+			header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
+			exit ();
+		}
+		retornaJSON ( array (
+			"codigo" => $codigo
+		) );
+		exit ();
+		break;
 	case "EXCLUIR" :
 		$codigo = $_POST ["codigo"];
 		$codigo = str_replace ( " ", "", removeAcentos ( $codigo ) );
@@ -98,6 +125,71 @@ switch ($funcao) {
 		retornaJSON ( $retorna );
 		exit ();
 		break;
+	case "LISTAUNICO" :
+		//pega o nome registrado no mapfile
+		if(!file_exists($locaplic."/temas/".$codigo.".map")){
+			header ( "HTTP/1.1 500 erro mapfile nao existe" );
+			exit ();
+		}
+		$mapa = ms_newMapObj ( $locaplic."/temas/".$codigo.".map" );
+		$layer = $mapa->getlayerbyname($codigo);
+		if($layer == ""){
+			header ( "HTTP/1.1 500 erro nao existe LAYER com o nome $codigo" );
+			exit ();
+		}
+		$titulolegenda = $layer->getmetadata("TEMA");
+		$metaestat = $layer->getmetadata("METAESTAT");
+		$dados = pegaDados ( "SELECT * from ".$esquemaadmin."i3geoadmin_temas WHERE codigo_tema = '$codigo' ", $dbh, false );
+		//se nao existir no sistema de admin, faz o registro
+		if(count($dados) == 0){
+			$dataCol = array (
+					"kml_tema" => "SIM",
+					"kmz_tema" => "SIM",
+					"ogc_tema" => "SIM",
+					"download_tema" => "SIM",
+					"desc_tema" => "",
+					"tipoa_tema" => "",
+					"tags_tema" => "",
+					"nome_tema" => $titulolegenda,
+					"codigo_tema" => $codigo,
+					"it" => "",
+					"es" => "",
+					"en" => ""
+			);
+			$id_tema = i3GeoAdminInsertUnico($dbhw,"i3geoadmin_temas",$dataCol,"link_tema","id_tema");
+			$dados = pegaDados ( "SELECT * from ".$esquemaadmin."i3geoadmin_temas WHERE codigo_tema = '$codigo' AND id_tema = $id_tema ", $dbh, false );
+			if(count($dados) == 0){
+				$dbhw = null;
+				$dbh = null;
+				header ( "HTTP/1.1 500 erro ao registrar no banco de dados" );
+				exit ();
+			}
+		}
+		if ($dados === false) {
+			$dbhw = null;
+			$dbh = null;
+			header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
+			exit ();
+		}
+		$acessopublico = "";
+		if(strtolower($dados[0]["ogc_tema"]) !== "nao" || strtolower($dados[0]["download_tema"]) !== "nao"){
+			$acessopublico = "checked";
+		}
+		if($metaestat == ""){
+			$dados[0]["metaestatnao"] = "selected";
+		} else {
+			$dados[0]["metaestatsim"] = "selected";
+		}
+		$dados[0]["acessopublico"] = $acessopublico;
+		$dados[0]["metaestat"] = $metaestat;
+		//a pagina e utf e o texto pode ser iso
+		if(mb_detect_encoding($titulolegenda,'UTF-8, ISO-8859-1') == "ISO-8859-1"){
+			$titulolegenda = utf8_encode($titulolegenda);
+		}
+		$dados[0]["titulolegenda"] = $titulolegenda;
+		$dados[0]["codigo"] = $codigo;
+		retornaJSON ( array("dados"=>$dados[0]) );
+		break;
 	case "LIMPACACHE" :
 		$mapfile = $locaplic . "/temas/" . $_POST ["codigo"] . ".map";
 		if (! file_exists ( $mapfile )) {
@@ -182,10 +274,7 @@ switch ($funcao) {
 		include(dirname(__FILE__)."/../../php/removeCabecalhoMapfile.php");
 		removeCabecalhoMapfile($arqnovo);
 
-		if ($novo === false) {
-			header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
-			exit ();
-		} elseif (count ( $dados ) > 0) {
+		if (count ( $dados ) > 0) {
 			//registra no banco de dados caso nao tenha ocorrido erro ao criar o mapfile
 			i3GeoAdminInsert ( $dbhw, "i3geoadmin_temas", $dataCol );
 		}
@@ -234,13 +323,79 @@ function excluir($codigo, $dbhw) {
 	unlink ( "$locaplic/temas/" . $codigo . ".map" );
 	return true;
 }
-function adicionar($locaplic, $titulolegenda, $link_tema, $codigo, $acessopublico, $metaestat, $titulo, $desc_tema, $tituloEN, $tituloES, $registraBanco, $dbhw) {
+function alterar($locaplic, $id_tema, $titulolegenda, $link_tema, $codigo, $acessopublico, $metaestat, $titulo, $desc_tema, $tituloEN, $tituloES, $registraBanco, $dbhw) {
 	global $convUTF, $esquemaadmin;
 	$arq = $locaplic . "/temas/" . $codigo . ".map";
+	if(!file_exists($locaplic . "/temas/" . $codigo . ".map")){
+		return false;
+	}
+	$mapa = ms_newMapObj($arq);
+	$layer = @$mapa->getlayerbyname($codigo);
+	if($layer == ""){
+		return false;
+	}
+	if(mb_detect_encoding($titulolegenda,'UTF-8, ISO-8859-1') == "UTF-8"){
+		$titulolegenda = utf8_decode($titulolegenda);
+	}
+	if ($convUTF != true) {
+		$titulo = utf8_decode ( $titulo );
+		$desc_tema = utf8_decode ( $desc_tema );
+	}
+
 	if (empty ( $acessopublico ) || $acessopublico == "on") {
 		$acessopublico = "SIM";
 	} else {
+		$acessopublico = "NAO";
+	}
+	$layer->setmetadata("permiteogc",$acessopublico);
+	$layer->setmetadata("permitedownload",$acessopublico);
+	$layer->setmetadata("permitekml",$acessopublico);
+	$layer->setmetadata("permitekmz",$acessopublico);
+	$layer->setmetadata("TEMA",$titulolegenda);
+	if (! empty ( $metaestat ) && $metaestat == "SIM") {
+		$layer->setmetadata("METAESTAT","SIM");
+		$tipoa_tema = "META";
+	} else {
+		$layer->setmetadata("METAESTAT","");
+		$tipoa_tema = "";
+	}
+
+
+	try {
+		$dataCol = array (
+				"link_tema" => $link_tema,
+				"kml_tema" => $acessopublico,
+				"kmz_tema" => $acessopublico,
+				"ogc_tema" => $acessopublico,
+				"download_tema" => $acessopublico,
+				"desc_tema" => $desc_tema,
+				"tipoa_tema" => $tipoa_tema,
+				"tags_tema" => '',
+				"nome_tema" => $titulo,
+				"codigo_tema" => $codigo,
+				"it" => "",
+				"es" => $tituloES,
+				"en" => $tituloEN
+		);
+		$resultado = i3GeoAdminUpdate ( $dbhw, "i3geoadmin_temas", $dataCol, "WHERE id_tema = $id_tema" );
+		if ($resultado === false) {
+			return false;
+		}
+		$mapa->save($arq);
+		include(dirname(__FILE__)."/../../php/removeCabecalhoMapfile.php");
+		removeCabecalhoMapfile($arq);
+		return true;
+	} catch ( PDOException $e ) {
+		return false;
+	}
+}
+function adicionar($locaplic, $titulolegenda, $link_tema, $codigo, $acessopublico, $metaestat, $titulo, $desc_tema, $tituloEN, $tituloES, $registraBanco, $dbhw) {
+	global $convUTF, $esquemaadmin;
+	$arq = $locaplic . "/temas/" . $codigo . ".map";
+	if (empty ( $acessopublico ) || $acessopublico == "on") {
 		$acessopublico = "SIM";
+	} else {
+		$acessopublico = "NAO";
 	}
 	if(mb_detect_encoding($titulolegenda,'UTF-8, ISO-8859-1') == "UTF-8"){
 		$titulolegenda = utf8_decode($titulolegenda);
diff --git a/admin1/catalogo/mapfile/index.js b/admin1/catalogo/mapfile/index.js
index 513d649..6dd060a 100755
--- a/admin1/catalogo/mapfile/index.js
+++ b/admin1/catalogo/mapfile/index.js
@@ -26,6 +26,8 @@ i3GEOadmin.mapfile = {
 		//variavel global indicando o elemento que recebera a lista de menus
 		ondeLista: "",
 		favoritosArray: [],
+		formAdiciona: "",
+		parametrosSalvar: "",
 		init: function(onde,palavra){
 			i3GEOadmin.mapfile.ondeLista = onde;
 			i3GEOadmin.mapfile.lista(palavra);
@@ -81,6 +83,28 @@ Obt&eacute;m a lista
 							i3GEOadmin.core.filtra(i3GEOadmin.mapfile.pegaFiltro());
 						}
 
+						//monta um template para o modal de inclusao
+						if(i3GEOadmin.mapfile.formAdiciona == ""){
+							html = Mustache.to_html(
+									$("#templateManterTema").html(),
+									$.extend(
+											{},
+											i3GEOadmin.mapfile.dicionario,
+											{
+												"codigo": "",
+												"escondido": "hidden",
+												"excluir": i3GEOadmin.mapfile.dicionario.cancelar,
+												"onExcluir": "i3GEOadmin.core.fechaModalGeral",//funcao
+												"onSalvar": "i3GEOadmin.mapfile.adiciona",
+												"metaestatnao": "selected",
+												"acessopublico": "checked",
+												"criaMapfileTxt": i3GEOadmin.mapfile.dicionario.criaMapfile,
+												"criaMapfileDescTxt": i3GEOadmin.mapfile.dicionario.criaMapfileDesc
+											}
+									)
+							);
+							i3GEOadmin.mapfile.formAdiciona = html;
+						}
 						$.material.init();
 					}
 			)
@@ -89,24 +113,83 @@ Obt&eacute;m a lista
 				i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
 			});
 		},
-		adicionaDialogo: function(){
-			var html = Mustache.to_html(
-					"{{#data}}" + $("#templateManterTema").html() + "{{/data}}",
-					$.extend(
-							{},
-							i3GEOadmin.mapfile.dicionario,
-							{
-								"data": "modal",
-								"metaestatnao": "selected",
-								"acessopublico": "checked"
-							}
-					)
+		editarDialogo: function(id){
+			i3GEOadmin.core.fechaModalGeral();
+			i3GEOadmin.core.modalAguarde(true);
+			//deve-se usar o codigo e nao o id_tema
+			$.post(
+					"exec.php?funcao=listaunico",
+					"codigo=" + id
+			)
+			.done(
+					function(data, status){
+						var json = jQuery.parseJSON(data);
+
+						var html = Mustache.to_html(
+								"{{#data}}" + $("#templateManterTema").html() + "{{/data}}",
+								$.extend(
+										{},
+										i3GEOadmin.mapfile.dicionario,
+										{
+											"data": json["dados"],
+											"onExcluir": "i3GEOadmin.mapfile.excluirDialogo",//funcao
+											"onSalvar": "i3GEOadmin.mapfile.salvarAlteracaoDialogo",
+											"criaMapfileTxt": i3GEOadmin.mapfile.dicionario.editaMapfile,
+											"criaMapfileDescTxt": i3GEOadmin.mapfile.dicionario.editaMapfileDesc
+										}
+								)
+						);
+						i3GEOadmin.core.abreModalGeral(html);
+					}
+			)
+			.fail(
+					function(data){
+						i3GEOadmin.core.modalAguarde(false);
+						i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
+					}
 			);
-			i3GEOadmin.core.abreModalGeral(html);
+		},
+		salvarAlteracaoDialogo: function(codigo,id){
+			i3GEOadmin.mapfile.parametrosSalvar = $("#form-edicao-" + codigo).serialize();
+			var hash = {
+					"mensagem": i3GEOadmin.mapfile.dicionario.confirma,
+					"onBotao1": "i3GEOadmin.mapfile.salva('"+id+"')",
+					"botao1": i3GEOadmin.mapfile.dicionario.sim,
+					"onBotao2": "i3GEOadmin.mapfile.parametrosSalvar = '';i3GEOadmin.core.fechaModalConfirma();",
+					"botao2": i3GEOadmin.mapfile.dicionario.nao
+			};
+			i3GEOadmin.core.abreModalConfirma(hash);
+		},
+		salva: function(id){
+			var parametros = i3GEOadmin.mapfile.parametrosSalvar;
+			i3GEOadmin.core.fechaModalGeral();
+			i3GEOadmin.core.modalAguarde(true);
+			$.post(
+					"exec.php?funcao=alterar",
+					"id_tema=" + id + "&"+parametros
+			)
+			.done(
+					function(data, status){
+						i3GEOadmin.mapfile.parametrosSalvar = '';
+						i3GEOadmin.core.modalAguarde(false);
+						i3GEOadmin.core.iconeAguarde(i3GEOadmin.mapfile.ondeLista);
+						i3GEOadmin.mapfile.lista("","");
+					}
+			)
+			.fail(
+					function(data){
+						i3GEOadmin.mapfile.parametrosSalvar = '';
+						i3GEOadmin.core.modalAguarde(false);
+						i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
+					}
+			);
+		},
+		adicionaDialogo: function(){
+			i3GEOadmin.core.abreModalGeral(i3GEOadmin.mapfile.formAdiciona);
 		},
 //		os parametros sao obtidos do formulario aberto do modal
 		adiciona: function(){
-			var parametros = $("#form-modal-adiciona").serialize();
+			var parametros = $("#modalGeral form").serialize();
 			i3GEOadmin.core.fechaModalGeral();
 			i3GEOadmin.core.modalAguarde(true);
 			$.post(
@@ -119,7 +202,7 @@ Obt&eacute;m a lista
 						i3GEOadmin.core.modalAguarde(false);
 						i3GEOadmin.core.iconeAguarde(i3GEOadmin.mapfile.ondeLista);
 						i3GEOadmin.mapfile.favoritosArray.push(json.codigo);
-						i3GEOadmin.mapfile.lista();
+						i3GEOadmin.mapfile.lista("","");
 					}
 			)
 			.fail(
@@ -160,6 +243,18 @@ Obt&eacute;m a lista
 					}
 			);
 		},
+		salvarDialogo: function(id){
+			i3GEOadmin.mapfile.parametrosSalvar = $("#form-edicao-" + id).serialize();
+			console.info(i3GEOadmin.mapfile.parametrosSalvar);
+			var hash = {
+					"mensagem": i3GEOadmin.mapfile.dicionario.confirma,
+					"onBotao1": "i3GEOadmin.mapfile.salvar('"+id+"')",
+					"botao1": i3GEOadmin.mapfile.dicionario.sim,
+					"onBotao2": "i3GEOadmin.mapfile.parametrosSalvar = '';i3GEOadmin.core.fechaModalConfirma();",
+					"botao2": i3GEOadmin.mapfile.dicionario.nao
+			};
+			i3GEOadmin.core.abreModalConfirma(hash);
+		},
 		retornaFavoritosArray: function(){
 			var temp = i3GEO.util.pegaCookie("I3GEOfavoritosEditorMapfile");
 			if(temp){
@@ -185,12 +280,9 @@ Obt&eacute;m a lista
 			n = i3GEOadmin.mapfile.favoritosArray.length;
 			for (i=0; i<n; i++){
 				codigo = i3GEOadmin.mapfile.favoritosArray[i];
-				h = $("#form-" + codigo + " .panel-heading").html();
+				h = $("#form-" + codigo).html();
 				if(h != undefined){
-					mapfile = '<div class="panel panel-default">' + h;
-					conteudo.push(mapfile);
-					mapfile = '<div class="panel-body">' + $("#form-" + codigo + " .panel-body").html() + "</div></div>";
-					conteudo.push(mapfile);
+					conteudo.push(h);
 				}
 			}
 			$("#body-favoritos").html(conteudo.join("\n"));
diff --git a/admin1/catalogo/mapfile/index.php b/admin1/catalogo/mapfile/index.php
index 3b5c3ff..461ee20 100755
--- a/admin1/catalogo/mapfile/index.php
+++ b/admin1/catalogo/mapfile/index.php
@@ -87,160 +87,12 @@ include "../../head.php";
 		</div>
 	</div>
 </div>
-<script id="templateFiltro" type="x-tmpl-mustache">
-<option value="form-{{codigo}}">{{{codigo}}} - {{{nome}}}</option>
-</script>
-<script id="templateLista" type="x-tmpl-mustache">
-<div class="panel panel-default" id="form-{{codigo}}">
-	<div class="panel-heading icon" role="tab">
-		<h4 class="panel-title {{escondido}}">
-			<a title="{{{favorito}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.registraFavoritos('{{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
-				<i class="material-icons">star_border</i>
-			</a>
-			<a class="collapsed in" role="button" data-toggle="collapse" href="#body-form-{{codigo}}" aria-expanded="false" aria-controls="#body-form-{{codigo}}">
-				&nbsp;
-				<strong>{{{nome}}}</strong> <small> {{{arquivoTxt}}}:</small> {{{codigo}}}
-			</a>
-		</h4>
-	</div>
-	<div class="panel-body panel-collapse collapse" id="body-form-{{codigo}}">
-		<div>
-			<a onclick="i3GEOadmin.mapfile.dadosGeraisDialogo();" href="javascript:void(0)" class="btn btn-primary" style="color:#008579;" role="button">{{{tituloTxt}}}</a>
-		</div>
-		<div>
-			<a title="{{{excluir}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.excluirDialogo('{{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
-				<i class="material-icons">delete_forever</i>
-			</a>
-			&nbsp;
-			<a title="{{{filtraLista}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.init($('#corpo'),'{{codigo}}');" class="btn btn-primary btn-fab btn-fab-mini" role="button">
-				<i class="material-icons">filter_list</i>
-			</a>
-			&nbsp;
-
-			<a title="{{{criaCopia}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.clonaDialogo('{{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
-				<i class="material-icons">content_copy</i>
-			</a>
-			&nbsp;
-			<a title="{{{limpaCache}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.limpaCacheDialogo('{{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
-				<i class="material-icons">layers_clear</i>
-			</a>
-			&nbsp;
-			<a title="{{{editorTxt}}}" href="javascript:void(0)" onclick="window.open('../../../admin/php/editortexto.php?mapfile={{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
-				<i class="material-icons">mode_edit</i>
-			</a>
-			&nbsp;
-			<a title="{{{testaLayer}}}" href="javascript:void(0)" onclick="window.open('../../../testamapfile.php?map={{codigo}}.map')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
-				<i class="material-icons">report</i>
-			</a>
-			&nbsp;
-			<a title="{{{editarI3geo}}}" href="javascript:void(0)" onclick="window.open('../../../interface/black_editor.php?&temaEdicao={{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
-				<i class="material-icons">settings</i>
-			</a>
-			&nbsp;
-			<a title="{{{testarI3geo}}}" href="javascript:void(0)" onclick="window.open('../../../ms_criamapa.php?temasa={{codigo}}&layers={{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
-				<i class="material-icons">sending</i>
-			</a>
-		</div>
-	</div>
-</div>
-</script>
-<script id="templateManterTema" type="x-tmpl-mustache">
-		<h4>{{{criaMapfile}}}</h4>
-		<blockquote>{{{criaMapfileDesc}}}</blockquote>
-		<form id="form-modal-adiciona" style="" action="#" onsubmit="i3GEOadmin.mapfile.adiciona();return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
-			<div class="row">
-				<div class="col-md-12">
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="codigo" >{{{nomeMap}}}</label>
-						<div class="col-md-6">
-							<input title="{{{nomeMap}}}" type="text" value="{{{codigo}}}" class="form-control" name="codigo" required>
-						</div>
-					</div>
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="titulolegenda" >{{{tituloLegenda}}}</label>
-						<div class="col-md-6">
-							<input title="{{{tituloLegenda}}}" type="text" value="{{{titulolegenda}}}" class="form-control" name="titulolegenda" >
-						</div>
-					</div>
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="titulo" >{{{tituloTema}}}</label>
-						<div class="col-md-6">
-							<input placeholder="{{{tituloPt}}}" title="{{{tituloTema}}}" type="text" value="{{{titulo}}}" class="form-control" name="titulo" >
-						</div>
-					</div>
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="titulo" ></label>
-						<div class="col-md-6">
-							<input placeholder="{{{tituloEs}}}" title="{{{tituloEs}}}" type="text" value="{{{tituloES}}}" class="form-control" name="tituloES" >
-						</div>
-					</div>
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="titulo" ></label>
-						<div class="col-md-6">
-							<input placeholder="{{{tituloEn}}}" title="{{{tituloEn}}}" type="text" value="{{{tituloEN}}}" class="form-control" name="tituloEN" >
-						</div>
-					</div>
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="desc_tema" >{{{descricaoTxt}}}</label>
-						<div class="col-md-6">
-							<input title="{{{descricaoTxt}}}" type="text" value="{{{desc_tema}}}" class="form-control" name="desc_tema" >
-						</div>
-					</div>
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="link_tema" >{{{fonteTema}}}</label>
-						<div class="col-md-6">
-							<input title="{{{fonteTema}}}" type="text" value="{{{link_tema}}}" class="form-control" name="link_tema" >
-						</div>
-					</div>
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="metaestat">{{{metaestat}}}</label>
-						<div class="col-md-6">
-							<select title="{{{metaestat}}}" class="form-control" name="metaestat">
-								<option value="SIM" {{{metaestatsim}}} >{{{sim}}}</option>
-								<option value="NAO" {{{metaestatnao}}} >{{{nao}}}</option>
-							</select>
-						</div>
-					</div>
-					<div class="form-group form-group-lg">
-						<div class="checkbox col-md-12">
-							<label>
-								<input title="{{{permiteOgc}}}" type="checkbox" {{acessopublico}} name="acessopublico" /> {{{permiteOgc}}}
-							</label>
-						</div>
-					</div>
-				</div>
-			<div class="pull-right">
-				<button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{salva}}</button>
-			</div>
-			</div>
-		</form>
-</script>
-<script id="templateClonarTema" type="x-tmpl-mustache">
-		<h4>{{{clonaMapfile}}}</h4>
-		<form id="form-modal-adiciona" style="" action="#" onsubmit="i3GEOadmin.mapfile.clona();return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
-			<div class="row">
-				<div class="col-md-12">
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="novocodigo" >{{{nomeMap}}}</label>
-						<div class="col-md-6">
-							<input title="{{{nomeArquivo}}}" type="text" value="" class="form-control" name="novocodigo" required>
-						</div>
-					</div>
-					<div class="form-group form-group-lg">
-						<label class="col-md-6 control-label" for="titulo" >{{{tituloTema}}}</label>
-						<div class="col-md-6">
-							<input title="{{{tituloTema}}}" type="text" value="" class="form-control" name="titulo" >
-						</div>
-					</div>
-				</div>
-				<input type="hidden" value="{{codigoAtual}}" class="form-control" name="codigo" >
-			<div class="pull-right">
-				<button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{criaCopia}}</button>
-			</div>
-			</div>
-		</form>
-</script>
-
+<?php
+include("templates/templateManterTema.php");
+include("templates/templateLista.php");
+include("templates/templateFiltro.php");
+include("templates/templateClonarTema.php");
+?>
 <script type="text/javascript" src="index.js"></script>
 <script type="text/javascript" src="../../dicionario/editormapfile.js"></script>
 <script>
diff --git a/admin1/catalogo/mapfile/templates/templateClonarTema.php b/admin1/catalogo/mapfile/templates/templateClonarTema.php
new file mode 100644
index 0000000..a3f7e4c
--- /dev/null
+++ b/admin1/catalogo/mapfile/templates/templateClonarTema.php
@@ -0,0 +1,25 @@
+<script id="templateClonarTema" type="x-tmpl-mustache">
+		<h4>{{{clonaMapfile}}}</h4>
+		<form id="form-modal-adiciona" style="" action="#" onsubmit="i3GEOadmin.mapfile.clona();return false;"   class="form-horizontal" role="form" method="post"   >
+			<div class="row">
+				<div class="col-md-12">
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="novocodigo" >{{{nomeMap}}}</label>
+						<div class="col-md-6">
+							<input title="{{{nomeArquivo}}}" type="text" value="" class="form-control" name="novocodigo" required>
+						</div>
+					</div>
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="titulo" >{{{tituloTema}}}</label>
+						<div class="col-md-6">
+							<input title="{{{tituloTema}}}" type="text" value="" class="form-control" name="titulo" >
+						</div>
+					</div>
+				</div>
+				<input type="hidden" value="{{codigoAtual}}" class="form-control" name="codigo" >
+			<div class="pull-right">
+				<button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{criaCopia}}</button>
+			</div>
+			</div>
+		</form>
+</script>
\ No newline at end of file
diff --git a/admin1/catalogo/mapfile/templates/templateFiltro.php b/admin1/catalogo/mapfile/templates/templateFiltro.php
new file mode 100644
index 0000000..f832116
--- /dev/null
+++ b/admin1/catalogo/mapfile/templates/templateFiltro.php
@@ -0,0 +1,3 @@
+<script id="templateFiltro" type="x-tmpl-mustache">
+<option value="form-{{codigo}}">{{{codigo}}} - {{{nome}}}</option>
+</script>
\ No newline at end of file
diff --git a/admin1/catalogo/mapfile/templates/templateLista.php b/admin1/catalogo/mapfile/templates/templateLista.php
new file mode 100644
index 0000000..76ee8da
--- /dev/null
+++ b/admin1/catalogo/mapfile/templates/templateLista.php
@@ -0,0 +1,36 @@
+<script id="templateLista" type="x-tmpl-mustache">
+<div class="list-group-item" id="form-{{codigo}}">
+	<div class="row-content">
+		<h4 class="list-group-item-heading">
+			<a href="javascript:void(0)" onclick="i3GEOadmin.mapfile.maisOpcoesDialogo('{{codigo}}');" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
+				<i class="material-icons  md-18">more_horiz</i>
+			</a>
+			<span class="pull-right">&nbsp;&nbsp;</span>
+<!-- utiliza o codigo aqui pois o mapfile pode nao estar no banco -->
+			<a title="{{{tituloTxt}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.editarDialogo('{{codigo}}');" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
+				<i class="material-icons  md-18">mode_edit</i>
+			</a>
+			<span class="pull-right">&nbsp;&nbsp;</span>
+
+			<a title="{{{criaCopia}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.clonaDialogo('{{codigo}}')" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
+				<i class="material-icons md-18">content_copy</i>
+			</a>
+			<span class="pull-right">&nbsp;&nbsp;</span>
+
+			<a title="{{{excluir}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.excluirDialogo('{{codigo}}')" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
+				<i class="material-icons md-18">delete_forever</i>
+			</a>
+			<span class="pull-right">&nbsp;&nbsp;</span>
+
+			<a title="{{{favorito}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.registraFavoritos('{{codigo}}')" class="pull-right btn btn-primary btn-fab btn-fab-mini" role="button">
+				<i class="material-icons md-18">star_border</i>
+			</a>
+			<span class="pull-right">&nbsp;&nbsp;</span>
+
+			&nbsp;<strong>{{{nome}}}</strong> <small> {{{arquivoTxt}}}:</small> {{{codigo}}}
+		</h4>
+	</div>
+	<div class="list-group-separator"></div>
+</div>
+
+</script>
\ No newline at end of file
diff --git a/admin1/catalogo/mapfile/templates/templateMaisOpcoes.php b/admin1/catalogo/mapfile/templates/templateMaisOpcoes.php
new file mode 100644
index 0000000..a8d1681
--- /dev/null
+++ b/admin1/catalogo/mapfile/templates/templateMaisOpcoes.php
@@ -0,0 +1,26 @@
+<script id="templateMaisOpcoes" type="x-tmpl-mustache">
+
+			<a title="{{{limpaCache}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.limpaCacheDialogo('{{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
+				<i class="material-icons">layers_clear</i>
+			</a>
+			&nbsp;
+
+			<a title="{{{editorTxt}}}" href="javascript:void(0)" onclick="window.open('../../../admin/php/editortexto.php?mapfile={{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
+				<i class="material-icons">mode_edit</i>
+			</a>
+			&nbsp;
+
+			<a title="{{{testaLayer}}}" href="javascript:void(0)" onclick="window.open('../../../testamapfile.php?map={{codigo}}.map')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
+				<i class="material-icons">report</i>
+			</a>
+			&nbsp;
+
+			<a title="{{{editarI3geo}}}" href="javascript:void(0)" onclick="window.open('../../../interface/black_editor.php?&temaEdicao={{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
+				<i class="material-icons">settings</i>
+			</a>
+			&nbsp;
+			<a title="{{{testarI3geo}}}" href="javascript:void(0)" onclick="window.open('../../../ms_criamapa.php?temasa={{codigo}}&layers={{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
+				<i class="material-icons">sending</i>
+			</a>
+		</div>
+</script>
\ No newline at end of file
diff --git a/admin1/catalogo/mapfile/templates/templateManterTema.php b/admin1/catalogo/mapfile/templates/templateManterTema.php
new file mode 100644
index 0000000..d91e5e3
--- /dev/null
+++ b/admin1/catalogo/mapfile/templates/templateManterTema.php
@@ -0,0 +1,72 @@
+<script id="templateManterTema" type="x-tmpl-mustache">
+		<!-- o titulo e a descricao sao diferentes para a edicao e para a criacao, por isso utiliza-se essas chaves controladas no javascript-->
+		<h4>{{{criaMapfileTxt}}}</h4>
+		<blockquote>{{{criaMapfileDescTxt}}}</blockquote>
+		<form id="form-edicao-{{codigo}}" style="" action="#" onsubmit="{{onSalvar}}('{{codigo}}','{{id_tema}}');"   class="form-horizontal" role="form" method="post"   >
+			<div class="row">
+				<div class="col-md-12">
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="codigo" >{{{nomeMap}}}</label>
+						<div class="col-md-6">
+							<input title="{{{nomeMap}}}" type="text" value="{{{codigo}}}" class="form-control" name="codigo" required>
+						</div>
+					</div>
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="titulolegenda" >{{{tituloLegenda}}}</label>
+						<div class="col-md-6">
+							<input title="{{{tituloLegenda}}}" type="text" value="{{{titulolegenda}}}" class="form-control" name="titulolegenda" >
+						</div>
+					</div>
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="nome_tema" >{{{tituloTema}}}</label>
+						<div class="col-md-6">
+							<input placeholder="{{{tituloPt}}}" title="{{{tituloTema}}}" type="text" value="{{{nome_tema}}}" class="form-control" name="nome_tema" >
+						</div>
+					</div>
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="es" >{{{tituloEs}}}</label>
+						<div class="col-md-6">
+							<input title="{{{tituloEs}}}" type="text" value="{{{es}}}" class="form-control" name="es" >
+						</div>
+					</div>
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="en" >{{{tituloEn}}}</label>
+						<div class="col-md-6">
+							<input title="{{{tituloEn}}}" type="text" value="{{{en}}}" class="form-control" name="en" >
+						</div>
+					</div>
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="desc_tema" >{{{descricaoTxt}}}</label>
+						<div class="col-md-6">
+							<input title="{{{descricaoTxt}}}" type="text" value="{{{desc_tema}}}" class="form-control" name="desc_tema" >
+						</div>
+					</div>
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="link_tema" >{{{fonteTema}}}</label>
+						<div class="col-md-6">
+							<input title="{{{fonteTema}}}" type="text" value="{{{link_tema}}}" class="form-control" name="link_tema" >
+						</div>
+					</div>
+					<div class="form-group form-group-lg">
+						<label class="col-md-6 control-label" for="metaestat">{{{metaestatTxt}}}</label>
+						<div class="col-md-6">
+							<select title="{{{metaestat}}}" class="form-control" name="metaestat">
+								<option value="SIM" {{{metaestatsim}}} >{{{sim}}}</option>
+								<option value="NAO" {{{metaestatnao}}} >{{{nao}}}</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group form-group-lg">
+						<div class="checkbox col-md-12">
+							<label>
+								<input title="{{{permiteOgc}}}" type="checkbox" {{acessopublico}} name="acessopublico" /> {{{permiteOgc}}}
+							</label>
+						</div>
+					</div>
+				</div>
+			<div class="pull-right">
+				<button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{salva}}</button>
+			</div>
+			</div>
+		</form>
+</script>
\ No newline at end of file
diff --git a/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php b/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php
index 6c38c8b..740a19a 100755
--- a/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php
+++ b/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_grupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_grupo}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
+<form id="form-edicao-{{id_grupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_grupo}}');return false;"   class="form-horizontal" role="form"
 	method="post"  >
 	<div class="row">
 		<div class="col-md-12">
diff --git a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php
index 755ae71..425a81c 100755
--- a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php
+++ b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_subgrupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_subgrupo}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
+<form id="form-edicao-{{id_subgrupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_subgrupo}}');return false;"   class="form-horizontal" role="form"
 	method="post"  >
 	<div class="row">
 		<div class="col-md-12">
diff --git a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php
index b9bf15f..9bb144b 100755
--- a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php
+++ b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php
@@ -1,5 +1,5 @@
 <script id="templateForm" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_n3}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n3}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_n3}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n3}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php
index 92c6ebf..67f72b0 100755
--- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php
+++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php
@@ -1,5 +1,5 @@
 <script id="templateFormNos" type="x-tmpl-mustache">
-<form id="form-edicao-no-{{id_n2}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n2}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-no-{{id_n2}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n2}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php
index 080914b..578ef56 100755
--- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php
+++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php
@@ -1,5 +1,5 @@
 <script id="templateFormRaiz" type="x-tmpl-mustache">
-<form id="form-edicao-raiz-{{id_raiz}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_raiz}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-raiz-{{id_raiz}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_raiz}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/catalogo/menus/grupos/templates/templateFormNos.php b/admin1/catalogo/menus/grupos/templates/templateFormNos.php
index 41950a3..76d7b7d 100755
--- a/admin1/catalogo/menus/grupos/templates/templateFormNos.php
+++ b/admin1/catalogo/menus/grupos/templates/templateFormNos.php
@@ -1,5 +1,5 @@
 <script id="templateFormNos" type="x-tmpl-mustache">
-<form id="form-edicao-no-{{id_n1}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n1}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-no-{{id_n1}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n1}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/catalogo/menus/grupos/templates/templateFormRaiz.php b/admin1/catalogo/menus/grupos/templates/templateFormRaiz.php
index 558f266..cd1744e 100755
--- a/admin1/catalogo/menus/grupos/templates/templateFormRaiz.php
+++ b/admin1/catalogo/menus/grupos/templates/templateFormRaiz.php
@@ -1,5 +1,5 @@
 <script id="templateFormRaiz" type="x-tmpl-mustache">
-<form id="form-edicao-raiz-{{id_raiz}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_raiz}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-raiz-{{id_raiz}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_raiz}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-12">
 			<div class="form-group form-group-lg">
diff --git a/admin1/catalogo/menus/templates/templateFormLista.php b/admin1/catalogo/menus/templates/templateFormLista.php
index 0444d76..e65ef3f 100755
--- a/admin1/catalogo/menus/templates/templateFormLista.php
+++ b/admin1/catalogo/menus/templates/templateFormLista.php
@@ -1,5 +1,5 @@
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_menu}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_menu}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal"
+<form id="form-edicao-{{id_menu}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_menu}}');return false;"   class="form-horizontal"
 	role="form" method="post" >
 	<div class="row">
 		<div class="col-md-12">
diff --git a/admin1/dicionario/editormapfile.js b/admin1/dicionario/editormapfile.js
index dc6f06a..14c7fe5 100755
--- a/admin1/dicionario/editormapfile.js
+++ b/admin1/dicionario/editormapfile.js
@@ -5,6 +5,16 @@ i3GEOadmin.mapfile.dicionario = {
 		en : "",
 		es : ""
 	} ],
+	'editaMapfile' : [ {
+		pt : "Edi&ccedil;&atilde;o",
+		en : "",
+		es : ""
+	} ],
+	'editaMapfileDesc' : [ {
+		pt : "Utilize as op&ccedil;&otilde;es para modificar as caracter&iacute;sticas principais do mapfile",
+		en : "",
+		es : ""
+	} ],
     'txtAjuda' : [ {
 		pt : "Na lista, o texto marcado corresponde ao nome do tema registrado na &aacute;rvore de temas (registro no banco de dados). Nem todos os temas s&atilde;o utilizados na &aacute;rvore, por isso n&atilde;o necessitam ser associados a um 'tema' e registrados no banco de dados. Ao criar um mapfile por esse sistema, o registro no banco de dados &eacute; autom&aacute;tico.<p>Importante: a restri&ccedil;&atilde;o ao tema por meio da defini&ccedil;&atilde;o de grupos de usu&aacute;rios n&atilde;o bloqueia o acesso por meio de download, WMS, KML, etc. Para bloquear esse tipo de acesso &eacute; necess&aacute;rio alterar as op&ccedil;&otilde;es espec&iacute;ficas. Por padr&atilde;o, esses servi&ccedil;os s&atilde;o habilitados para qualquer usu&aacute;rio, n&atilde;o sendo poss&iacute;vel bloquear apenas para determinados grupos. <p>Este formul&aacute;rio permite criar ou editar os arquivos mapfile que comp&otilde;em temas no i3geo. <p>Os arquivo .map s&atilde;o armazenados no diret&oacute;rio i3geo/temas e podem tamb&eacute;m ser editados manualmente. <p>Cada arquivo cont&eacute;m layers definidos conforme a sintaxe utilizada pelo Mapserver. Esses arquivos s&atilde;o as estruturas b&aacute;sicas utilizadas pelo i3geo na apresenta&ccedil;&atilde;o de dados e montagem das camadas que s&atilde;o vistas no mapa. <p>Ap&oacute;s criados os mapfiles, deve-se ainda definir as caracter&iacute;sticas de cada LAYER. <p>A lista de IPs dos usu&aacute;rios que podem administrar o i3geo &eacute; definida no arquivo i3geo/ms_configura.php <p>Apenas os mapfiles que forem vinculados a um tema poder&atilde;o ser vistos na janela de inclus&atilde;o de temas na &aacute;rvore de temas. Se voc&ecirc; criou um mapfile manualmente, utilize a op&ccedil;&atilde;o de edi&ccedil;&atilde;o (&iacute;cone apresentado ao lado de cada mapfile) para fazer essa associa&ccedil;&atilde;o. <p>A op&ccedil;&atilde;o 'Verifica temas sem mapfiles' possibilita resolver problemas decorrentes da elimina&ccedil;&atilde;o manual de um arquivo mapfile do servidor. Nesses casos, o registro no banco de dados permanece. Com essa op&ccedil;&atilde;o &eacute; poss&iacute;vel apagar os registros ou recriar o mapfile perdido.",
 		en : "",
@@ -55,7 +65,7 @@ i3GEOadmin.mapfile.dicionario = {
 		en : "",
 		es : ""
 	} ],
-    'metaestat' : [ {
+    'metaestatTxt' : [ {
 		pt : "Esse mapfile baseia-se no sistema de metadados estat&iacute;sticos?</b> Caso escolha sim, a conex&atilde;o com o banco e o sql de acesso aos dados ser&atilde;o constru&iacute;dos de forma din&acirc;mica",
 		en : "",
 		es : ""
diff --git a/admin1/usuarios/cadastro/index.php b/admin1/usuarios/cadastro/index.php
index 98d7a95..b888ed8 100755
--- a/admin1/usuarios/cadastro/index.php
+++ b/admin1/usuarios/cadastro/index.php
@@ -60,7 +60,7 @@ include "../../head.php";
 <option value="form-{{id_usuario}}">{{{nome_usuario}}}</option>
 </script>
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_usuario}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_usuario}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_usuario}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_usuario}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-4" >
 			<h4> {{{papeisv}}}</h4>
diff --git a/admin1/usuarios/grupos/index.php b/admin1/usuarios/grupos/index.php
index 49c8bdc..c0da7a3 100755
--- a/admin1/usuarios/grupos/index.php
+++ b/admin1/usuarios/grupos/index.php
@@ -57,7 +57,7 @@ include "../../head.php";
 <option value="form-{{id_grupo}}">{{{nome}}}</option>
 </script>
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_grupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_grupo}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_grupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_grupo}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-4" style="max-height: 230px; overflow-y: auto;">
 			<h4> {{{usuariosv}}}</h4>
diff --git a/admin1/usuarios/operacoes/index.php b/admin1/usuarios/operacoes/index.php
index f9cdc0f..7e49d2f 100755
--- a/admin1/usuarios/operacoes/index.php
+++ b/admin1/usuarios/operacoes/index.php
@@ -61,7 +61,7 @@ include "../../head.php";
 <option value="form-{{id_operacao}}">{{{codigo}}}</option>
 </script>
 <script id="templateFormLista" type="x-tmpl-mustache">
-<form id="form-edicao-{{id_operacao}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_operacao}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post"   >
+<form id="form-edicao-{{id_operacao}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_operacao}}');return false;"   class="form-horizontal" role="form" method="post"   >
 	<div class="row">
 		<div class="col-md-4" >
 			<h4> {{{papeisv}}}</h4>
diff --git a/classesphp/classe_analise.php b/classesphp/classe_analise.php
index 5574732..32d74ac 100755
--- a/classesphp/classe_analise.php
+++ b/classesphp/classe_analise.php
@@ -1828,10 +1828,12 @@ class Analise
   function gradeDePol($xdd,$ydd,$px,$py,$locaplic,$nptx,$npty,$proj=false)
   {
     set_time_limit(180);
+
     //para manipular dbf
     if($this->dbaseExiste == false){
       include_once dirname(__FILE__)."/../pacotes/phpxbase/api_conversion.php";
     }
+
     $nomegrade = nomeRandomico();
     $nomeshp = $this->diretorio."/".$nomegrade;
     //pega a extens&atilde;o geogr&aacute;fica do mapa
@@ -1873,6 +1875,7 @@ class Analise
     {
       $npty = round(($disty / $ydd),0);
     }
+
     // cria o shapefile
     $novoshpf = ms_newShapefileObj($nomeshp, MS_SHP_POLYGON);
     $def = array();
diff --git a/ferramentas/gradepol/exec.php b/ferramentas/gradepol/exec.php
index 8a90e38..2636b8d 100755
--- a/ferramentas/gradepol/exec.php
+++ b/ferramentas/gradepol/exec.php
@@ -19,7 +19,9 @@ Salva o mapa acrescentando um novo layer com a grade.
 	case "GRADEDEPOL":
 		include_once(dirname(__FILE__)."/../../classesphp/classe_analise.php");
 		copiaSeguranca($map_file);
-		if(!isset($tema)){$tema = "";}
+		if(!isset($tema)){
+			$tema = "";
+		}
 		$m = new Analise($map_file,$tema);
 		if($_GET["proj"] == "sim"){
 			$_GET["proj"] = true;
@@ -27,8 +29,7 @@ Salva o mapa acrescentando um novo layer com a grade.
 		else{
 			$_GET["proj"] = false;
 		}
-
-		$retorno = $m->gradeDePol($_GET["dd"],$_GET["px"],$_GET["py"],$locaplic,$_GET["nptx"],$_GET["npty"],$_GET["proj"]);
+		$retorno = $m->gradeDePol($_GET["xdd"],$_GET["ydd"],$_GET["px"],$_GET["py"],$locaplic,$_GET["nptx"],$_GET["npty"],$_GET["proj"]);
 		$m->salva();
 		$_SESSION["contadorsalva"]++;
 	break;
diff --git a/ferramentas/selecao/exec.php b/ferramentas/selecao/exec.php
index 730a7ee..6dadddb 100755
--- a/ferramentas/selecao/exec.php
+++ b/ferramentas/selecao/exec.php
@@ -52,7 +52,7 @@ Sleciona elementos de um tema com base em outro tema.
 		$temas = explode(",",$tema);
 		foreach($temas as $tema){
 			$m = new Selecao($map_file,$tema);
-			$ok[] = $m->selecaoTema($temao,$_GET["tipo"],$_GET["buffer"]);
+			$ok[] = $m->selecaoTema($_GET["temao"],$_GET["tipo"],$_GET["buffer"]);
 		}
 		$_SESSION["contadorsalva"]++;
 		redesenhaMapa();
diff --git a/pacotes/phpxbase/api_conversion.php b/pacotes/phpxbase/api_conversion.php
index 5ac58ef..bdf497b 100755
--- a/pacotes/phpxbase/api_conversion.php
+++ b/pacotes/phpxbase/api_conversion.php
@@ -21,6 +21,7 @@
 if(!isset($locaplic)){
 	$locaplic = dirname(__FILE__)."/../../";
 }
+
 require_once "$locaplic/pacotes/phpxbase/Column.class.php";
 require_once "$locaplic/pacotes/phpxbase/Record.class.php";
 require_once "$locaplic/pacotes/phpxbase/Table.class.php";
@@ -144,4 +145,4 @@ function xbase_addInstance(&$i) {
 	$xbase_instances[$result]=&$i;
 	return $result;
 }
-?>
\ No newline at end of file
+?>
diff --git a/temas/_estadosbr.map b/temas/_estadosbr.map
index 36fc260..9988e54 100755
--- a/temas/_estadosbr.map
+++ b/temas/_estadosbr.map
@@ -1,22 +1,30 @@
 MAP
-SYMBOLSET ../symbols/simbolosv6.sym
-FONTSET   "../symbols/fontes.txt"
-LAYER
-  NAME "_estadosbr" # ok
-  TYPE line
-  STATUS DEFAULT
-  DATA "/var/www/i3geo/aplicmap/dados/estados.shp"
-  TEMPLATE "none.htm"
-	METADATA
-		"TEMA" "Limite Estadual"
-		"CLASSE" "SIM"
-		"permiteogc"	"sim"
-	END
-  CLASS
-	  NAME ""
-	  STYLE
-          COLOR 0 0 0
-	  END
-  END  # CLASS
-END  # LAYER
-END
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolosv6.sym"
+  LAYER
+    DATA "/var/www/i3geo/aplicmap/dados/estados.shp"
+    METADATA
+      "CLASSE"	"SIM"
+      "permitekmz"	"SIM"
+      "permitedownload"	"SIM"
+      "METAESTAT"	""
+      "permitekml"	"SIM"
+      "permiteogc"	"SIM"
+      "TEMA"	"Limite Estadualx"
+    END # METADATA
+    NAME "_estadosbr"
+    STATUS DEFAULT
+    TEMPLATE "none.htm"
+    TILEITEM "location"
+    TYPE LINE
+    UNITS METERS
+    CLASS
+      NAME ""
+      STYLE
+        COLOR 0 0 0
+      END # STYLE
+    END # CLASS
+  END # LAYER
+
+END # MAP
+
diff --git a/temas/aaaaaa.map b/temas/aaaaaa.map
new file mode 100644
index 0000000..f1cfa53
--- /dev/null
+++ b/temas/aaaaaa.map
@@ -0,0 +1,27 @@
+MAP
+SYMBOLSET ../symbols/simbolosv6.sym
+FONTSET   "../symbols/fontes.txt"
+LAYER
+	NAME "aaaaaa"
+	TEMPLATE "none.htm"
+	TYPE line
+	DATA ""
+	CONNECTION ""
+	STATUS DEFAULT
+	METADATA
+		TEMA "çççççç"
+		CLASSE "SIM"
+		permiteogc "SIM"
+		permitedownload "SIM"
+		permitekml "SIM"
+		permitekmz "SIM"
+	END
+    CLASS
+        NAME ""
+        STYLE
+        	COLOR 0 0 0
+        	SIZE 12
+        END
+    END
+END
+END
--
libgit2 0.21.2