From a112a114f41bcb9439d217cb689393d889c68574 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 15 Aug 2012 05:00:59 +0000
Subject: [PATCH] Complementação do módulo de cadastro de variáveis

---
 admin/admin.db                       | Bin 122880 -> 0 bytes
 admin/html/estat_conexao.html        |   36 ++++++++++++++++++++----------------
 admin/html/estat_fonteinfo.html      |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin/html/estat_tipo_periodo.html   |   33 +++++++++++++++++----------------
 admin/html/estat_tipo_regiao.html    |   48 ++++++++++++++++++++++++++----------------------
 admin/html/estat_unidade_medida.html |   47 +++++++++++++++++++++++++----------------------
 admin/index.html                     |    8 ++++++++
 admin/js/core.js                     |    3 ++-
 admin/js/estat_fonteinfo.js          |  159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin/js/estat_variavel.js           |  265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
 admin/php/admin.php                  |    6 ++++++
 admin/php/classe_metaestat.php       |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 admin/php/metaestat.php              |   71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 admin/sql/metaestat.sql              |  104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
 admin/sql/metaestat_basededados.sql  |   12 ++++++++++++
 documentacao/diagramas/metaestat.erm | 2012 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 16 files changed, 2237 insertions(+), 784 deletions(-)
 create mode 100755 admin/html/estat_fonteinfo.html
 create mode 100755 admin/js/estat_fonteinfo.js

diff --git a/admin/admin.db b/admin/admin.db
index ef2c138..d0ed35e 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/html/estat_conexao.html b/admin/html/estat_conexao.html
index 40e239b..cb08607 100755
--- a/admin/html/estat_conexao.html
+++ b/admin/html/estat_conexao.html
@@ -16,29 +16,31 @@ body {
 </style>
 <script type="text/javascript" src="../js/core.js"></script>
 <script type="text/javascript" src="../js/estat_conexao.js"></script>
+<link rel="stylesheet" type="text/css" href="admin.css">
+
 </head>
-<body class=" yui-skin-sam">
-	<div style="margin: 20px">
-		<div id=cabecalhoPrincipal style="width: 80%; text-align: left;">
-		</div>
-		<div style="width: 80%; text-align: center;">
-			<h1>
-				Metadados estat&iacute;sticos - cadastro de conex&otilde;es com banco de dados <img
-					src="../imagens/04.png" style="cursor: pointer" id=botaoAjuda />
-			</h1>
+<body class=" yui-skin-sam fundoPonto">
+	<div class="bordaSuperior">&nbsp;</div>
+	<div class="mascaraPrincipal" id="divGeral">
+		<div id=cabecalhoPrincipal></div>
+		<h1>
+			Metadados estat&iacute;sticos - cadastro de conex&otilde;es com banco
+			de dados <img src="../imagens/04.png" style="cursor: pointer"
+				id=botaoAjuda />
+		</h1>
 
-		</div>
 		<div id="formulario" style="display: none">
 			<div id="ajuda" style="display: none">
 				<div class="hd">Ajuda</div>
 				<div class="bd" style="height: 144px; overflow: auto">
-					<p>Este formul&aacute;rio permite editar a lista de conex&otilde;es que s&atilde;o mostradas nos formul&aacute;rios do sistema de metadados estat&iacute;sticos
+					<p>Este formul&aacute;rio permite editar a lista de
+						conex&otilde;es que s&atilde;o mostradas nos formul&aacute;rios do
+						sistema de metadados estat&iacute;sticos
 				</div>
 				<div class="ft"></div>
 			</div>
-			<br>
-			<input type=button id=adicionaNovaLinha value="Adicionar um novo registro"
-				style="left: -5px;" />
+			<br> <input type=button id=adicionaNovaLinha
+				value="Adicionar um novo registro" style="left: -5px;" />
 			<p>
 				<br>
 			<div id="tabela" style="left: -5px;"></div>
@@ -75,7 +77,9 @@ body {
 
 		 i3geo/admin/html/estat_conexao.html
 		 */
-
+		if (screen.availWidth > 700) {
+			document.getElementById("divGeral").style.width = "700px";
+		}
 		//necessario para a ferramenta login e outras
 		i3GEO.configura = {
 			locaplic : "../.."
@@ -89,6 +93,6 @@ body {
 			initEditor();
 		};
 		i3GEO.login.verificaOperacao("admin/html/menus",i3GEO.configura.locaplic, temp, "sessao");
-		*/
+		 */
 	</script>
 </body>
\ No newline at end of file
diff --git a/admin/html/estat_fonteinfo.html b/admin/html/estat_fonteinfo.html
new file mode 100755
index 0000000..51dfac0
--- /dev/null
+++ b/admin/html/estat_fonteinfo.html
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<title>Fonte</title>
+<style type="text/css">
+/*margin and padding on body element
+          can introduce errors in determining
+          element position and are not recommended;
+          we turn them off as a foundation for YUI
+          CSS treatments. */
+body {
+	margin: 0;
+	padding: 0;
+}
+</style>
+<script type="text/javascript" src="../js/core.js"></script>
+<script type="text/javascript" src="../js/estat_fonteinfo.js"></script>
+<link rel="stylesheet" type="text/css" href="admin.css">
+</head>
+<body class=" yui-skin-sam fundoPonto">
+	<center>
+		<div class="bordaSuperior">&nbsp;</div>
+		<div class="mascaraPrincipal" id="divGeral">
+			<div id=cabecalhoPrincipal></div>
+			<h1>
+				Metadados estat&iacute;sticos - Fonte <img src="../imagens/04.png"
+					style="cursor: pointer" id=botaoAjuda />
+			</h1>
+			<div id="formulario" style="display: none">
+				<div id="ajuda" style="display: none">
+					<div class="hd">Ajuda</div>
+					<div class="bd" style="height: 144px; overflow: auto">
+						<p>Este formul&aacute;rio permite editar a lista de fontes que
+							s&atilde;o mostradas nos formul&aacute;rios do sistema de
+							metadados estat&iacute;sticos
+					</div>
+					<div class="ft"></div>
+				</div>
+				<br> <input type=button id=adicionaNovaLinha
+					value="Adicionar um novo registro" style="left: -5px;" />
+				<p>
+					<br>
+				<div id="tabela" style="left: -5px;"></div>
+			</div>
+		</div>
+	</center>
+	<div id=logajax style="display: block"></div>
+	<script>
+		/*
+		 Title: Editor da lista de fontes do sistema de metadados estat&iacute;sticos
+
+		 Licenca:
+
+		 GPL2
+
+		 i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
+
+		 Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil
+		 Desenvolvedor: Edmar Moretti edmar.moretti@mma.gov.br
+
+		 Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo
+		 e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a P&uacute;blica Geral
+		 GNU conforme publicada pela Free Software Foundation;
+
+		 Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til,
+		 por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a garantia impl&iacute;cita
+		 de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA.
+		 Consulte a Licen&ccedil;a P&uacute;blica Geral do GNU para mais detalhes.
+		 Voc&ecirc; deve ter recebido uma cópia da Licen&ccedil;a P&uacute;blica Geral do
+		 GNU junto com este programa; se n&atilde;o, escreva para a
+		 Free Software Foundation, Inc., no endere&ccedil;o
+		 59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
+
+		 Arquivo:
+
+		 i3geo/admin/html/estat_fonteinfo.html
+		 */
+		if (screen.availWidth > 700) {
+			document.getElementById("divGeral").style.width = "700px";
+		}
+		//necessario para a ferramenta login e outras
+		i3GEO.configura = {
+			locaplic : "../.."
+		};
+		cabecalhoMetaestat("cabecalhoPrincipal", "fonteinfo");
+		document.getElementById("formulario").style.display = "block";
+		initEditor();
+		/*
+		temp = function() {
+			document.getElementById("formulario").style.display = "block";
+			initEditor();
+		};
+		i3GEO.login.verificaOperacao("admin/html/menus",i3GEO.configura.locaplic, temp, "sessao");
+		 */
+	</script>
+</body>
\ No newline at end of file
diff --git a/admin/html/estat_tipo_periodo.html b/admin/html/estat_tipo_periodo.html
index 2e18c74..29f4cb6 100755
--- a/admin/html/estat_tipo_periodo.html
+++ b/admin/html/estat_tipo_periodo.html
@@ -16,29 +16,28 @@ body {
 </style>
 <script type="text/javascript" src="../js/core.js"></script>
 <script type="text/javascript" src="../js/estat_tipo_periodo.js"></script>
+<link rel="stylesheet" type="text/css" href="admin.css">
 </head>
 <body class=" yui-skin-sam">
-	<div style="margin: 20px">
-		<div id=cabecalhoPrincipal style="width: 80%; text-align: left;">
-		</div>
-		<div style="width: 80%; text-align: center;">
-			<h1>
-				Metadados estat&iacute;sticos - Unidades de medida <img
-					src="../imagens/04.png" style="cursor: pointer" id=botaoAjuda />
-			</h1>
-
-		</div>
+	<div class="bordaSuperior">&nbsp;</div>
+	<div class="mascaraPrincipal" id="divGeral">
+		<div id=cabecalhoPrincipal></div>
+		<h1>
+			Metadados estat&iacute;sticos - Unidades de medida <img
+				src="../imagens/04.png" style="cursor: pointer" id=botaoAjuda />
+		</h1>
 		<div id="formulario" style="display: none">
 			<div id="ajuda" style="display: none">
 				<div class="hd">Ajuda</div>
 				<div class="bd" style="height: 144px; overflow: auto">
-					<p>Este formul&aacute;rio permite editar a lista de per&iacute;odos de tempo que s&atilde;o mostradas nos formul&aacute;rios do sistema de metadados estat&iacute;sticos
+					<p>Este formul&aacute;rio permite editar a lista de
+						per&iacute;odos de tempo que s&atilde;o mostradas nos
+						formul&aacute;rios do sistema de metadados estat&iacute;sticos
 				</div>
 				<div class="ft"></div>
 			</div>
-			<br>
-			<input type=button id=adicionaNovaLinha value="Adicionar um novo registro"
-				style="left: -5px;" />
+			<br> <input type=button id=adicionaNovaLinha
+				value="Adicionar um novo registro" style="left: -5px;" />
 			<p>
 				<br>
 			<div id="tabela" style="left: -5px;"></div>
@@ -75,7 +74,9 @@ body {
 
 		 i3geo/admin/html/estat_tipo_periodo.html
 		 */
-
+		if (screen.availWidth > 700) {
+			document.getElementById("divGeral").style.width = "700px";
+		}
 		//necessario para a ferramenta login e outras
 		i3GEO.configura = {
 			locaplic : "../.."
@@ -89,6 +90,6 @@ body {
 			initEditor();
 		};
 		i3GEO.login.verificaOperacao("admin/html/menus",i3GEO.configura.locaplic, temp, "sessao");
-		*/
+		 */
 	</script>
 </body>
\ No newline at end of file
diff --git a/admin/html/estat_tipo_regiao.html b/admin/html/estat_tipo_regiao.html
index 092fc78..b51b5a7 100755
--- a/admin/html/estat_tipo_regiao.html
+++ b/admin/html/estat_tipo_regiao.html
@@ -16,34 +16,38 @@ body {
 </style>
 <script type="text/javascript" src="../js/core.js"></script>
 <script type="text/javascript" src="../js/estat_tipo_regiao.js"></script>
+<link rel="stylesheet" type="text/css" href="admin.css">
 </head>
-<body class=" yui-skin-sam">
-	<div style="margin: 20px">
-		<div id=cabecalhoPrincipal style="width: 80%; text-align: left;">
-		</div>
-		<div style="width: 80%; text-align: center;">
+<body class=" yui-skin-sam fundoPonto">
+	<center>
+		<div class="bordaSuperior">&nbsp;</div>
+		<div class="mascaraPrincipal" id="divGeral">
+			<div id=cabecalhoPrincipal></div>
 			<h1>
-				Metadados estat&iacute;sticos - cadastro de tabelas de regi&otilde;es geogr&aacute;ficas <img
-					src="../imagens/04.png" style="cursor: pointer" id=botaoAjuda />
+				Metadados estat&iacute;sticos - cadastro de tabelas de
+				regi&otilde;es geogr&aacute;ficas <img src="../imagens/04.png"
+					style="cursor: pointer" id=botaoAjuda />
 			</h1>
 
-		</div>
-		<div id="formulario" style="display: none">
-			<div id="ajuda" style="display: none">
-				<div class="hd">Ajuda</div>
-				<div class="bd" style="height: 144px; overflow: auto">
-					<p>Este formul&aacute;rio permite editar a lista de conex&otilde;es que s&atilde;o mostradas nos formul&aacute;rios do sistema de metadados estat&iacute;sticos
+
+			<div id="formulario" style="display: none">
+				<div id="ajuda" style="display: none">
+					<div class="hd">Ajuda</div>
+					<div class="bd" style="height: 144px; overflow: auto">
+						<p>Este formul&aacute;rio permite editar a lista de
+							conex&otilde;es que s&atilde;o mostradas nos formul&aacute;rios
+							do sistema de metadados estat&iacute;sticos
+					</div>
+					<div class="ft"></div>
 				</div>
-				<div class="ft"></div>
+				<br> <input type=button id=adicionaNovaLinha
+					value="Adicionar um novo registro" style="left: -5px;" />
+				<p>
+					<br>
+				<div id="tabela" style="left: -5px;"></div>
 			</div>
-			<br>
-			<input type=button id=adicionaNovaLinha value="Adicionar um novo registro"
-				style="left: -5px;" />
-			<p>
-				<br>
-			<div id="tabela" style="left: -5px;"></div>
 		</div>
-	</div>
+	</center>
 	<div id=logajax style="display: block"></div>
 	<script>
 		/*
@@ -89,6 +93,6 @@ body {
 			initEditor();
 		};
 		i3GEO.login.verificaOperacao("admin/html/menus",i3GEO.configura.locaplic, temp, "sessao");
-		*/
+		 */
 	</script>
 </body>
\ No newline at end of file
diff --git a/admin/html/estat_unidade_medida.html b/admin/html/estat_unidade_medida.html
index ecd6606..ddea3be 100755
--- a/admin/html/estat_unidade_medida.html
+++ b/admin/html/estat_unidade_medida.html
@@ -16,34 +16,35 @@ body {
 </style>
 <script type="text/javascript" src="../js/core.js"></script>
 <script type="text/javascript" src="../js/estat_unidade_medida.js"></script>
+<link rel="stylesheet" type="text/css" href="admin.css">
 </head>
-<body class=" yui-skin-sam">
-	<div style="margin: 20px">
-		<div id=cabecalhoPrincipal style="width: 80%; text-align: left;">
-		</div>
-		<div style="width: 80%; text-align: center;">
+<body class=" yui-skin-sam fundoPonto">
+	<center>
+		<div class="bordaSuperior">&nbsp;</div>
+		<div class="mascaraPrincipal" id="divGeral">
+			<div id=cabecalhoPrincipal></div>
 			<h1>
 				Metadados estat&iacute;sticos - Unidades de medida <img
 					src="../imagens/04.png" style="cursor: pointer" id=botaoAjuda />
 			</h1>
-
-		</div>
-		<div id="formulario" style="display: none">
-			<div id="ajuda" style="display: none">
-				<div class="hd">Ajuda</div>
-				<div class="bd" style="height: 144px; overflow: auto">
-					<p>Este formul&aacute;rio permite editar a lista de unidades de medida que s&atilde;o mostradas nos formul&aacute;rios do sistema de metadados estat&iacute;sticos
+			<div id="formulario" style="display: none">
+				<div id="ajuda" style="display: none">
+					<div class="hd">Ajuda</div>
+					<div class="bd" style="height: 144px; overflow: auto">
+						<p>Este formul&aacute;rio permite editar a lista de unidades
+							de medida que s&atilde;o mostradas nos formul&aacute;rios do
+							sistema de metadados estat&iacute;sticos
+					</div>
+					<div class="ft"></div>
 				</div>
-				<div class="ft"></div>
+				<br> <input type=button id=adicionaNovaLinha
+					value="Adicionar um novo registro" style="left: -5px;" />
+				<p>
+					<br>
+				<div id="tabela" style="left: -5px;"></div>
 			</div>
-			<br>
-			<input type=button id=adicionaNovaLinha value="Adicionar um novo registro"
-				style="left: -5px;" />
-			<p>
-				<br>
-			<div id="tabela" style="left: -5px;"></div>
 		</div>
-	</div>
+	</center>
 	<div id=logajax style="display: block"></div>
 	<script>
 		/*
@@ -75,7 +76,9 @@ body {
 
 		 i3geo/admin/html/estat_unidade_medida.html
 		 */
-
+		if (screen.availWidth > 700) {
+			document.getElementById("divGeral").style.width = "700px";
+		}
 		//necessario para a ferramenta login e outras
 		i3GEO.configura = {
 			locaplic : "../.."
@@ -89,6 +92,6 @@ body {
 			initEditor();
 		};
 		i3GEO.login.verificaOperacao("admin/html/menus",i3GEO.configura.locaplic, temp, "sessao");
-		*/
+		 */
 	</script>
 </body>
\ No newline at end of file
diff --git a/admin/index.html b/admin/index.html
index b12eba1..f4cc8db 100644
--- a/admin/index.html
+++ b/admin/index.html
@@ -179,6 +179,14 @@
 							<td><div class=aplicar></div></td>
 							<td>Cadastro de tabelas com regi&otilde;es geogr&aacute;ficas</td>
 						</tr>
+						<tr onclick="abre('html/estat_links.html')">
+							<td><div class=aplicar></div></td>
+							<td>Cadastro de links</td>
+						</tr>
+						<tr onclick="abre('html/estat_fonteinfo.html')">
+							<td><div class=aplicar></div></td>
+							<td>Cadastro de fontes de informa&ccedil;&atilde;o</td>
+						</tr>
 					</table>
 				</div>
 			</fieldset>
diff --git a/admin/js/core.js b/admin/js/core.js
index 3f58aa4..c2ba3d0 100644
--- a/admin/js/core.js
+++ b/admin/js/core.js
@@ -73,9 +73,10 @@ function cabecalhoMetaestat(id,excluir){
 			{id:"principal",titulo:"In&iacute;cio",link:"../index.html"},
 			{id:"arvore",titulo:"&Aacute;rvore completa",link:"estat_variavel.html"},
 			{id:"unidade_medida",titulo:"Unidades de medida",link:"estat_unidade_medida.html"},
-			{id:"periodo_tempo",titulo:"Per&iacute;odos de tempo",link:"estat_tipo_periodo.html"},
+			{id:"periodo_tempo",titulo:"Per&iacute;odos",link:"estat_tipo_periodo.html"},
 			{id:"conexao",titulo:"Conex&otilde;es",link:"estat_conexao.html"},
 			{id:"tipo_regiao",titulo:"Regi&otilde;es",link:"estat_tipo_regiao.html"},
+			{id:"fonteinfo",titulo:"Fonte",link:"estat_fonteinfo.html"},
 			{id:"login",titulo:"Login",js:"i3GEO.login.dialogo.abreLogin()"}
 		];
 	n = botoes.length;
diff --git a/admin/js/estat_fonteinfo.js b/admin/js/estat_fonteinfo.js
new file mode 100755
index 0000000..586b6d4
--- /dev/null
+++ b/admin/js/estat_fonteinfo.js
@@ -0,0 +1,159 @@
+function initEditor(){
+	YAHOO.namespace("admin.container");
+	core_ativaBotaoAdicionaLinha("../php/metaestat.php?funcao=alterarFonteinfo","adicionaNovaLinha","pegaDados");
+	pegaDados();
+}
+function pegaDados(){
+	core_carregando("ativa");
+	core_pegaDados("buscando dados...","../php/metaestat.php?funcao=listaFonteinfo","montaTabela");
+}
+function montaTabela(dados){
+	YAHOO.example.InlineCellEditing = new function()	{
+		// Custom formatter for "address" column to preserve line breaks
+		var formatTexto = function(elCell, oRecord, oColumn, oData){
+			if(oData === ""){
+				oData = "<span style='color:gray' ></span>";
+			}
+			elCell.innerHTML = "<pre ><p style=cursor:pointer title='clique para editar'>" + oData + "</pre>";
+		},
+		formatExclui = function(elCell, oRecord, oColumn){
+			elCell.innerHTML = "<div class=excluir title='exclui' style='text-align:center' ></div>";
+		},
+		formatMais = function(elCell, oRecord, oColumn){
+			elCell.innerHTML = "<div class=editar style='text-align:center' ></div>";
+		},
+		myColumnDefs = [
+		                {key:"excluir",label:"excluir",formatter:formatExclui},
+		                {key:"mais",label:"editar",formatter:formatMais},
+		                {label:"Id",resizeable:true,key:"id_fonteinfo", formatter:formatTexto,editor:new YAHOO.widget.TextboxCellEditor({disableBtns:true})},
+		                {label:"T&iacute;tulo",resizeable:true,key:"titulo", formatter:formatTexto,editor:new YAHOO.widget.TextboxCellEditor({disableBtns:true})},
+		                {label:"Link",resizeable:true,key:"link", formatter:formatTexto,editor:new YAHOO.widget.TextboxCellEditor({disableBtns:true})}
+		                ];
+		myDataSource = new YAHOO.util.DataSource(dados);
+		myDataTable = new YAHOO.widget.DataTable("tabela", myColumnDefs, myDataSource);
+
+		myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSARRAY;
+		myDataSource.responseSchema = {
+				fields: ["id_fonteinfo","titulo","link"]
+		};
+		myDataTable.subscribe(
+			'cellClickEvent',
+			function(ev){
+				var record,$clicouId,$recordid,sUrl,callback,
+				target = YAHOO.util.Event.getTarget(ev),
+				column = this.getColumn(target);
+				if(YAHOO.admin.container.panelCK){
+					YAHOO.admin.container.panelCK.destroy();
+					YAHOO.admin.container.panelCK = null;
+				}
+				if (column.key == 'excluir'){
+					record = this.getRecord(target);
+					excluiLinha(record.getData('id_fonteinfo'),target);
+				}
+				if (column.key == 'mais'){
+					record = this.getRecord(target);
+					core_carregando("ativa");
+					core_carregando("buscando dados...");
+					$clicouId = record.getData('id_fonteinfo');
+					$recordid = record.getId();
+					sUrl = "../php/metaestat.php?funcao=listaFonteinfo&id_fonteinfo="+record.getData('id_fonteinfo');
+					callback = {
+							success:function(o){
+								try{
+									montaEditor(YAHOO.lang.JSON.parse(o.responseText),$clicouId,$recordid);
+								}
+								catch(e){core_handleFailure(e,o.responseText);}
+							},
+							failure:core_handleFailure,
+							argument: { foo:"foo", bar:"bar" }
+					};
+					core_makeRequest(sUrl,callback);
+				}
+			}
+		);
+	};
+	core_carregando("desativa");
+}
+function montaEditor(dados,id,recordid){
+	function on_editorCheckBoxChange(p_oEvent){
+		if(p_oEvent.newValue.get("value") == "OK"){
+			gravaDados(id,recordid);
+		}
+		YAHOO.admin.container.panelEditor2.destroy();
+		YAHOO.admin.container.panelEditor2 = null;
+	};
+	if(!$i("janela_editor2")){
+		var ins,editorBotoes,
+			novoel = document.createElement("div");
+
+		novoel.id =  "janela_editor2";
+		ins = '<div class="hd">Editor</div>';
+		ins += "<div class='bd' style='height:354px;overflow:auto'>";
+		ins += "<div id='okcancel_checkbox2'></div><div id='editor_bd2'></div>";
+		novoel.innerHTML = ins;
+		document.body.appendChild(novoel);
+		editorBotoes = new YAHOO.widget.ButtonGroup({id:"okcancel_checkbox_id2", name:  "okcancel_checkbox_id2", container:  "okcancel_checkbox2" });
+		editorBotoes.addButtons([
+		                         { label: "Salva", value: "OK", checked: false},
+		                         { label: "Cancela", value: "CANCEL", checked: false }
+		                         ]);
+		editorBotoes.on("checkedButtonChange", on_editorCheckBoxChange);
+		YAHOO.admin.container.panelEditor2 = new YAHOO.widget.Panel("janela_editor2", { fixedcenter:true,close:false,width:"400px", height:"380px",overflow:"auto", visible:false,constraintoviewport:true } );
+		YAHOO.admin.container.panelEditor2.render();
+	}
+	YAHOO.admin.container.panelEditor2.show();
+	$i("editor_bd2").innerHTML = montaDiv(dados);
+	core_carregando("desativa");
+}
+function montaDiv(i){
+	var param = {
+			"linhas":[{
+				titulo:"T&iacute;tulo:",id:"Etitulo",size:"50",value:i.titulo,tipo:"text",div:""
+			},{
+				titulo:"Link:",id:"Elink",size:"50",value:i.link,tipo:"text",div:""
+			}]
+		},
+		ins = "";
+
+	ins += core_geraLinhas(param);
+	return(ins);
+}
+function gravaDados(id,recordid){
+	var campos = new Array("titulo","link"),
+		par = "",
+		i = 0,
+		sUrl,callback;
+
+	for (i=0;i<campos.length;i++){
+		par += "&"+campos[i]+"="+($i("E"+campos[i]).value);
+	}
+	par += "&id_fonteinfo="+id;
+	core_carregando("ativa");
+	core_carregando(" gravando o registro do id= "+id);
+	sUrl = "../php/metaestat.php?funcao=alterarFonteinfo"+par;
+	callback = {
+			success:function(o){
+				try	{
+					if(YAHOO.lang.JSON.parse(o.responseText) == "erro")	{
+						core_carregando("<span style=color:red >N&atilde;o foi poss&iacute;vel excluir. Verifique se n&atilde;o existem registros vinculados</span>");
+						setTimeout("core_carregando('desativa')",3000);
+					}
+					else{
+						var rec = myDataTable.getRecordSet().getRecord(recordid);
+						myDataTable.updateRow(rec,YAHOO.lang.JSON.parse(o.responseText));
+						core_carregando("desativa");
+					}
+				}
+				catch(e){core_handleFailure(e,o.responseText);}
+			},
+			failure:core_handleFailure,
+			argument: { foo:"foo", bar:"bar" }
+	};
+	core_makeRequest(sUrl,callback);
+}
+function excluiLinha(id,row){
+	var mensagem = " excluindo o registro do id= "+id,
+		sUrl = "../php/metaestat.php?funcao=excluirFonteinfo&id_fonteinfo="+id;
+	core_excluiLinha(sUrl,row,mensagem);
+}
+//YAHOO.util.Event.addListener(window, "load", initMenu);
\ No newline at end of file
diff --git a/admin/js/estat_variavel.js b/admin/js/estat_variavel.js
index 7f22852..8f7c55a 100755
--- a/admin/js/estat_variavel.js
+++ b/admin/js/estat_variavel.js
@@ -135,7 +135,7 @@ Mostra os nós de uma medida
 */
 function adicionaNosMedidas(no,dados,redesenha)
 {
-	var tempNode,tempNode1,tempNode2,i,conteudo,d,j;
+	var tempNode,tempNode1,tempNode2,tempNode3,tempNode4,tempNode5,i,conteudo,d,j;
 	function temaIconMode(){
 		var newVal = parseInt(this.value);
 		if (newVal != currentIconMode)
@@ -160,7 +160,7 @@ function adicionaNosMedidas(no,dados,redesenha)
         	};
         YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
     };
-    function loadNodeData1(node, fnLoadComplete){
+    function loadNodeDataClasses(node, fnLoadComplete){
     	var sUrl = "../php/metaestat.php?funcao=listaClassificacaoMedida&id_medida_variavel="+node.data.no_classificacao,
 			callback = {
 	            success: function(oResponse){
@@ -179,6 +179,44 @@ function adicionaNosMedidas(no,dados,redesenha)
         	};
         YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
     };
+    function loadNodeDataLinks(node, fnLoadComplete){
+    	var sUrl = "../php/metaestat.php?funcao=listaLinkMedida&id_medida_variavel="+node.data.no_link,
+			callback = {
+	            success: function(oResponse){
+	                var dados = YAHOO.lang.JSON.parse(oResponse.responseText);
+					adicionaNosLink(node,dados,false);
+	                oResponse.argument.fnLoadComplete();
+	            },
+	            failure: function(oResponse){
+	                oResponse.argument.fnLoadComplete();
+	            },
+	            argument:{
+	                "node": node,
+	                "fnLoadComplete": fnLoadComplete
+	            },
+	            timeout: 25000
+        	};
+        YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
+    };
+    function loadNodeDataFonteinfo(node, fnLoadComplete){
+    	var sUrl = "../php/metaestat.php?funcao=listaFonteinfoMedida&id_medida_variavel="+node.data.no_fonteinfo,
+			callback = {
+	            success: function(oResponse){
+	            	var dados = YAHOO.lang.JSON.parse(oResponse.responseText);
+					adicionaNosFonteinfo(node,dados,false);
+	                oResponse.argument.fnLoadComplete();
+	            },
+	            failure: function(oResponse){
+	                oResponse.argument.fnLoadComplete();
+	            },
+	            argument:{
+	                "node": node,
+	                "fnLoadComplete": fnLoadComplete
+	            },
+	            timeout: 25000
+        	};
+        YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
+    };
     if(!redesenha && !(tree.getNodeByProperty("etiqueta_adiciona_variavel",no.data.codigo_variavel))){
 		tempNode = new YAHOO.widget.HTMLNode(
 				{
@@ -213,7 +251,17 @@ function adicionaNosMedidas(no,dados,redesenha)
 		d = {html:conteudo,no_classificacao:dados[i].id_medida_variavel};
 		tempNode3 = new YAHOO.widget.HTMLNode(d, tempNode1, false,true);
 		tempNode3.isLeaf = false;
-		tempNode3.setDynamicLoad(loadNodeData1, 1);
+		tempNode3.setDynamicLoad(loadNodeDataClasses, 1);
+		conteudo = "&nbsp;Links";
+		d = {html:conteudo,no_link:dados[i].id_medida_variavel};
+		tempNode4 = new YAHOO.widget.HTMLNode(d, tempNode1, false,true);
+		tempNode4.isLeaf = false;
+		tempNode4.setDynamicLoad(loadNodeDataLinks, 1);
+		conteudo = "&nbsp;Fontes";
+		d = {html:conteudo,no_fonteinfo:dados[i].id_medida_variavel};
+		tempNode5 = new YAHOO.widget.HTMLNode(d, tempNode1, false,true);
+		tempNode5.isLeaf = false;
+		tempNode5.setDynamicLoad(loadNodeDataFonteinfo, 1);
 	}
 
 	if(redesenha){tree.draw();}
@@ -346,7 +394,77 @@ function adicionaNosClasses(no,dados,redesenha){
 	}
 	if(redesenha){tree.draw();}
 }
+/*
+Function: adicionaNosLink
+
+Mostra os nós de links
+*/
+function adicionaNosLink(no,dados,redesenha){
+	var tempNode,i,j,conteudo,d;
+	function temaIconMode()	{
+		var newVal = parseInt(this.value);
+		if (newVal != currentIconMode)
+		{currentIconMode = newVal;}
+	}
+    if(!redesenha)    {
+		tempNode = new YAHOO.widget.HTMLNode(
+				{
+					html:"<span style=\"cursor:pointer;\" onclick=\"adicionarLinkMedida('"+no.data.no_link+"')\" ><img style=\"position:relative;top:2px\" src=\"../imagens/05.png\" /><i>Adicionar novo link</i></span>"
+				},
+				no,
+				false,
+				true
+			);
+		tempNode.isLeaf = true;
+	}
+	for (i=0, j=dados.length; i<j; i++)	{
+		conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('linkMedida','"+dados[i].id_link+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />";
+		conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:2px\" onclick=\"editar('linkMedida','"+dados[i].id_link+"')\" title=editar src=\"../imagens/06.png\" /><b>";
+		if(dados[i].nome != "")
+		{conteudo += "&nbsp;<span><a href='"+dados[i].link+"' >"+dados[i].nome+"</a><span style=color:gray > - "+dados[i].link+" - id: "+dados[i].id_link+"</span></span>";}
+		else
+		{conteudo += "&nbsp;<span style=color:red >Edite para definir o novo link!!!</span>";}
+		d = {html:conteudo,id_link:dados[i].id_link,tipo:"link"};
+		tempNode = new YAHOO.widget.HTMLNode(d, no, false,true);
+		tempNode.isLeaf = true;
+	}
+	if(redesenha){tree.draw();}
+}
+/*
+Function: adicionaNosFonteinfo
 
+Mostra os nós de fontes
+*/
+function adicionaNosFonteinfo(no,dados,redesenha){
+	var tempNode,i,j,conteudo,d;
+	function temaIconMode()	{
+		var newVal = parseInt(this.value);
+		if (newVal != currentIconMode)
+		{currentIconMode = newVal;}
+	}
+    if(!redesenha)    {
+		tempNode = new YAHOO.widget.HTMLNode(
+				{
+					html:"<span style=\"cursor:pointer;\" onclick=\"editar('fonteinfo','"+no.data.no_fonteinfo+"')\" ><img style=\"position:relative;top:2px\" src=\"../imagens/05.png\" /><i>Adicionar nova fonte</i></span>"
+				},
+				no,
+				false,
+				true
+			);
+		tempNode.isLeaf = true;
+	}
+	for (i=0, j=dados.length; i<j; i++)	{
+		conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('fonteinfo','"+dados[i].id_fonteinfo+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />";
+		if(dados[i].titulo != "")
+		{conteudo += "&nbsp;<span><a href='"+dados[i].link+"' >"+dados[i].titulo+"</a><span style=color:gray > - "+dados[i].link+" - id: "+dados[i].id_fonteinfo+"</span></span>";}
+		else
+		{conteudo += "&nbsp;<span style=color:red >Edite para definir a nova fonte!!!</span>";}
+		d = {html:conteudo,id_medida_variavel_fonteinfo:no.data.no_fonteinfo,id_fonteinfo:dados[i].id_fonteinfo,tipo:"fonteinfo"};
+		tempNode = new YAHOO.widget.HTMLNode(d, no, false,true);
+		tempNode.isLeaf = true;
+	}
+	if(redesenha){tree.draw();}
+}
 function adicionaNosVariaveis(dados,redesenha){
 	var i,j,d,conteudo,
 		root = tree.getRoot();
@@ -450,6 +568,7 @@ function montaDivClassificacaoMedida(i){
 	ins += "<br><br><br>";
 	$i("editor_bd").innerHTML = ins;
 }
+
 function montaDivClasseClassificacao(i){
 	var ins = "",
 		param = {
@@ -471,6 +590,25 @@ function montaDivClasseClassificacao(i){
 	ins += "<br><br><br>";
 	$i("editor_bd").innerHTML = ins;
 }
+function montaDivLinkMedida(i){
+	var ins = "",
+		param = {
+			"linhas":[
+		          {titulo:"Nome:",id:"Enome",size:"50",value:i.nome,tipo:"text",div:""},
+		          {titulo:"Link:",id:"Elink",size:"50",value:i.link,tipo:"text",div:""}
+			]
+		};
+	ins += core_geraLinhas(param);
+	ins += "<br><br><br>";
+	$i("editor_bd").innerHTML = ins;
+}
+function montaDivFonteinfo(dados){
+	ins = "<br><b>Escolha a Fonte:</b><br><br>";
+	ins += "<select style='width:400px;' id='Eid_fonteinfo' >";
+	ins += core_comboObjeto(dadosAuxiliares.fonteinfo,"id_fonteinfo","titulo");
+	ins += "</select>";
+	$i("editor_bd").innerHTML = ins;
+}
 /*
 Function: adicionarMedidaVariavel
 
@@ -513,6 +651,34 @@ function adicionarDimensaoMedida(id_medida_variavel){
 		};
 	core_makeRequest(sUrl,callback);
 }
+function adicionarLinkMedida(id_medida_variavel){
+	var no = tree.getNodeByProperty("no_link",id_medida_variavel),
+		sUrl = "../php/metaestat.php?funcao=alteraLinkMedida&id_medida_variavel="+id_medida_variavel,
+		callback = 	{
+	    	success: function(oResponse){
+				var dados = YAHOO.lang.JSON.parse(oResponse.responseText);
+				adicionaNosLink(no,[dados],true);
+				editar('linkMedida',dados.id_link);
+			},
+	  		failure:core_handleFailure,
+	  		argument: { foo:"foo", bar:"bar" }
+		};
+	core_makeRequest(sUrl,callback);
+}
+function adicionarFonteinfoMedida(id_medida_variavel,id_fonteinfo){
+	var no = tree.getNodeByProperty("no_fonteinfo",id_medida_variavel),
+		sUrl = "../php/metaestat.php?funcao=alteraFonteinfo&id_medida_variavel="+id_medida_variavel,
+		callback = 	{
+	    	success: function(oResponse){
+				var dados = YAHOO.lang.JSON.parse(oResponse.responseText);
+				adicionaNosLink(no,[dados],true);
+				editar('fonteinfo',dados.id_fonteinfo);
+			},
+	  		failure:core_handleFailure,
+	  		argument: { foo:"foo", bar:"bar" }
+		};
+	core_makeRequest(sUrl,callback);
+}
 /*
 Function: adicionarClassificacaoMedida
 
@@ -568,31 +734,31 @@ function editar(tipo,id) {
 						dados = YAHOO.lang.JSON.parse(o.responseText);
 						core_montaEditor("gravaDados('variavel','"+id+"')","450px","200px","","Editor de vari&aacute;vel");
 						montaDivVariavel(dados);
-						//document.getElementById("Eid_variavel").style.width = "200px";
 					}
 					if(tipo == "medidaVariavel"){
 						dados = YAHOO.lang.JSON.parse(o.responseText);
 						core_montaEditor("gravaDados('medidaVariavel','"+id+"')","450px","200px","","Editor de medidas");
 						montaDivMedidaVariavel(dados);
-						//document.getElementById("Eid_variavel").style.width = "200px";
 					}
 					if(tipo == "dimensaoMedida"){
 						dados = YAHOO.lang.JSON.parse(o.responseText);
 						core_montaEditor("gravaDados('dimensaoMedida','"+id+"')","450px","200px","","Editor de dimens&oatilde;es");
 						montaDivDimensaoMedida(dados);
-						//document.getElementById("Eid_variavel").style.width = "200px";
 					}
 					if(tipo == "classificacaoMedida"){
 						dados = YAHOO.lang.JSON.parse(o.responseText);
 						core_montaEditor("gravaDados('classificacaoMedida','"+id+"')","450px","200px","","Editor de classifica&ccedil;&atilde;o");
 						montaDivClassificacaoMedida(dados);
-						//document.getElementById("Eid_variavel").style.width = "200px";
 					}
 					if(tipo == "classeClassificacao"){
 						dados = YAHOO.lang.JSON.parse(o.responseText);
 						core_montaEditor("gravaDados('classeClassificacao','"+id+"')","450px","200px","","Editor de classe");
 						montaDivClasseClassificacao(dados);
-						//document.getElementById("Eid_variavel").style.width = "200px";
+					}
+					if(tipo == "linkMedida"){
+						dados = YAHOO.lang.JSON.parse(o.responseText);
+						core_montaEditor("gravaDados('linkMedida','"+id+"')","450px","200px","","Editor de links");
+						montaDivLinkMedida(dados);
 					}
 					core_carregando("desativa");
 				}
@@ -616,6 +782,14 @@ function editar(tipo,id) {
 	if(tipo == "classeClassificacao"){
 		sUrl = "../php/metaestat.php?funcao=listaClasseClassificacao&id_classe="+id;
 	}
+	if(tipo == "linkMedida"){
+		sUrl = "../php/metaestat.php?funcao=listaLinkMedida&id_link="+id;
+	}
+	if(tipo == "fonteinfo"){
+		core_montaEditor("gravaDados('fonteinfo','"+id+"')","450px","200px","","Editor de fontes");
+		montaDivFonteinfo();
+		core_carregando("desativa");
+	}
 	if(sUrl){
 		core_makeRequest(sUrl,callback);
 	}
@@ -638,6 +812,7 @@ function sql(tipo,id) {
 						core_montaEditor("","480px","300px","","SQL");
 						ins = "<p><b>Select simples:</b> "+dados.sql;
 						ins += "<p><b>Mapserver:</b> "+dados.sqlmapserver;
+						ins += "<p><b>Última URL:</b><div id='ultimaUrl'></div> ";
 						ins += "<p><b>Colunas:</b> "+dados.colunas;
 						ins +="<p><input style='position:relative;top:2px' type='checkbox' id='incluirtodascolunas' />Incluir todas as colunas no resultado";
 						ins +="<p>Filtro opcional (exemplo: valor = 1)<br>";
@@ -660,54 +835,68 @@ function sql(tipo,id) {
 						$i("editor_bd").innerHTML = ins;
 						new YAHOO.widget.Button("sqljson");
 						document.getElementById("sqljson-button").onclick = function(){
-							var colunas = 0;
+							var u,colunas = 0;
 							if($i("incluirtodascolunas").checked === true){
 								colunas = 1;
 							}
-							window.open('../php/metaestat.php?funcao=dadosMedidaVariavel&formato=json&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&agruparpor="+$i("agruparsql").value);
+							u = i3GEO.configura.locaplic+'/admin/php/metaestat.php?funcao=dadosMedidaVariavel&formato=json&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&agruparpor="+$i("agruparsql").value;
+							$i("ultimaUrl").innerHTML = u;
+							window.open(u);
 						};
 						new YAHOO.widget.Button("sumarioestat");
 						$i("sumarioestat-button").onclick = function(){
-							window.open('../php/metaestat.php?funcao=sumarioMedidaVariavel&formato=json&id_medida_variavel='+id+"&agruparpor="+$i("agruparsql").value+"&filtro="+$i("filtrosql").value);
+							var u = i3GEO.configura.locaplic+'/admin/php/metaestat.php?funcao=sumarioMedidaVariavel&formato=json&id_medida_variavel='+id+"&agruparpor="+$i("agruparsql").value+"&filtro="+$i("filtrosql").value;
+							$i("ultimaUrl").innerHTML = u;
+							window.open(u);
 						};
 						new YAHOO.widget.Button("mapfileestat");
 						$i("mapfileestat-button").onclick = function(){
-							var colunas = 0;
+							var u,colunas = 0;
 							if($i("incluirtodascolunas").checked === true){
 								colunas = 1;
 							}
-							window.open('../php/metaestat.php?funcao=mapfileMedidaVariavel&formato=json&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value);
+							u = i3GEO.configura.locaplic+'/admin/php/metaestat.php?funcao=mapfileMedidaVariavel&formato=json&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value;
+							$i("ultimaUrl").innerHTML = u;
+							window.open(u);
 						};
 						new YAHOO.widget.Button("kmzestat");
 						$i("kmzestat-button").onclick = function(){
-							var colunas = 0;
+							var u,colunas = 0;
 							if($i("incluirtodascolunas").checked === true){
 								colunas = 1;
 							}
-							window.open('../php/metaestat.php?funcao=kmlmedidavariavel&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value+"&formato=kmz");
+							u = i3GEO.configura.locaplic+'/admin/php/metaestat.php?funcao=kmlmedidavariavel&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value+"&formato=kmz";
+							$i("ultimaUrl").innerHTML = u;
+							window.open(u);
 						};
 						new YAHOO.widget.Button("kmlestat");
 						$i("kmlestat-button").onclick = function(){
-							var colunas = 0;
+							var u,colunas = 0;
 							if($i("incluirtodascolunas").checked === true){
 								colunas = 1;
 							}
-							window.open('../php/metaestat.php?funcao=kmlmedidavariavel&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value+"&formato=kml");
+							u = i3GEO.configura.locaplic+'/admin/php/metaestat.php?funcao=kmlmedidavariavel&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value+"&formato=kml";
+							$i("ultimaUrl").innerHTML = u;
+							window.open(u);
 						};
 						new YAHOO.widget.Button("kml3destat");
 						$i("kml3destat-button").onclick = function(){
-							var colunas = 0;
+							var u,colunas = 0;
 							if($i("incluirtodascolunas").checked === true){
 								colunas = 1;
 							}
-							window.open('../php/metaestat.php?funcao=kmlmedidavariavel&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value+"&formato=kml3d");
+							u = i3GEO.configura.locaplic+'/admin/php/metaestat.php?funcao=kmlmedidavariavel&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value+"&formato=kml3d";
+							$i("ultimaUrl").innerHTML = u;
+							window.open(u);
 						};
 						new YAHOO.widget.Button("i3geoestat");
 						$i("i3geoestat-button").onclick = function(){
-							var sUrl,callback = 	{
+							var u,sUrl,callback = 	{
 							    	success: function(oResponse){
 										var dados = YAHOO.lang.JSON.parse(oResponse.responseText);
-										window.open("../../ms_criamapa.php?temasa="+dados.mapfile+"&layers="+dados.layer);
+										u = i3GEO.configura.locaplic+"/ms_criamapa.php?temasa="+dados.mapfile+"&layers="+dados.layer;
+										$i("ultimaUrl").innerHTML = u;
+										window.open(u);
 										core_carregando("desativa");
 									},
 							  		failure:core_handleFailure,
@@ -717,7 +906,7 @@ function sql(tipo,id) {
 							if($i("incluirtodascolunas").checked === true){
 								colunas = 1;
 							}
-							sUrl = '../php/metaestat.php?funcao=mapfileMedidaVariavel&formato=json&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value;
+							sUrl = i3GEO.configura.locaplic+'/admin/php/metaestat.php?funcao=mapfileMedidaVariavel&formato=json&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value;
 							core_carregando("ativa");
 							core_makeRequest(sUrl,callback);
 						};
@@ -847,6 +1036,14 @@ function excluir(tipo,id){
 		no = tree.getNodeByProperty("id_classe",id);
 		sUrl = "../php/metaestat.php?funcao=excluirClasseClassificacao&id_classe="+id;
 	}
+	if(tipo == "linkMedida")	{
+		no = tree.getNodeByProperty("id_link",id);
+		sUrl = "../php/metaestat.php?funcao=excluirLinkMedida&id_link="+id;
+	}
+	if(tipo == "fonteinfo")	{
+		no = tree.getNodeByProperty("id_fonteinfo",id);
+		sUrl = "../php/metaestat.php?funcao=excluirFonteinfoMedida&id_fonteinfo="+id+"&id_medida_variavel="+no.data.id_medida_variavel_fonteinfo;
+	}
 	if(sUrl)
 	{core_excluiNoTree(sUrl,no,mensagem);}
 }
@@ -890,7 +1087,16 @@ function gravaDados(tipo,id){
 		par = "&id_classe="+id;
 		prog = "../php/metaestat.php?funcao=alteraClasseClassificacao";
 	}
-
+	if(tipo == "linkMedida"){
+		campos = new Array("nome","link");
+		par = "&id_link="+id;
+		prog = "../php/metaestat.php?funcao=alteraLinkMedida";
+	}
+	if(tipo == "fonteinfo"){
+		campos = new Array("id_fonteinfo");
+		par = "&id_medida_variavel="+id;
+		prog = "../php/metaestat.php?funcao=adicionaFonteinfoMedida";
+	}
 	for (i=0;i<campos.length;i++)
 	{par += "&"+campos[i]+"="+($i("E"+campos[i]).value);}
 
@@ -933,6 +1139,19 @@ function gravaDados(tipo,id){
 						no.getContentEl().getElementsByTagName("span")[0].style.color = "";
   						no.html = no.getContentEl().innerHTML;
   					}
+  					if(tipo == "linkMedida"){
+  						no = tree.getNodeByProperty("id_link",id);
+  						no.getContentEl().getElementsByTagName("span")[0].innerHTML = "<a href='"+document.getElementById("Elink").value+"' >"+document.getElementById("Enome").value+"</a><span style=color:gray > - "+document.getElementById("Elink").value+" - id: "+id+"</span>";
+						no.getContentEl().getElementsByTagName("span")[0].style.color = "";
+  						no.html = no.getContentEl().innerHTML;
+  					}
+  					if(tipo == "fonteinfo"){
+  						no = tree.getNodeByProperty("no_fonteinfo",id);
+  						adicionaNosFonteinfo(no,[YAHOO.lang.JSON.parse(o.responseText)],true);
+  						//no.getContentEl().getElementsByTagName("span")[0].innerHTML = "<a href='"+document.getElementById("Elink").value+"' >"+document.getElementById("Etitulo").value+"</a><span style=color:gray > - "+document.getElementById("Elink").value+" - id: "+id+"</span>";
+						//no.getContentEl().getElementsByTagName("span")[0].style.color = "";
+  						//no.html = no.getContentEl().innerHTML;
+  					}
   					core_carregando("desativa");
   				}
 				YAHOO.admin.container.panelEditor.destroy();
diff --git a/admin/php/admin.php b/admin/php/admin.php
index 35b5818..a7fb81d 100644
--- a/admin/php/admin.php
+++ b/admin/php/admin.php
@@ -243,6 +243,12 @@ function verificaFilhos()
 			if(count($r) > 0)
 				$res = true;
 		}
+		if($tabela == "i3geoestat_fonteinfo")
+		{
+			$r = pegaDados("select * from ".$esquemaadmin."i3geoestat_fonteinfo_medida where id_fonteinfo=$id");
+			if(count($r) > 0)
+				$res = true;
+		}
 		if($tabela == "i3geoestat_variavel")
 		{
 			$r = pegaDados("select * from ".$esquemaadmin."i3geoestat_medida_variavel where codigo_variavel=$id");
diff --git a/admin/php/classe_metaestat.php b/admin/php/classe_metaestat.php
index 0e007c0..f535096 100755
--- a/admin/php/classe_metaestat.php
+++ b/admin/php/classe_metaestat.php
@@ -192,6 +192,16 @@ class Metaestat{
 			return "Error!: " . $e->getMessage();
 		}
 	}
+	function excluirFonteinfoMedida($id_medida_variavel,$id_fonteinfo)
+	{
+		try	{
+			$this->dbhw->query("DELETE from ".$this->esquemaadmin."i3geoestat_fonteinfo_medida WHERE id_medida_variavel = $id_medida_variavel and id_fonteinfo = $id_fonteinfo");
+			return "ok";
+		}
+		catch (PDOException $e)	{
+			return "Error!: " . $e->getMessage();
+		}
+	}
 	/*
 	 Function: sqlMedidaVariavel
 
@@ -509,6 +519,67 @@ class Metaestat{
 		}
 	}
 	/*
+	 Function: alteraLinkMedida
+
+	Altera um link
+
+	*/
+	function alteraLinkMedida($id_medida_variavel,$id_link="",$nome,$link){
+		try	{
+			if($id_link != ""){
+				if($this->convUTF){
+					$nome = utf8_encode($nome);
+				}
+				$this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_medida_variavel_link SET nome='$nome',link='$link' WHERE id_link = $id_link");
+				$retorna = $id_link;
+			}
+			else{
+				$retorna = $this->insertId("i3geoestat_medida_variavel_link","link","id_link");
+				if($retorna){
+					$this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_medida_variavel_link SET id_medida_variavel = $id_medida_variavel WHERE id_link = $retorna");
+				}
+			}
+			return $retorna;
+		}
+		catch (PDOException $e)	{
+			return "Error!: " . $e->getMessage();
+		}
+	}
+	/*
+	Function: alteraFonteinfo
+
+	Altera uma fonte
+
+	*/
+	function alteraFonteinfo($id_fonteinfo="",$titulo,$link){
+		try	{
+			if($id_fonteinfo != ""){
+				if($this->convUTF){
+					$titulo = utf8_encode($titulo);
+				}
+				$this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_fonteinfo SET titulo='$titulo',link='$link' WHERE id_fonteinfo = $id_fonteinfo");
+				$retorna = $id_fonteinfo;
+			}
+			else{
+				$retorna = $this->insertId("i3geoestat_fonteinfo","link","id_fonteinfo");
+			}
+			return $retorna;
+		}
+		catch (PDOException $e)	{
+			return "Error!: " . $e->getMessage();
+		}
+	}
+	/*
+	Function: adicinaFonteinfoMedida
+
+	Adiciona um fonte a uma medida
+
+	*/
+	function adicinaFonteinfoMedida($id_medida_variavel,$id_fonteinfo){
+		//echo "INSERT INTO ".$this->esquemaadmin."i3geoestat_fonteinfo_medida (id_medida_variavel,id_fonteinfo) VALUES ('$id_medida_variavel','$id_fonteinfo')";exit;
+		$this->dbhw->query("INSERT INTO ".$this->esquemaadmin."i3geoestat_fonteinfo_medida (id_medida_variavel,id_fonteinfo) VALUES ('$id_medida_variavel','$id_fonteinfo')");
+	}
+	/*
 	 Function: alteraUnidadeMedida
 
 	Altera uma medida de uma variavel ou cria uma nova
@@ -699,6 +770,35 @@ class Metaestat{
 		return $this->execSQL($sql,$codigo_unidade_medida);
 	}
 	/*
+	 Function: listaFonteinfo
+
+	Lista as fontes cadastradas ou uma unica unidade
+
+	*/
+	function listaFonteinfo($id_fonteinfo=""){
+		$sql = "select * from ".$this->esquemaadmin."i3geoestat_fonteinfo ";
+		if($id_fonteinfo != ""){
+			$sql .= "WHERE id_fonteinfo = $id_fonteinfo ";
+		}
+		$sql .= "ORDER BY titulo";
+		return $this->execSQL($sql,$id_fonteinfo);
+	}
+	/*
+	 Function: listaFonteinfoMedida
+
+	Lista as fontes cadastradas ou uma unica unidade
+
+	*/
+	function listaFonteinfoMedida($id_medida_variavel){
+		$sql = "SELECT i3geoestat_fonteinfo.* ";
+		$sql .= "FROM ".$this->esquemaadmin."i3geoestat_fonteinfo ";
+		$sql .= "INNER JOIN ".$this->esquemaadmin."i3geoestat_fonteinfo_medida ";
+		$sql .= "ON i3geoestat_fonteinfo.id_fonteinfo = i3geoestat_fonteinfo_medida.id_fonteinfo ";
+		$sql .= "WHERE i3geoestat_fonteinfo_medida.id_medida_variavel = $id_medida_variavel ";
+		$sql .= "ORDER BY titulo";
+		return $this->execSQL($sql,$id_fonteinfo);
+	}
+	/*
 	 Function: listaVariavel
 
 	Lista as variaveis cadastradas ou uma unica variavel
@@ -716,7 +816,7 @@ class Metaestat{
 		return $this->execSQL($sql,$codigo_variavel);
 	}
 	/*
-	 Function: listaClassificacaoMedida
+	Function: listaClassificacaoMedida
 
 	Lista as classificacoes de uma medida de uma variavel
 
@@ -734,6 +834,24 @@ class Metaestat{
 		return $this->execSQL($sql,$id_classificacao);
 	}
 	/*
+	 Function: listaLinkMedida
+
+	Lista os links de uma medida de uma variavel
+
+	Parametros:
+
+	$id_medida_variavel
+	*/
+	function listaLinkMedida($id_medida_variavel,$id_link=""){
+		if(!empty($id_medida_variavel)){
+			$sql = "SELECT * from ".$this->esquemaadmin."i3geoestat_medida_variavel_link WHERE id_medida_variavel = $id_medida_variavel";
+		}
+		if(!empty($id_link)){
+			$sql = "SELECT * from ".$this->esquemaadmin."i3geoestat_medida_variavel_link WHERE id_link = $id_link";
+		}
+		return $this->execSQL($sql,$id_link);
+	}
+	/*
 	 Function: listaClasseClassificacao
 
 	Lista as classes de uma classificacao
diff --git a/admin/php/metaestat.php b/admin/php/metaestat.php
index f14468d..1445d1b 100644
--- a/admin/php/metaestat.php
+++ b/admin/php/metaestat.php
@@ -104,6 +104,11 @@ switch (strtoupper($funcao))
 		retornaJSON($m->listaClassificacaoMedida($id_medida_variavel,$id_classificacao));
 		exit;
 	break;
+	case "LISTALINKMEDIDA":
+		$m = new Metaestat();
+		retornaJSON($m->listaLinkMedida($id_medida_variavel,$id_link));
+		exit;
+	break;
 	/*
 	 Valor: LISTACLASSECLASSIFICACAO
 
@@ -160,6 +165,16 @@ switch (strtoupper($funcao))
 		retornaJSON($m->listaUnidadeMedida($codigo_unidade_medida));
 		exit;
 	break;
+	case "LISTAFONTEINFO":
+		$m = new Metaestat();
+		retornaJSON($m->listaFonteinfo($id_fonteinfo));
+		exit;
+	break;
+	case "LISTAFONTEINFOMEDIDA":
+		$m = new Metaestat();
+		retornaJSON($m->listaFonteinfoMedida($id_medida_variavel));
+		exit;
+	break;
 	/*
 	 Valor: LISTATIPOPERIODO
 
@@ -288,6 +303,34 @@ switch (strtoupper($funcao))
 		retornaJSON($m->listaClasseClassificacao($id_classificacao,$id_classe));
 		exit;
 	break;
+	case "ALTERALINKMEDIDA":
+		$m = new Metaestat();
+		if(empty($id_link)){
+			$id_link = $m->alteraLinkMedida($id_medida_variavel);
+		}
+		else{
+			$m->alteraLinkMedida("",$id_link,$nome,$link);
+		}
+		retornaJSON($m->listaLinkMedida($id_medida_variavel,$id_link));
+		exit;
+	break;
+	case "ALTERARFONTEINFO":
+		$m = new Metaestat();
+		if(empty($id_fonteinfo)){
+			$id_fonteinfo = $m->alteraFonteinfo();
+		}
+		else{
+			$m->alteraFonteinfo($id_fonteinfo,$titulo,$link);
+		}
+		retornaJSON($m->listaFonteinfo($id_fonteinfo));
+		exit;
+	break;
+	case "ADICIONAFONTEINFOMEDIDA":
+		$m = new Metaestat();
+		$m->adicinaFonteinfoMedida($id_medida_variavel,$id_fonteinfo);
+		retornaJSON($m->listaFonteInfo($id_fonteinfo));
+		exit;
+	break;
 	/*
 	 Valor: ALTERARUNIDADEMEDIDA
 
@@ -440,8 +483,26 @@ switch (strtoupper($funcao))
 			retornaJSON("erro");
 		exit;
 	break;
+	case "EXCLUIRFONTEINFO":
+		$tabela = "i3geoestat_fonteinfo";
+		$id = $id_fonteinfo;
+		$f = verificaFilhos();
+
+		if(!$f){
+			$m = new Metaestat();
+			retornaJSON($m->excluirRegistro("i3geoestat_fonteinfo","id_fonteinfo",$id));
+		}
+		else
+			retornaJSON("erro");
+		exit;
+	break;
+	case "EXCLUIRFONTEINFOMEDIDA":
+		$m = new Metaestat();
+		retornaJSON($m->excluirFonteinfoMedida($id_medida_variavel,$id_fonteinfo));
+		exit;
+	break;
 	/*
-	 Valor: EXCLUIRCONEXAO
+	Valor: EXCLUIRCONEXAO
 
 	Exclui uma conexao
 
@@ -568,7 +629,12 @@ switch (strtoupper($funcao))
 		$m = new Metaestat();
 		retornaJSON($m->excluirRegistro("i3geoestat_classes","id_classe",$id_classe));
 		exit;
-		break;
+	break;
+	case "EXCLUIRLINKMEDIDA":
+		$m = new Metaestat();
+		retornaJSON($m->excluirRegistro("i3geoestat_medida_variavel_link","id_link",$id_link));
+		exit;
+	break;
 	/*
 	Valor: LISTADADOSTABELASAUXILIARES
 
@@ -585,6 +651,7 @@ switch (strtoupper($funcao))
 		$resultado["unidade_medida"] = $m->listaUnidadeMedida();
 		$resultado["tipo_regiao"] = $m->listaTipoRegiao();
 		$resultado["conexao"] = $m->listaConexao();
+		$resultado["fonteinfo"] = $m->listaFonteinfo();
 		retornaJSON($resultado);
 	break;
 	/*
diff --git a/admin/sql/metaestat.sql b/admin/sql/metaestat.sql
index 7d3fa80..33fdee4 100644
--- a/admin/sql/metaestat.sql
+++ b/admin/sql/metaestat.sql
@@ -4,9 +4,12 @@
 drop table i3geoestat_classes;
 drop table i3geoestat_classificacao;
 drop table i3geoestat_dimensao_medida;
+drop table i3geoestat_fonteinfo_medida;
+drop table i3geoestat_medida_variavel_link;
 drop table i3geoestat_medida_variavel;
 drop table i3geoestat_tipo_regiao;
 drop table i3geoestat_conexao;
+drop table i3geoestat_fonteinfo;
 drop table i3geoestat_tipo_periodo;
 drop table i3geoestat_unidade_medida;
 drop table i3geoestat_variavel;
@@ -16,15 +19,6 @@ drop table i3geoestat_variavel;
 
 /* create tables */
 
--- tabela com o nome e descrição de uma variável variável
-create table i3geoestat_variavel
-(
-	codigo_variavel integer not null unique primary key autoincrement,
-	nome text,
-	descricao text
-);
-
-
 -- lista controlada dos parâmetros de conexão com o banco de dados onde residem dados
 create table i3geoestat_conexao
 (
@@ -42,27 +36,6 @@ create table i3geoestat_conexao
 );
 
 
-create table i3geoestat_unidade_medida
-(
-	codigo_unidade_medida integer not null unique primary key autoincrement,
-	nome text,
-	sigla text,
-	-- o tipo de unidade permite que os valores sejam somados? (0 ou 1)
-	permitesoma integer default 0,
-	-- o tipo de unidade permite o cálculo de média aritmética? (0 ou 1)
-	permitemedia integer default 0
-);
-
-
--- lista controlada de tipos de período de tempo
-create table i3geoestat_tipo_periodo
-(
-	codigo_tipo_periodo integer not null unique primary key autoincrement,
-	nome text,
-	descricao text
-);
-
-
 -- identifica as tabelas que possuem colunas com geometrias de determinado local ou região
 create table i3geoestat_tipo_regiao
 (
@@ -91,6 +64,36 @@ create table i3geoestat_tipo_regiao
 );
 
 
+create table i3geoestat_unidade_medida
+(
+	codigo_unidade_medida integer not null unique primary key autoincrement,
+	nome text,
+	sigla text,
+	-- o tipo de unidade permite que os valores sejam somados? (0 ou 1)
+	permitesoma integer default 0,
+	-- o tipo de unidade permite o cálculo de média aritmética? (0 ou 1)
+	permitemedia integer default 0
+);
+
+
+-- tabela com o nome e descrição de uma variável variável
+create table i3geoestat_variavel
+(
+	codigo_variavel integer not null unique primary key autoincrement,
+	nome text,
+	descricao text
+);
+
+
+-- lista controlada de tipos de período de tempo
+create table i3geoestat_tipo_periodo
+(
+	codigo_tipo_periodo integer not null unique primary key autoincrement,
+	nome text,
+	descricao text
+);
+
+
 -- descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente
 create table i3geoestat_medida_variavel
 (
@@ -112,16 +115,16 @@ create table i3geoestat_medida_variavel
 	filtro text,
 	-- titulo da medida
 	nomemedida text,
+	foreign key (codigo_tipo_regiao)
+	references i3geoestat_tipo_regiao (codigo_tipo_regiao),
+	foreign key (codigo_unidade_medida)
+	references i3geoestat_unidade_medida (codigo_unidade_medida),
 	foreign key (codigo_variavel)
 	references i3geoestat_variavel (codigo_variavel),
 	foreign key (codigo_estat_conexao)
 	references i3geoestat_conexao (codigo_estat_conexao),
-	foreign key (codigo_unidade_medida)
-	references i3geoestat_unidade_medida (codigo_unidade_medida),
 	foreign key (codigo_tipo_periodo)
-	references i3geoestat_tipo_periodo (codigo_tipo_periodo),
-	foreign key (codigo_tipo_regiao)
-	references i3geoestat_tipo_regiao (codigo_tipo_regiao)
+	references i3geoestat_tipo_periodo (codigo_tipo_periodo)
 );
 
 
@@ -184,4 +187,35 @@ create table i3geoestat_dimensao_medida
 );
 
 
+create table i3geoestat_fonteinfo
+(
+	id_fonteinfo integer not null unique primary key autoincrement,
+	-- título completo da fonte, devendo conter o ano quando for o caso
+	titulo text unique,
+	link text
+);
+
+
+create table i3geoestat_fonteinfo_medida
+(
+	id_medida_variavel integer not null,
+	id_fonteinfo integer not null,
+	foreign key (id_medida_variavel)
+	references i3geoestat_medida_variavel (id_medida_variavel),
+	foreign key (id_fonteinfo)
+	references i3geoestat_fonteinfo (id_fonteinfo)
+);
+
+
+create table i3geoestat_medida_variavel_link
+(
+	link text,
+	id_medida_variavel integer,
+	nome text,
+	id_link integer not null unique primary key autoincrement,
+	foreign key (id_medida_variavel)
+	references i3geoestat_medida_variavel (id_medida_variavel)
+);
+
+
 
diff --git a/admin/sql/metaestat_basededados.sql b/admin/sql/metaestat_basededados.sql
index 08e75af..0be3969 100644
--- a/admin/sql/metaestat_basededados.sql
+++ b/admin/sql/metaestat_basededados.sql
@@ -38,3 +38,15 @@ INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, a
 INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('3', '([nu_farm_funcionando] > 1)', 'Mais de uma', '0', '0', '255', '1', '', '', '', '', '', '');
 
 
+-- i3geoestat_medida_variavel_link
+INSERT INTO i3geoestat_medida_variavel_link (link, id_medida_variavel, nome, id_link) VALUES ('http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095', '1', 'Site das Fármacias Populares', '1');
+
+
+-- i3geoestat_fontinfo_medida
+INSERT INTO i3geoestat_fonteinfo_medida (id_medida_variavel, id_fonteinfo) VALUES ('1', '1');
+
+
+-- i3geoestat_fonteinfo
+INSERT INTO i3geoestat_fonteinfo (id_fonteinfo, titulo, link) VALUES ('1', 'Ministério da Saúde', 'http://saude.gov.br');
+
+
diff --git a/documentacao/diagramas/metaestat.erm b/documentacao/diagramas/metaestat.erm
index 0c52dc0..d406b3d 100644
--- a/documentacao/diagramas/metaestat.erm
+++ b/documentacao/diagramas/metaestat.erm
@@ -11,12 +11,12 @@
 	</page_setting>
 	<category_index>0</category_index>
 	<zoom>1.0</zoom>
-	<x>-343</x>
-	<y>3</y>
+	<x>193</x>
+	<y>17</y>
 	<default_color>
-		<r>230</r>
-		<g>230</g>
-		<b>250</b>
+		<r>144</r>
+		<g>238</g>
+		<b>144</b>
 	</default_color>
 	<color>
 		<r>255</r>
@@ -110,7 +110,7 @@
 			</connections>
 			<display>false</display>
 			<creation_date>2012-07-17 15:03:53</creation_date>
-			<updated_date>2012-08-07 00:45:40</updated_date>
+			<updated_date>2012-08-15 01:02:44</updated_date>
 			<model_property>
 				<name>Project Name</name>
 				<value></value>
@@ -516,12 +516,64 @@
 			<unsigned>false</unsigned>
 			<args></args>
 			<description></description>
+			<logical_name>id_fonteinfo</logical_name>
+			<physical_name>id_fonteinfo</physical_name>
+			<type>integer</type>
+		</word>
+		<word>
+			<id>29</id>
+			<length>null</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<args></args>
+			<description></description>
+			<logical_name>id_link</logical_name>
+			<physical_name>id_link</physical_name>
+			<type>integer</type>
+		</word>
+		<word>
+			<id>30</id>
+			<length>null</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<args></args>
+			<description></description>
 			<logical_name>id_medida_variavel</logical_name>
 			<physical_name>id_medida_variavel</physical_name>
 			<type>integer</type>
 		</word>
 		<word>
-			<id>29</id>
+			<id>31</id>
+			<length>null</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<args></args>
+			<description></description>
+			<logical_name>link</logical_name>
+			<physical_name>link</physical_name>
+			<type>text</type>
+		</word>
+		<word>
+			<id>32</id>
+			<length>null</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<args></args>
+			<description></description>
+			<logical_name>link</logical_name>
+			<physical_name>link</physical_name>
+			<type>text</type>
+		</word>
+		<word>
+			<id>33</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -534,7 +586,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>30</id>
+			<id>34</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -547,7 +599,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>31</id>
+			<id>35</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -560,7 +612,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>32</id>
+			<id>36</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -573,7 +625,20 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>33</id>
+			<id>37</id>
+			<length>null</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<args></args>
+			<description></description>
+			<logical_name>nome</logical_name>
+			<physical_name>nome</physical_name>
+			<type>text</type>
+		</word>
+		<word>
+			<id>38</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -586,7 +651,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>34</id>
+			<id>39</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -599,7 +664,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>35</id>
+			<id>40</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -612,7 +677,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>36</id>
+			<id>41</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -625,7 +690,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>37</id>
+			<id>42</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -638,7 +703,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>38</id>
+			<id>43</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -651,7 +716,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>39</id>
+			<id>44</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -664,7 +729,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>40</id>
+			<id>45</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -677,7 +742,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>41</id>
+			<id>46</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -690,7 +755,7 @@
 			<type>integer</type>
 		</word>
 		<word>
-			<id>42</id>
+			<id>47</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -703,7 +768,7 @@
 			<type>integer</type>
 		</word>
 		<word>
-			<id>43</id>
+			<id>48</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -716,7 +781,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>44</id>
+			<id>49</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -729,7 +794,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>45</id>
+			<id>50</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -742,7 +807,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>46</id>
+			<id>51</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -755,7 +820,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>47</id>
+			<id>52</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -768,7 +833,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>48</id>
+			<id>53</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -781,7 +846,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>49</id>
+			<id>54</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -794,7 +859,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>50</id>
+			<id>55</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -807,7 +872,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>51</id>
+			<id>56</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -820,7 +885,20 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>52</id>
+			<id>57</id>
+			<length>null</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<args></args>
+			<description>Título completo da fonte, devendo conter o ano quando for o caso</description>
+			<logical_name>titulo</logical_name>
+			<physical_name>titulo</physical_name>
+			<type>text</type>
+		</word>
+		<word>
+			<id>58</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -833,7 +911,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>53</id>
+			<id>59</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -846,7 +924,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>54</id>
+			<id>60</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -968,7 +1046,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>29</word_id>
+					<word_id>34</word_id>
 					<id>1</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1000,7 +1078,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>45</word_id>
+					<word_id>50</word_id>
 					<id>2</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1032,7 +1110,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>42</word_id>
+					<word_id>47</word_id>
 					<id>3</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1064,7 +1142,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>41</word_id>
+					<word_id>46</word_id>
 					<id>4</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1159,7 +1237,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>32</word_id>
+					<word_id>36</word_id>
 					<id>6</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1191,7 +1269,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>16</word_id>
+					<word_id>17</word_id>
 					<id>7</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1286,7 +1364,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>30</word_id>
+					<word_id>35</word_id>
 					<id>9</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1318,7 +1396,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>17</word_id>
+					<word_id>16</word_id>
 					<id>10</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1360,12 +1438,12 @@
 		</table>
 		<table>
 			<id>6</id>
-			<height>339</height>
+			<height>170</height>
 			<width>292</width>
 				<font_name>Ubuntu</font_name>
 				<font_size>9</font_size>
-			<x>353</x>
-			<y>155</y>
+			<x>387</x>
+			<y>533</y>
 			<color>
 				<r>160</r>
 				<g>32</g>
@@ -1374,7 +1452,7 @@
 			<connections>
 				<relation>
 					<id>0</id>
-					<source>5</source>
+					<source>13</source>
 					<target>6</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -1389,84 +1467,21 @@
 					<referenced_column>null</referenced_column>
 					<referenced_complex_unique_key>null</referenced_complex_unique_key>
 				</relation>
-				<relation>
+				<comment_connection>
 					<id>1</id>
-					<source>12</source>
-					<target>6</target>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<source_xp>-1</source_xp>
-					<source_yp>-1</source_yp>
-					<target_xp>-1</target_xp>
-					<target_yp>-1</target_yp>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
-				<relation>
-					<id>2</id>
-					<source>3</source>
-					<target>6</target>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<source_xp>-1</source_xp>
-					<source_yp>-1</source_yp>
-					<target_xp>-1</target_xp>
-					<target_yp>-1</target_yp>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
-				<relation>
-					<id>3</id>
-					<source>4</source>
-					<target>6</target>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<source_xp>-1</source_xp>
-					<source_yp>-1</source_yp>
-					<target_xp>-1</target_xp>
-					<target_yp>-1</target_yp>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
-				<relation>
-					<id>4</id>
-					<source>11</source>
+					<source>7</source>
 					<target>6</target>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<source_xp>-1</source_xp>
-					<source_yp>-1</source_yp>
-					<target_xp>-1</target_xp>
-					<target_yp>-1</target_yp>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
+				</comment_connection>
 			</connections>
-			<physical_name>i3geoestat_medida_variavel</physical_name>
-			<logical_name>i3geoestat_medida_variavel</logical_name>
-			<description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description>
+			<physical_name>i3geoestat_dimensao_medida</physical_name>
+			<logical_name>i3geoestat_dimensao_medida</logical_name>
+			<description></description>
 			<constraint></constraint>
 			<primary_key_name></primary_key_name>
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>28</word_id>
+					<word_id>27</word_id>
 					<id>11</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1498,18 +1513,17 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
+					<word_id>8</word_id>
 					<id>12</id>
-					<referenced_column>0</referenced_column>
-					<relation>2</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
+					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -1531,18 +1545,17 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
+					<word_id>38</word_id>
 					<id>13</id>
-					<referenced_column>5</referenced_column>
-					<relation>3</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
+					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -1564,18 +1577,17 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
+					<word_id>15</word_id>
 					<id>14</id>
-					<referenced_column>8</referenced_column>
-					<relation>0</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
+					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -1597,18 +1609,17 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
+					<word_id>0</word_id>
 					<id>15</id>
-					<referenced_column>46</referenced_column>
-					<relation>4</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
 					<type>integer</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
+					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -1631,8 +1642,8 @@
 				</normal_column>
 				<normal_column>
 					<id>16</id>
-					<referenced_column>58</referenced_column>
-					<relation>1</relation>
+					<referenced_column>55</referenced_column>
+					<relation>0</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -1662,22 +1673,92 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
-				<normal_column>
-					<word_id>19</word_id>
-					<id>17</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>text</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
+			</columns>
+			<indexes>
+			</indexes>
+			<complex_unique_key_list>
+			</complex_unique_key_list>
+			<table_properties>
+				<schema></schema>
+			</table_properties>
+		</table>
+		<note>
+			<id>7</id>
+			<height>111</height>
+			<width>188</width>
+				<font_name>Ubuntu</font_name>
+				<font_size>9</font_size>
+			<x>748</x>
+			<y>594</y>
+			<color>
+				<r>255</r>
+				<g>255</g>
+				<b>255</b>
+			</color>
+			<connections>
+			</connections>
+			<text>As colunas obtidas da junção de medida_variavel com tipo_regiao podem ser utilizadas para definir uma dimensão</text>
+		</note>
+		<table>
+			<id>8</id>
+			<height>275</height>
+			<width>292</width>
+				<font_name>Ubuntu</font_name>
+				<font_size>9</font_size>
+			<x>-336</x>
+			<y>236</y>
+			<color>
+				<r>255</r>
+				<g>165</g>
+				<b>0</b>
+			</color>
+			<connections>
+				<comment_connection>
+					<id>2</id>
+					<source>0</source>
+					<target>8</target>
+				</comment_connection>
+				<relation>
+					<id>3</id>
+					<source>9</source>
+					<target>8</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+			</connections>
+			<physical_name>i3geoestat_tipo_regiao</physical_name>
+			<logical_name>i3geoestat_tipo_regiao</logical_name>
+			<description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description>
+			<constraint></constraint>
+			<primary_key_name></primary_key_name>
+			<option></option>
+			<columns>
+				<normal_column>
+					<word_id>5</word_id>
+					<id>17</id>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>integer</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>true</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>true</not_null>
+					<primary_key>true</primary_key>
+					<unique_key>true</unique_key>
+					<character_set></character_set>
 					<collation></collation>
 					<sequence>
 						<name></name>
@@ -1695,7 +1776,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>48</word_id>
+					<word_id>40</word_id>
 					<id>18</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1727,7 +1808,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>13</word_id>
+					<word_id>18</word_id>
 					<id>19</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1759,17 +1840,18 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>11</word_id>
 					<id>20</id>
+					<referenced_column>29</referenced_column>
+					<relation>3</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
+					<foreign_key>true</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -1791,7 +1873,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>22</word_id>
+					<word_id>20</word_id>
 					<id>21</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1823,7 +1905,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>34</word_id>
+					<word_id>54</word_id>
 					<id>22</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1854,74 +1936,21 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-		<table>
-			<id>7</id>
-			<height>170</height>
-			<width>292</width>
-				<font_name>Ubuntu</font_name>
-				<font_size>9</font_size>
-			<x>387</x>
-			<y>533</y>
-			<color>
-				<r>160</r>
-				<g>32</g>
-				<b>240</b>
-			</color>
-			<connections>
-				<relation>
-					<id>5</id>
-					<source>6</source>
-					<target>7</target>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<source_xp>-1</source_xp>
-					<source_yp>-1</source_yp>
-					<target_xp>-1</target_xp>
-					<target_yp>-1</target_yp>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
-				<comment_connection>
-					<id>6</id>
-					<source>8</source>
-					<target>7</target>
-				</comment_connection>
-			</connections>
-			<physical_name>i3geoestat_dimensao_medida</physical_name>
-			<logical_name>i3geoestat_dimensao_medida</logical_name>
-			<description></description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
 				<normal_column>
-					<word_id>27</word_id>
+					<word_id>10</word_id>
 					<id>23</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
-					<auto_increment>true</auto_increment>
+					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>true</unique_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
 					<character_set></character_set>
 					<collation></collation>
 					<sequence>
@@ -1940,7 +1969,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>8</word_id>
+					<word_id>14</word_id>
 					<id>24</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1972,13 +2001,13 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>33</word_id>
+					<word_id>24</word_id>
 					<id>25</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
@@ -2004,7 +2033,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>15</word_id>
+					<word_id>12</word_id>
 					<id>26</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2036,15 +2065,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>0</word_id>
+					<word_id>52</word_id>
 					<id>27</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value>4326</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -2068,18 +2097,17 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
+					<word_id>9</word_id>
 					<id>28</id>
-					<referenced_column>11</referenced_column>
-					<relation>5</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
+					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -2109,64 +2137,30 @@
 				<schema></schema>
 			</table_properties>
 		</table>
-		<note>
-			<id>8</id>
-			<height>111</height>
-			<width>188</width>
-				<font_name>Ubuntu</font_name>
-				<font_size>9</font_size>
-			<x>748</x>
-			<y>594</y>
-			<color>
-				<r>255</r>
-				<g>255</g>
-				<b>255</b>
-			</color>
-			<connections>
-			</connections>
-			<text>As colunas obtidas da junção de medida_variavel com tipo_regiao podem ser utilizadas para definir uma dimensão</text>
-		</note>
 		<table>
 			<id>9</id>
-			<height>107</height>
-			<width>247</width>
+			<height>170</height>
+			<width>292</width>
 				<font_name>Ubuntu</font_name>
 				<font_size>9</font_size>
-			<x>719</x>
-			<y>68</y>
+			<x>8</x>
+			<y>499</y>
 			<color>
-				<r>230</r>
-				<g>230</g>
-				<b>250</b>
+				<r>255</r>
+				<g>165</g>
+				<b>0</b>
 			</color>
 			<connections>
-				<relation>
-					<id>7</id>
-					<source>6</source>
-					<target>9</target>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<source_xp>-1</source_xp>
-					<source_yp>-1</source_yp>
-					<target_xp>-1</target_xp>
-					<target_yp>-1</target_yp>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
 			</connections>
-			<physical_name>i3geoestat_classificacao</physical_name>
-			<logical_name>i3geoestat_classificacao</logical_name>
-			<description>Lista de classificacoes de uma medida de variável</description>
+			<physical_name>i3geoestat_conexao</physical_name>
+			<logical_name>i3geoestat_conexao</logical_name>
+			<description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados</description>
 			<constraint></constraint>
 			<primary_key_name></primary_key_name>
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>26</word_id>
+					<word_id>3</word_id>
 					<id>29</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2198,7 +2192,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>31</word_id>
+					<word_id>2</word_id>
 					<id>30</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2230,18 +2224,17 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
+					<word_id>23</word_id>
 					<id>31</id>
-					<referenced_column>11</referenced_column>
-					<relation>7</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
+					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -2263,7 +2256,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>37</word_id>
+					<word_id>48</word_id>
 					<id>32</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2294,69 +2287,21 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-		<table>
-			<id>10</id>
-			<height>317</height>
-			<width>210</width>
-				<font_name>Ubuntu</font_name>
-				<font_size>9</font_size>
-			<x>799</x>
-			<y>246</y>
-			<color>
-				<r>230</r>
-				<g>230</g>
-				<b>250</b>
-			</color>
-			<connections>
-				<relation>
-					<id>8</id>
-					<source>9</source>
-					<target>10</target>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<source_xp>-1</source_xp>
-					<source_yp>-1</source_yp>
-					<target_xp>-1</target_xp>
-					<target_yp>-1</target_yp>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
-			</connections>
-			<physical_name>i3geoestat_classes</physical_name>
-			<logical_name>i3geoestat_classes</logical_name>
-			<description>Classes pertencentes a uma classificação</description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
 				<normal_column>
-					<word_id>25</word_id>
+					<word_id>58</word_id>
 					<id>33</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
-					<auto_increment>true</auto_increment>
+					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>true</unique_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
 					<character_set></character_set>
 					<collation></collation>
 					<sequence>
@@ -2375,7 +2320,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>21</word_id>
+					<word_id>49</word_id>
 					<id>34</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2406,21 +2351,69 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
+			</columns>
+			<indexes>
+			</indexes>
+			<complex_unique_key_list>
+			</complex_unique_key_list>
+			<table_properties>
+				<schema></schema>
+			</table_properties>
+		</table>
+		<table>
+			<id>10</id>
+			<height>128</height>
+			<width>247</width>
+				<font_name>Ubuntu</font_name>
+				<font_size>9</font_size>
+			<x>673</x>
+			<y>-89</y>
+			<color>
+				<r>230</r>
+				<g>230</g>
+				<b>250</b>
+			</color>
+			<connections>
+				<relation>
+					<id>4</id>
+					<source>13</source>
+					<target>10</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+			</connections>
+			<physical_name>i3geoestat_classificacao</physical_name>
+			<logical_name>i3geoestat_classificacao</logical_name>
+			<description>Lista de classificacoes de uma medida de variável</description>
+			<constraint></constraint>
+			<primary_key_name></primary_key_name>
+			<option></option>
+			<columns>
 				<normal_column>
-					<word_id>51</word_id>
+					<word_id>26</word_id>
 					<id>35</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
-					<auto_increment>false</auto_increment>
+					<auto_increment>true</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
+					<not_null>true</not_null>
+					<primary_key>true</primary_key>
+					<unique_key>true</unique_key>
 					<character_set></character_set>
 					<collation></collation>
 					<sequence>
@@ -2439,7 +2432,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>54</word_id>
+					<word_id>33</word_id>
 					<id>36</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2471,17 +2464,18 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>53</word_id>
 					<id>37</id>
+					<referenced_column>55</referenced_column>
+					<relation>4</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
+					<foreign_key>true</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -2503,7 +2497,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>1</word_id>
+					<word_id>42</word_id>
 					<id>38</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2534,10 +2528,57 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
+			</columns>
+			<indexes>
+			</indexes>
+			<complex_unique_key_list>
+			</complex_unique_key_list>
+			<table_properties>
+				<schema></schema>
+			</table_properties>
+		</table>
+		<table>
+			<id>11</id>
+			<height>317</height>
+			<width>210</width>
+				<font_name>Ubuntu</font_name>
+				<font_size>9</font_size>
+			<x>1018</x>
+			<y>-24</y>
+			<color>
+				<r>230</r>
+				<g>230</g>
+				<b>250</b>
+			</color>
+			<connections>
+				<relation>
+					<id>5</id>
+					<source>10</source>
+					<target>11</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+			</connections>
+			<physical_name>i3geoestat_classes</physical_name>
+			<logical_name>i3geoestat_classes</logical_name>
+			<description>Classes pertencentes a uma classificação</description>
+			<constraint></constraint>
+			<primary_key_name></primary_key_name>
+			<option></option>
+			<columns>
 				<normal_column>
+					<word_id>25</word_id>
 					<id>39</id>
-					<referenced_column>29</referenced_column>
-					<relation>8</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -2545,11 +2586,11 @@
 					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
+					<auto_increment>true</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>true</not_null>
+					<primary_key>true</primary_key>
+					<unique_key>true</unique_key>
 					<character_set></character_set>
 					<collation></collation>
 					<sequence>
@@ -2568,7 +2609,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>50</word_id>
+					<word_id>21</word_id>
 					<id>40</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2600,7 +2641,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>46</word_id>
+					<word_id>56</word_id>
 					<id>41</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2632,7 +2673,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>40</word_id>
+					<word_id>60</word_id>
 					<id>42</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2664,7 +2705,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>39</word_id>
+					<word_id>59</word_id>
 					<id>43</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2696,7 +2737,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>36</word_id>
+					<word_id>1</word_id>
 					<id>44</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2728,17 +2769,18 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>38</word_id>
 					<id>45</id>
+					<referenced_column>35</referenced_column>
+					<relation>5</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
+					<foreign_key>true</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -2759,74 +2801,21 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-		<table>
-			<id>11</id>
-			<height>275</height>
-			<width>292</width>
-				<font_name>Ubuntu</font_name>
-				<font_size>9</font_size>
-			<x>-336</x>
-			<y>236</y>
-			<color>
-				<r>255</r>
-				<g>165</g>
-				<b>0</b>
-			</color>
-			<connections>
-				<relation>
-					<id>9</id>
-					<source>12</source>
-					<target>11</target>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<source_xp>-1</source_xp>
-					<source_yp>-1</source_yp>
-					<target_xp>-1</target_xp>
-					<target_yp>-1</target_yp>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
-				<comment_connection>
-					<id>10</id>
-					<source>0</source>
-					<target>11</target>
-				</comment_connection>
-			</connections>
-			<physical_name>i3geoestat_tipo_regiao</physical_name>
-			<logical_name>i3geoestat_tipo_regiao</logical_name>
-			<description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
 				<normal_column>
-					<word_id>5</word_id>
+					<word_id>55</word_id>
 					<id>46</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
-					<auto_increment>true</auto_increment>
+					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>true</unique_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
 					<character_set></character_set>
 					<collation></collation>
 					<sequence>
@@ -2845,7 +2834,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>35</word_id>
+					<word_id>51</word_id>
 					<id>47</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2877,7 +2866,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>18</word_id>
+					<word_id>45</word_id>
 					<id>48</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2909,18 +2898,17 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
+					<word_id>44</word_id>
 					<id>49</id>
-					<referenced_column>58</referenced_column>
-					<relation>9</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
+					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -2942,7 +2930,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>20</word_id>
+					<word_id>41</word_id>
 					<id>50</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2974,7 +2962,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>49</word_id>
+					<word_id>43</word_id>
 					<id>51</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3005,21 +2993,52 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
+			</columns>
+			<indexes>
+			</indexes>
+			<complex_unique_key_list>
+			</complex_unique_key_list>
+			<table_properties>
+				<schema></schema>
+			</table_properties>
+		</table>
+		<table>
+			<id>12</id>
+			<height>107</height>
+			<width>228</width>
+				<font_name>Ubuntu</font_name>
+				<font_size>9</font_size>
+			<x>937</x>
+			<y>321</y>
+			<color>
+				<r>144</r>
+				<g>238</g>
+				<b>144</b>
+			</color>
+			<connections>
+			</connections>
+			<physical_name>i3geoestat_fonteinfo</physical_name>
+			<logical_name>i3geoestat_fonteinfo</logical_name>
+			<description></description>
+			<constraint></constraint>
+			<primary_key_name></primary_key_name>
+			<option></option>
+			<columns>
 				<normal_column>
-					<word_id>10</word_id>
+					<word_id>28</word_id>
 					<id>52</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
-					<auto_increment>false</auto_increment>
+					<auto_increment>true</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
+					<not_null>true</not_null>
+					<primary_key>true</primary_key>
+					<unique_key>true</unique_key>
 					<character_set></character_set>
 					<collation></collation>
 					<sequence>
@@ -3038,7 +3057,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>14</word_id>
+					<word_id>57</word_id>
 					<id>53</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3051,7 +3070,7 @@
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
+					<unique_key>true</unique_key>
 					<character_set></character_set>
 					<collation></collation>
 					<sequence>
@@ -3070,13 +3089,13 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>24</word_id>
+					<word_id>32</word_id>
 					<id>54</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>text</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
@@ -3101,21 +3120,137 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
+			</columns>
+			<indexes>
+			</indexes>
+			<complex_unique_key_list>
+			</complex_unique_key_list>
+			<table_properties>
+				<schema></schema>
+			</table_properties>
+		</table>
+		<table>
+			<id>13</id>
+			<height>339</height>
+			<width>292</width>
+				<font_name>Ubuntu</font_name>
+				<font_size>9</font_size>
+			<x>353</x>
+			<y>155</y>
+			<color>
+				<r>160</r>
+				<g>32</g>
+				<b>240</b>
+			</color>
+			<connections>
+				<relation>
+					<id>6</id>
+					<source>8</source>
+					<target>13</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+				<relation>
+					<id>7</id>
+					<source>3</source>
+					<target>13</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+				<relation>
+					<id>8</id>
+					<source>5</source>
+					<target>13</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+				<relation>
+					<id>9</id>
+					<source>9</source>
+					<target>13</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+				<relation>
+					<id>10</id>
+					<source>4</source>
+					<target>13</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+			</connections>
+			<physical_name>i3geoestat_medida_variavel</physical_name>
+			<logical_name>i3geoestat_medida_variavel</logical_name>
+			<description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description>
+			<constraint></constraint>
+			<primary_key_name></primary_key_name>
+			<option></option>
+			<columns>
 				<normal_column>
-					<word_id>12</word_id>
+					<word_id>30</word_id>
 					<id>55</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
-					<auto_increment>false</auto_increment>
+					<auto_increment>true</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
+					<not_null>true</not_null>
+					<primary_key>true</primary_key>
+					<unique_key>true</unique_key>
 					<character_set></character_set>
 					<collation></collation>
 					<sequence>
@@ -3134,17 +3269,18 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>47</word_id>
 					<id>56</id>
+					<referenced_column>0</referenced_column>
+					<relation>7</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
-					<default_value>4326</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
+					<foreign_key>true</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -3166,17 +3302,18 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>9</word_id>
 					<id>57</id>
+					<referenced_column>5</referenced_column>
+					<relation>10</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
+					<foreign_key>true</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -3197,40 +3334,10 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
-		<table>
-			<id>12</id>
-			<height>170</height>
-			<width>292</width>
-				<font_name>Ubuntu</font_name>
-				<font_size>9</font_size>
-			<x>8</x>
-			<y>499</y>
-			<color>
-				<r>255</r>
-				<g>165</g>
-				<b>0</b>
-			</color>
-			<connections>
-			</connections>
-			<physical_name>i3geoestat_conexao</physical_name>
-			<logical_name>i3geoestat_conexao</logical_name>
-			<description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados</description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
 				<normal_column>
-					<word_id>3</word_id>
 					<id>58</id>
+					<referenced_column>8</referenced_column>
+					<relation>8</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -3238,11 +3345,11 @@
 					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
-					<auto_increment>true</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
-					<unique_key>true</unique_key>
+					<auto_increment>false</auto_increment>
+					<foreign_key>true</foreign_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
 					<character_set></character_set>
 					<collation></collation>
 					<sequence>
@@ -3261,17 +3368,18 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>2</word_id>
 					<id>59</id>
+					<referenced_column>17</referenced_column>
+					<relation>6</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
+					<foreign_key>true</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -3293,17 +3401,18 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>23</word_id>
 					<id>60</id>
+					<referenced_column>29</referenced_column>
+					<relation>9</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>text</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
+					<foreign_key>true</foreign_key>
 					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
@@ -3325,7 +3434,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>43</word_id>
+					<word_id>19</word_id>
 					<id>61</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3357,7 +3466,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>53</word_id>
 					<id>62</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3389,7 +3498,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>44</word_id>
+					<word_id>13</word_id>
 					<id>63</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3420,15 +3529,419 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-			</table_properties>
-		</table>
+				<normal_column>
+					<word_id>11</word_id>
+					<id>64</id>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>text</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+				<normal_column>
+					<word_id>22</word_id>
+					<id>65</id>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>text</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+				<normal_column>
+					<word_id>39</word_id>
+					<id>66</id>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>text</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+			</columns>
+			<indexes>
+			</indexes>
+			<complex_unique_key_list>
+			</complex_unique_key_list>
+			<table_properties>
+				<schema></schema>
+			</table_properties>
+		</table>
+		<table>
+			<id>14</id>
+			<height>128</height>
+			<width>269</width>
+				<font_name>Ubuntu</font_name>
+				<font_size>9</font_size>
+			<x>753</x>
+			<y>442</y>
+			<color>
+				<r>230</r>
+				<g>230</g>
+				<b>250</b>
+			</color>
+			<connections>
+				<relation>
+					<id>11</id>
+					<source>13</source>
+					<target>14</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+			</connections>
+			<physical_name>i3geoestat_medida_variavel_link</physical_name>
+			<logical_name>i3geoestat_medida_variavel_link</logical_name>
+			<description></description>
+			<constraint></constraint>
+			<primary_key_name></primary_key_name>
+			<option></option>
+			<columns>
+				<normal_column>
+					<word_id>31</word_id>
+					<id>67</id>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>text</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+				<normal_column>
+					<id>68</id>
+					<referenced_column>55</referenced_column>
+					<relation>11</relation>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>integer</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>true</foreign_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+				<normal_column>
+					<word_id>37</word_id>
+					<id>69</id>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>text</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+				<normal_column>
+					<word_id>29</word_id>
+					<id>70</id>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>integer</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>true</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>true</not_null>
+					<primary_key>true</primary_key>
+					<unique_key>true</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+			</columns>
+			<indexes>
+			</indexes>
+			<complex_unique_key_list>
+			</complex_unique_key_list>
+			<table_properties>
+				<schema></schema>
+			</table_properties>
+		</table>
+		<table>
+			<id>15</id>
+			<height>86</height>
+			<width>269</width>
+				<font_name>Ubuntu</font_name>
+				<font_size>9</font_size>
+			<x>705</x>
+			<y>152</y>
+			<color>
+				<r>144</r>
+				<g>238</g>
+				<b>144</b>
+			</color>
+			<connections>
+				<relation>
+					<id>12</id>
+					<source>13</source>
+					<target>15</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+				<relation>
+					<id>13</id>
+					<source>12</source>
+					<target>15</target>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<source_xp>-1</source_xp>
+					<source_yp>-1</source_yp>
+					<target_xp>-1</target_xp>
+					<target_yp>-1</target_yp>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+			</connections>
+			<physical_name>i3geoestat_fonteinfo_medida</physical_name>
+			<logical_name>i3geoestat_fonteinfo_medida</logical_name>
+			<description></description>
+			<constraint></constraint>
+			<primary_key_name></primary_key_name>
+			<option></option>
+			<columns>
+				<normal_column>
+					<id>71</id>
+					<referenced_column>55</referenced_column>
+					<relation>12</relation>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>integer</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>true</foreign_key>
+					<not_null>true</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+				<normal_column>
+					<id>72</id>
+					<referenced_column>52</referenced_column>
+					<relation>13</relation>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>integer</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>true</foreign_key>
+					<not_null>true</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+			</columns>
+			<indexes>
+			</indexes>
+			<complex_unique_key_list>
+			</complex_unique_key_list>
+			<table_properties>
+				<schema></schema>
+			</table_properties>
+		</table>
 	</contents>
 	<column_groups>
 	</column_groups>
@@ -3437,31 +3950,31 @@
 				<name>metaestat_basededados</name>
 				<export_order>0</export_order>
 				<table_test_data>
-					<table_id>12</table_id>
+					<table_id>9</table_id>
 					<direct_test_data>
 						<data>
 							<column_data>
-								<column_id>58</column_id>
+								<column_id>29</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>59</column_id>
+								<column_id>30</column_id>
 								<value>dbspo</value>
 							</column_data>
 							<column_data>
-								<column_id>60</column_id>
+								<column_id>31</column_id>
 								<value>localhost</value>
 							</column_data>
 							<column_data>
-								<column_id>61</column_id>
+								<column_id>32</column_id>
 								<value>5432</value>
 							</column_data>
 							<column_data>
-								<column_id>62</column_id>
+								<column_id>33</column_id>
 								<value>postgres</value>
 							</column_data>
 							<column_data>
-								<column_id>63</column_id>
+								<column_id>34</column_id>
 								<value>postgres</value>
 							</column_data>
 						</data>
@@ -3470,7 +3983,7 @@
 						<test_data_num>0</test_data_num>
 						<data_def_list>
 							<data_def>
-								<column_id>58</column_id>
+								<column_id>29</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -3485,7 +3998,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>59</column_id>
+								<column_id>30</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>database%</template>
@@ -3500,7 +4013,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>60</column_id>
+								<column_id>31</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>host%</template>
@@ -3515,7 +4028,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>61</column_id>
+								<column_id>32</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>porta%</template>
@@ -3530,7 +4043,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>62</column_id>
+								<column_id>33</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>usuario%</template>
@@ -3545,7 +4058,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>63</column_id>
+								<column_id>34</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>senha%</template>
@@ -3646,55 +4159,55 @@
 					</repeat_test_data>
 				</table_test_data>
 				<table_test_data>
-					<table_id>11</table_id>
+					<table_id>8</table_id>
 					<direct_test_data>
 						<data>
 							<column_data>
-								<column_id>46</column_id>
+								<column_id>17</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>47</column_id>
+								<column_id>18</column_id>
 								<value>Município</value>
 							</column_data>
 							<column_data>
-								<column_id>48</column_id>
+								<column_id>19</column_id>
 								<value>Limites municipais</value>
 							</column_data>
 							<column_data>
-								<column_id>49</column_id>
+								<column_id>20</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>50</column_id>
+								<column_id>21</column_id>
 								<value>public</value>
 							</column_data>
 							<column_data>
-								<column_id>51</column_id>
+								<column_id>22</column_id>
 								<value>tb_ibge</value>
 							</column_data>
 							<column_data>
-								<column_id>52</column_id>
+								<column_id>23</column_id>
 								<value>the_geom</value>
 							</column_data>
 							<column_data>
-								<column_id>53</column_id>
+								<column_id>24</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>54</column_id>
+								<column_id>25</column_id>
 								<value>ibge</value>
 							</column_data>
 							<column_data>
-								<column_id>55</column_id>
+								<column_id>26</column_id>
 								<value>no_cidade</value>
 							</column_data>
 							<column_data>
-								<column_id>56</column_id>
+								<column_id>27</column_id>
 								<value>4326</value>
 							</column_data>
 							<column_data>
-								<column_id>57</column_id>
+								<column_id>28</column_id>
 								<value>the_geom2</value>
 							</column_data>
 						</data>
@@ -3703,7 +4216,7 @@
 						<test_data_num>0</test_data_num>
 						<data_def_list>
 							<data_def>
-								<column_id>46</column_id>
+								<column_id>17</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -3718,7 +4231,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>47</column_id>
+								<column_id>18</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>nome_tipo_regiao%</template>
@@ -3733,7 +4246,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>48</column_id>
+								<column_id>19</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>descricao_tipo_regiao%</template>
@@ -3748,7 +4261,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>49</column_id>
+								<column_id>20</column_id>
 								<type>Foreign Key</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -3763,7 +4276,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>50</column_id>
+								<column_id>21</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>esquemadb%</template>
@@ -3778,7 +4291,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>51</column_id>
+								<column_id>22</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>tabela%</template>
@@ -3793,7 +4306,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>52</column_id>
+								<column_id>23</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>colunageo%</template>
@@ -3808,7 +4321,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>53</column_id>
+								<column_id>24</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>data%</template>
@@ -3823,7 +4336,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>54</column_id>
+								<column_id>25</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -3838,7 +4351,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>55</column_id>
+								<column_id>26</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>colunanomeregiao%</template>
@@ -3853,7 +4366,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>56</column_id>
+								<column_id>27</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>srid%</template>
@@ -3868,7 +4381,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>57</column_id>
+								<column_id>28</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>colunacentroide%</template>
@@ -3993,55 +4506,55 @@
 					</repeat_test_data>
 				</table_test_data>
 				<table_test_data>
-					<table_id>6</table_id>
+					<table_id>13</table_id>
 					<direct_test_data>
 						<data>
 							<column_data>
-								<column_id>11</column_id>
+								<column_id>55</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>12</column_id>
+								<column_id>56</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>13</column_id>
+								<column_id>57</column_id>
 								<value>2</value>
 							</column_data>
 							<column_data>
-								<column_id>14</column_id>
+								<column_id>58</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>15</column_id>
+								<column_id>59</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>16</column_id>
+								<column_id>60</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>17</column_id>
+								<column_id>61</column_id>
 								<value>dbacoes_saude</value>
 							</column_data>
 							<column_data>
-								<column_id>18</column_id>
+								<column_id>62</column_id>
 								<value>tb_farmacia_pop</value>
 							</column_data>
 							<column_data>
-								<column_id>19</column_id>
+								<column_id>63</column_id>
 								<value>nu_farm_funcionando</value>
 							</column_data>
 							<column_data>
-								<column_id>20</column_id>
+								<column_id>64</column_id>
 								<value>co_ibge</value>
 							</column_data>
 							<column_data>
-								<column_id>21</column_id>
+								<column_id>65</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>22</column_id>
+								<column_id>66</column_id>
 								<value>Número de farmácias em funcionamento por mês e ano</value>
 							</column_data>
 						</data>
@@ -4050,7 +4563,7 @@
 						<test_data_num>0</test_data_num>
 						<data_def_list>
 							<data_def>
-								<column_id>11</column_id>
+								<column_id>55</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4065,7 +4578,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>12</column_id>
+								<column_id>56</column_id>
 								<type>Foreign Key</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4080,7 +4593,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>13</column_id>
+								<column_id>57</column_id>
 								<type>Foreign Key</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4095,7 +4608,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>14</column_id>
+								<column_id>58</column_id>
 								<type>Foreign Key</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4110,7 +4623,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>15</column_id>
+								<column_id>59</column_id>
 								<type>Foreign Key</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4125,7 +4638,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>16</column_id>
+								<column_id>60</column_id>
 								<type>Foreign Key</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4140,7 +4653,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>17</column_id>
+								<column_id>61</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>esquemadb%</template>
@@ -4155,7 +4668,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>18</column_id>
+								<column_id>62</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>tabela%</template>
@@ -4170,7 +4683,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>19</column_id>
+								<column_id>63</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>colunavalor%</template>
@@ -4185,7 +4698,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>20</column_id>
+								<column_id>64</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>colunaidgeo_%</template>
@@ -4200,7 +4713,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>21</column_id>
+								<column_id>65</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>filtro%</template>
@@ -4215,7 +4728,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>22</column_id>
+								<column_id>66</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>nomemedida_%</template>
@@ -4233,57 +4746,57 @@
 					</repeat_test_data>
 				</table_test_data>
 				<table_test_data>
-					<table_id>7</table_id>
+					<table_id>6</table_id>
 					<direct_test_data>
 						<data>
 							<column_data>
-								<column_id>23</column_id>
+								<column_id>11</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>24</column_id>
+								<column_id>12</column_id>
 								<value>to_date(mes_farm_pop||&apos; &apos;||ano_farm,&apos;MM YYYY&apos;) as mes</value>
 							</column_data>
 							<column_data>
-								<column_id>25</column_id>
+								<column_id>13</column_id>
 								<value>mês e ano</value>
 							</column_data>
 							<column_data>
-								<column_id>26</column_id>
+								<column_id>14</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>27</column_id>
+								<column_id>15</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>28</column_id>
+								<column_id>16</column_id>
 								<value>1</value>
 							</column_data>
 						</data>
 						<data>
 							<column_data>
-								<column_id>23</column_id>
+								<column_id>11</column_id>
 								<value>2</value>
 							</column_data>
 							<column_data>
-								<column_id>24</column_id>
+								<column_id>12</column_id>
 								<value>ano_farm</value>
 							</column_data>
 							<column_data>
-								<column_id>25</column_id>
+								<column_id>13</column_id>
 								<value>ano</value>
 							</column_data>
 							<column_data>
-								<column_id>26</column_id>
+								<column_id>14</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>27</column_id>
+								<column_id>15</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>28</column_id>
+								<column_id>16</column_id>
 								<value>1</value>
 							</column_data>
 						</data>
@@ -4292,7 +4805,7 @@
 						<test_data_num>0</test_data_num>
 						<data_def_list>
 							<data_def>
-								<column_id>23</column_id>
+								<column_id>11</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4307,7 +4820,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>24</column_id>
+								<column_id>12</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>coluna%</template>
@@ -4322,7 +4835,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>25</column_id>
+								<column_id>13</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>nomedimensao%</template>
@@ -4337,7 +4850,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>26</column_id>
+								<column_id>14</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>descricao%</template>
@@ -4352,7 +4865,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>27</column_id>
+								<column_id>15</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4367,7 +4880,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>28</column_id>
+								<column_id>16</column_id>
 								<type>Foreign Key</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4454,23 +4967,23 @@
 					</repeat_test_data>
 				</table_test_data>
 				<table_test_data>
-					<table_id>9</table_id>
+					<table_id>10</table_id>
 					<direct_test_data>
 						<data>
 							<column_data>
-								<column_id>29</column_id>
+								<column_id>35</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>30</column_id>
+								<column_id>36</column_id>
 								<value>Pela média</value>
 							</column_data>
 							<column_data>
-								<column_id>31</column_id>
+								<column_id>37</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>32</column_id>
+								<column_id>38</column_id>
 								<value></value>
 							</column_data>
 						</data>
@@ -4479,7 +4992,7 @@
 						<test_data_num>0</test_data_num>
 						<data_def_list>
 							<data_def>
-								<column_id>29</column_id>
+								<column_id>35</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4494,7 +5007,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>30</column_id>
+								<column_id>36</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>nome%</template>
@@ -4509,7 +5022,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>31</column_id>
+								<column_id>37</column_id>
 								<type>Foreign Key</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4524,7 +5037,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>32</column_id>
+								<column_id>38</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>observacao%</template>
@@ -4542,167 +5055,167 @@
 					</repeat_test_data>
 				</table_test_data>
 				<table_test_data>
-					<table_id>10</table_id>
+					<table_id>11</table_id>
 					<direct_test_data>
 						<data>
 							<column_data>
-								<column_id>33</column_id>
+								<column_id>39</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>34</column_id>
+								<column_id>40</column_id>
 								<value>([nu_farm_funcionando] &lt; 1)</value>
 							</column_data>
 							<column_data>
-								<column_id>35</column_id>
+								<column_id>41</column_id>
 								<value>Nenhuma</value>
 							</column_data>
 							<column_data>
-								<column_id>36</column_id>
+								<column_id>42</column_id>
 								<value>255</value>
 							</column_data>
 							<column_data>
-								<column_id>37</column_id>
+								<column_id>43</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>38</column_id>
+								<column_id>44</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>39</column_id>
+								<column_id>45</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>40</column_id>
+								<column_id>46</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>41</column_id>
+								<column_id>47</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>42</column_id>
+								<column_id>48</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>43</column_id>
+								<column_id>49</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>44</column_id>
+								<column_id>50</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>45</column_id>
+								<column_id>51</column_id>
 								<value></value>
 							</column_data>
 						</data>
 						<data>
 							<column_data>
-								<column_id>33</column_id>
+								<column_id>39</column_id>
 								<value>2</value>
 							</column_data>
 							<column_data>
-								<column_id>34</column_id>
+								<column_id>40</column_id>
 								<value>([nu_farm_funcionando] = 1)</value>
 							</column_data>
 							<column_data>
-								<column_id>35</column_id>
+								<column_id>41</column_id>
 								<value>Uma</value>
 							</column_data>
 							<column_data>
-								<column_id>36</column_id>
+								<column_id>42</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>37</column_id>
+								<column_id>43</column_id>
 								<value>255</value>
 							</column_data>
 							<column_data>
-								<column_id>38</column_id>
+								<column_id>44</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>39</column_id>
+								<column_id>45</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>40</column_id>
+								<column_id>46</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>41</column_id>
+								<column_id>47</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>42</column_id>
+								<column_id>48</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>43</column_id>
+								<column_id>49</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>44</column_id>
+								<column_id>50</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>45</column_id>
+								<column_id>51</column_id>
 								<value></value>
 							</column_data>
 						</data>
 						<data>
 							<column_data>
-								<column_id>33</column_id>
+								<column_id>39</column_id>
 								<value>3</value>
 							</column_data>
 							<column_data>
-								<column_id>34</column_id>
+								<column_id>40</column_id>
 								<value>([nu_farm_funcionando] &gt; 1)</value>
 							</column_data>
 							<column_data>
-								<column_id>35</column_id>
+								<column_id>41</column_id>
 								<value>Mais de uma</value>
 							</column_data>
 							<column_data>
-								<column_id>36</column_id>
+								<column_id>42</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>37</column_id>
+								<column_id>43</column_id>
 								<value>0</value>
 							</column_data>
 							<column_data>
-								<column_id>38</column_id>
+								<column_id>44</column_id>
 								<value>255</value>
 							</column_data>
 							<column_data>
-								<column_id>39</column_id>
+								<column_id>45</column_id>
 								<value>1</value>
 							</column_data>
 							<column_data>
-								<column_id>40</column_id>
+								<column_id>46</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>41</column_id>
+								<column_id>47</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>42</column_id>
+								<column_id>48</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>43</column_id>
+								<column_id>49</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>44</column_id>
+								<column_id>50</column_id>
 								<value></value>
 							</column_data>
 							<column_data>
-								<column_id>45</column_id>
+								<column_id>51</column_id>
 								<value></value>
 							</column_data>
 						</data>
@@ -4711,7 +5224,7 @@
 						<test_data_num>0</test_data_num>
 						<data_def_list>
 							<data_def>
-								<column_id>33</column_id>
+								<column_id>39</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4726,7 +5239,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>34</column_id>
+								<column_id>40</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>expressao%</template>
@@ -4741,7 +5254,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>35</column_id>
+								<column_id>41</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>titulo%</template>
@@ -4756,7 +5269,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>36</column_id>
+								<column_id>42</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>vermelho%</template>
@@ -4771,7 +5284,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>37</column_id>
+								<column_id>43</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>verde%</template>
@@ -4786,7 +5299,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>38</column_id>
+								<column_id>44</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>azul%</template>
@@ -4801,7 +5314,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>39</column_id>
+								<column_id>45</column_id>
 								<type>Foreign Key</type>
 								<repeat_num>1</repeat_num>
 								<template>%</template>
@@ -4816,7 +5329,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>40</column_id>
+								<column_id>46</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>tamanho%</template>
@@ -4831,7 +5344,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>41</column_id>
+								<column_id>47</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>simbolo%</template>
@@ -4846,7 +5359,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>42</column_id>
+								<column_id>48</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>overmelho%</template>
@@ -4861,7 +5374,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>43</column_id>
+								<column_id>49</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>overde%</template>
@@ -4876,7 +5389,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>44</column_id>
+								<column_id>50</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>oazul%</template>
@@ -4891,7 +5404,7 @@
 								</modified_values>
 							</data_def>
 							<data_def>
-								<column_id>45</column_id>
+								<column_id>51</column_id>
 								<type>Format</type>
 								<repeat_num>1</repeat_num>
 								<template>otamanho%</template>
@@ -4908,6 +5421,213 @@
 						</data_def_list>
 					</repeat_test_data>
 				</table_test_data>
+				<table_test_data>
+					<table_id>14</table_id>
+					<direct_test_data>
+						<data>
+							<column_data>
+								<column_id>67</column_id>
+								<value>http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095</value>
+							</column_data>
+							<column_data>
+								<column_id>68</column_id>
+								<value>1</value>
+							</column_data>
+							<column_data>
+								<column_id>69</column_id>
+								<value>Site das Fármacias Populares</value>
+							</column_data>
+							<column_data>
+								<column_id>70</column_id>
+								<value>1</value>
+							</column_data>
+						</data>
+					</direct_test_data>
+					<repeat_test_data>
+						<test_data_num>0</test_data_num>
+						<data_def_list>
+							<data_def>
+								<column_id>67</column_id>
+								<type>Format</type>
+								<repeat_num>1</repeat_num>
+								<template>link%</template>
+								<from>1</from>
+								<to>100</to>
+								<increment>1</increment>
+								<select>link1</select>
+								<select>link2</select>
+								<select>link3</select>
+								<select>link4</select>
+								<modified_values>
+								</modified_values>
+							</data_def>
+							<data_def>
+								<column_id>68</column_id>
+								<type>Foreign Key</type>
+								<repeat_num>1</repeat_num>
+								<template>%</template>
+								<from>1</from>
+								<to>100</to>
+								<increment>1</increment>
+								<select>1</select>
+								<select>2</select>
+								<select>3</select>
+								<select>4</select>
+								<modified_values>
+								</modified_values>
+							</data_def>
+							<data_def>
+								<column_id>69</column_id>
+								<type>Format</type>
+								<repeat_num>1</repeat_num>
+								<template>nome%</template>
+								<from>1</from>
+								<to>100</to>
+								<increment>1</increment>
+								<select>nome1</select>
+								<select>nome2</select>
+								<select>nome3</select>
+								<select>nome4</select>
+								<modified_values>
+								</modified_values>
+							</data_def>
+							<data_def>
+								<column_id>70</column_id>
+								<type>Format</type>
+								<repeat_num>1</repeat_num>
+								<template>%</template>
+								<from>1</from>
+								<to>100</to>
+								<increment>1</increment>
+								<select>1</select>
+								<select>2</select>
+								<select>3</select>
+								<select>4</select>
+								<modified_values>
+								</modified_values>
+							</data_def>
+						</data_def_list>
+					</repeat_test_data>
+				</table_test_data>
+				<table_test_data>
+					<table_id>15</table_id>
+					<direct_test_data>
+						<data>
+							<column_data>
+								<column_id>71</column_id>
+								<value>1</value>
+							</column_data>
+							<column_data>
+								<column_id>72</column_id>
+								<value>1</value>
+							</column_data>
+						</data>
+					</direct_test_data>
+					<repeat_test_data>
+						<test_data_num>0</test_data_num>
+						<data_def_list>
+							<data_def>
+								<column_id>71</column_id>
+								<type>Foreign Key</type>
+								<repeat_num>1</repeat_num>
+								<template>%</template>
+								<from>1</from>
+								<to>100</to>
+								<increment>1</increment>
+								<select>1</select>
+								<select>2</select>
+								<select>3</select>
+								<select>4</select>
+								<modified_values>
+								</modified_values>
+							</data_def>
+							<data_def>
+								<column_id>72</column_id>
+								<type>Foreign Key</type>
+								<repeat_num>1</repeat_num>
+								<template>%</template>
+								<from>1</from>
+								<to>100</to>
+								<increment>1</increment>
+								<select>1</select>
+								<select>2</select>
+								<select>3</select>
+								<select>4</select>
+								<modified_values>
+								</modified_values>
+							</data_def>
+						</data_def_list>
+					</repeat_test_data>
+				</table_test_data>
+				<table_test_data>
+					<table_id>12</table_id>
+					<direct_test_data>
+						<data>
+							<column_data>
+								<column_id>52</column_id>
+								<value>1</value>
+							</column_data>
+							<column_data>
+								<column_id>53</column_id>
+								<value>Ministério da Saúde</value>
+							</column_data>
+							<column_data>
+								<column_id>54</column_id>
+								<value>http://saude.gov.br</value>
+							</column_data>
+						</data>
+					</direct_test_data>
+					<repeat_test_data>
+						<test_data_num>0</test_data_num>
+						<data_def_list>
+							<data_def>
+								<column_id>52</column_id>
+								<type>Format</type>
+								<repeat_num>1</repeat_num>
+								<template>%</template>
+								<from>1</from>
+								<to>100</to>
+								<increment>1</increment>
+								<select>1</select>
+								<select>2</select>
+								<select>3</select>
+								<select>4</select>
+								<modified_values>
+								</modified_values>
+							</data_def>
+							<data_def>
+								<column_id>53</column_id>
+								<type>Format</type>
+								<repeat_num>1</repeat_num>
+								<template>titulo%</template>
+								<from>1</from>
+								<to>100</to>
+								<increment>1</increment>
+								<select>titulo1</select>
+								<select>titulo2</select>
+								<select>titulo3</select>
+								<select>titulo4</select>
+								<modified_values>
+								</modified_values>
+							</data_def>
+							<data_def>
+								<column_id>54</column_id>
+								<type>Format</type>
+								<repeat_num>1</repeat_num>
+								<template>link%</template>
+								<from>1</from>
+								<to>100</to>
+								<increment>1</increment>
+								<select>link1</select>
+								<select>link2</select>
+								<select>link3</select>
+								<select>link4</select>
+								<modified_values>
+								</modified_values>
+							</data_def>
+						</data_def_list>
+					</repeat_test_data>
+				</table_test_data>
 			</test_data>
 	</test_data_list>
 	<sequence_set>
--
libgit2 0.21.2