Download as
Browse Code »

Commit fdcef82e563e6a509693f6589e6fcc510243a3a8

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

Inclusão de coluna no cadastro de regios (METAESTAT) para definir quais colunas … 

…ficarão visíveis no mapa
Showing 15 changed files with 666 additions and 552 deletions   Show diff stats
admin/admin.db
View file @fdcef82
No preview for this file type
admin/js/estat_tipo_regiao.js
  Diff comments   View file @fdcef82
@@ -56,7 +56,8 @@ function montaTabela(dados){ @@ -56,7 +56,8 @@ function montaTabela(dados){
56 {label:"Data",key:"data",formatter:formatTexto}, 56 {label:"Data",key:"data",formatter:formatTexto},
57 {label:"Código",key:"identificador",formatter:formatTexto}, 57 {label:"Código",key:"identificador",formatter:formatTexto},
58 {label:"Conexão",key:"codigo_estat_conexao",formatter:formatTexto}, 58 {label:"Conexão",key:"codigo_estat_conexao",formatter:formatTexto},
59 - {label:"Nomes",resizeable:false,key:"colunanomeregiao",formatter:formatTexto}, 59 + {label:"Nomes das regiões",resizeable:false,key:"colunanomeregiao",formatter:formatTexto},
  60 + {label:"Colunas visíveis (separa com vírgula)",resizeable:false,key:"colunasvisiveis",formatter:formatTexto},
60 {label:"SRID",key:"srid",formatter:formatTexto} 61 {label:"SRID",key:"srid",formatter:formatTexto}
61 ]; 62 ];
62 myDataSource = new YAHOO.util.DataSource(dados); 63 myDataSource = new YAHOO.util.DataSource(dados);
@@ -64,7 +65,7 @@ function montaTabela(dados){ @@ -64,7 +65,7 @@ function montaTabela(dados){
64 65
65 myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSARRAY; 66 myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSARRAY;
66 myDataSource.responseSchema = { 67 myDataSource.responseSchema = {
67 - fields: ["codigo_tipo_regiao","nome_tipo_regiao","descricao_tipo_regiao","esquemadb","tabela","colunageo","colunacentroide","data","identificador","codigo_estat_conexao","colunanomeregiao","srid"] 68 + fields: ["codigo_tipo_regiao","nome_tipo_regiao","descricao_tipo_regiao","esquemadb","tabela","colunageo","colunacentroide","data","identificador","codigo_estat_conexao","colunanomeregiao","colunasvisiveis","srid"]
68 }; 69 };
69 myDataTable.subscribe( 70 myDataTable.subscribe(
70 'cellClickEvent', 71 'cellClickEvent',
@@ -259,6 +260,7 @@ function montaDiv(i){ @@ -259,6 +260,7 @@ function montaDiv(i){
259 {titulo:"Coluna com o código de cada registro:",id:"Eidentificador",size:"50",value:i.identificador,tipo:"text",div:""}, 260 {titulo:"Coluna com o código de cada registro:",id:"Eidentificador",size:"50",value:i.identificador,tipo:"text",div:""},
260 {titulo:"Código da conexão com o banco:",id:"Ecodigo_estat_conexao",size:"50",value:i.codigo_estat_conexao,tipo:"text",div:""}, 261 {titulo:"Código da conexão com o banco:",id:"Ecodigo_estat_conexao",size:"50",value:i.codigo_estat_conexao,tipo:"text",div:""},
261 {titulo:"Coluna com o nome da região:",id:"Ecolunanomeregiao",size:"50",value:i.colunanomeregiao,tipo:"text",div:""}, 262 {titulo:"Coluna com o nome da região:",id:"Ecolunanomeregiao",size:"50",value:i.colunanomeregiao,tipo:"text",div:""},
  263 + {titulo:"Colunas que ficarão visíveis no mapa:",id:"Ecolunasvisiveis",size:"50",value:i.colunasvisiveis,tipo:"text",div:""},
262 {titulo:"Código SRID:",id:"Esrid",size:"50",value:i.srid,tipo:"text",div:""} 264 {titulo:"Código SRID:",id:"Esrid",size:"50",value:i.srid,tipo:"text",div:""}
263 ] 265 ]
264 }, 266 },
@@ -280,7 +282,7 @@ function montaDivAgregacoes(i){ @@ -280,7 +282,7 @@ function montaDivAgregacoes(i){
280 } 282 }
281 283
282 function gravaDados(id,recordid){ 284 function gravaDados(id,recordid){
283 - var campos = new Array("codigo_estat_conexao","nome_tipo_regiao","descricao_tipo_regiao","esquemadb","tabela","colunageo","colunacentroide","data","identificador","colunanomeregiao","srid"), 285 + var campos = new Array("codigo_estat_conexao","nome_tipo_regiao","descricao_tipo_regiao","esquemadb","tabela","colunageo","colunacentroide","data","identificador","colunanomeregiao","srid","colunasvisiveis"),
284 par = "", 286 par = "",
285 i = 0, 287 i = 0,
286 sUrl,callback; 288 sUrl,callback;
admin/php/classe_metaestat.php
  Diff comments   View file @fdcef82
@@ -259,7 +259,17 @@ class Metaestat{ @@ -259,7 +259,17 @@ class Metaestat{
259 else{ 259 else{
260 $sql = " SELECT d.* "; 260 $sql = " SELECT d.* ";
261 } 261 }
262 - $sqlgeo = $sql.",g.".$colunageo; 262 + //prepara a lista de colunas que ficarao visiveis no sql geo
  263 + $vis = $dadosgeo["colunasvisiveis"];
  264 + $vis = str_replace(" ",",",$vis);
  265 + $vis = str_replace(",,",",",$vis);
  266 + $vis = explode(",",$vis);
  267 + $vis[] = $colunageo;
  268 + $vis = array_unique($vis);
  269 + $vis = implode(",g.",$vis);
  270 + $vis = "g.".$vis;
  271 + //$sqlgeo = $sql.",g.".$colunageo;
  272 + $sqlgeo = $sql.",".$vis;
263 // 273 //
264 if($agregaregiao == true){ 274 if($agregaregiao == true){
265 $dadosAgregacao = $this->listaAgregaRegiaoFilho($dados["codigo_tipo_regiao"], $codigo_tipo_regiao); 275 $dadosAgregacao = $this->listaAgregaRegiaoFilho($dados["codigo_tipo_regiao"], $codigo_tipo_regiao);
@@ -810,14 +820,14 @@ class Metaestat{ @@ -810,14 +820,14 @@ class Metaestat{
810 820
811 Altera uma regiao 821 Altera uma regiao
812 */ 822 */
813 - function alteraTipoRegiao($codigo_tipo_regiao,$nome_tipo_regiao,$descricao_tipo_regiao,$esquemadb,$tabela,$colunageo,$colunacentroide,$data,$identificador,$colunanomeregiao,$srid,$codigo_estat_conexao){ 823 + function alteraTipoRegiao($codigo_tipo_regiao,$nome_tipo_regiao,$descricao_tipo_regiao,$esquemadb,$tabela,$colunageo,$colunacentroide,$data,$identificador,$colunanomeregiao,$srid,$codigo_estat_conexao,$colunasvisiveis){
814 try { 824 try {
815 if($codigo_tipo_regiao != ""){ 825 if($codigo_tipo_regiao != ""){
816 if($this->convUTF){ 826 if($this->convUTF){
817 $nome_tipo_regiao = utf8_encode($nome_tipo_regiao); 827 $nome_tipo_regiao = utf8_encode($nome_tipo_regiao);
818 $descricao_tipo_regiao = utf8_encode($descricao_tipo_regiao); 828 $descricao_tipo_regiao = utf8_encode($descricao_tipo_regiao);
819 } 829 }
820 - $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_tipo_regiao SET codigo_estat_conexao = '$codigo_estat_conexao', colunacentroide = '$colunacentroide',nome_tipo_regiao = '$nome_tipo_regiao',descricao_tipo_regiao = '$descricao_tipo_regiao',esquemadb = '$esquemadb',tabela = '$tabela',colunageo = '$colunageo',data = '$data',identificador = '$identificador',colunanomeregiao = '$colunanomeregiao', srid = '$srid' WHERE codigo_tipo_regiao = $codigo_tipo_regiao"); 830 + $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_tipo_regiao SET codigo_estat_conexao = '$codigo_estat_conexao', colunacentroide = '$colunacentroide',nome_tipo_regiao = '$nome_tipo_regiao',descricao_tipo_regiao = '$descricao_tipo_regiao',esquemadb = '$esquemadb',tabela = '$tabela',colunageo = '$colunageo',data = '$data',identificador = '$identificador',colunanomeregiao = '$colunanomeregiao', srid = '$srid', colunasvisiveis = '$colunasvisiveis' WHERE codigo_tipo_regiao = $codigo_tipo_regiao");
821 $retorna = $codigo_tipo_regiao; 831 $retorna = $codigo_tipo_regiao;
822 } 832 }
823 else{ 833 else{
admin/php/criabanco.php
  Diff comments   View file @fdcef82
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 "CREATE TABLE ".$esquemaadmin."i3geousr_grupotema (id_grupo NUMERIC, id_tema NUMERIC)", 79 "CREATE TABLE ".$esquemaadmin."i3geousr_grupotema (id_grupo NUMERIC, id_tema NUMERIC)",
80 "CREATE TABLE ".$esquemaadmin."i3geousr_grupos (id_grupo INTEGER PRIMARY KEY, nome TEXT)", 80 "CREATE TABLE ".$esquemaadmin."i3geousr_grupos (id_grupo INTEGER PRIMARY KEY, nome TEXT)",
81 "create table ".$esquemaadmin."i3geoestat_conexao (codigo_estat_conexao integer primary key,bancodedados text,host text,porta text,usuario text,senha text)", 81 "create table ".$esquemaadmin."i3geoestat_conexao (codigo_estat_conexao integer primary key,bancodedados text,host text,porta text,usuario text,senha text)",
82 - "create table ".$esquemaadmin."i3geoestat_tipo_regiao(codigo_tipo_regiao integer primary key,nome_tipo_regiao text,descricao_tipo_regiao text,codigo_estat_conexao integer,esquemadb text,tabela text,colunageo text,data text,identificador integer,colunanomeregiao text,srid text,colunacentroide text)", 82 + "create table ".$esquemaadmin."i3geoestat_tipo_regiao(codigo_tipo_regiao integer primary key,nome_tipo_regiao text,descricao_tipo_regiao text,codigo_estat_conexao integer,esquemadb text,tabela text,colunageo text,data text,identificador integer,colunanomeregiao text,srid text,colunacentroide text, colunasvisiveis text)",
83 "create table ".$esquemaadmin."i3geoestat_agregaregiao(id_agregaregiao integer primary key,codigo_tipo_regiao integer,codigo_tipo_regiao_pai integer,colunaligacao_regiaopai text)", 83 "create table ".$esquemaadmin."i3geoestat_agregaregiao(id_agregaregiao integer primary key,codigo_tipo_regiao integer,codigo_tipo_regiao_pai integer,colunaligacao_regiaopai text)",
84 "create table ".$esquemaadmin."i3geoestat_tipo_periodo(codigo_tipo_periodo integer primary key,nome text,descricao text)", 84 "create table ".$esquemaadmin."i3geoestat_tipo_periodo(codigo_tipo_periodo integer primary key,nome text,descricao text)",
85 "create table ".$esquemaadmin."i3geoestat_unidade_medida(codigo_unidade_medida integer primary key,nome text,sigla text,permitesoma integer default 0,permitemedia integer default 0)", 85 "create table ".$esquemaadmin."i3geoestat_unidade_medida(codigo_unidade_medida integer primary key,nome text,sigla text,permitesoma integer default 0,permitemedia integer default 0)",
admin/php/metaestat.php
  Diff comments   View file @fdcef82
@@ -525,7 +525,7 @@ switch (strtoupper($funcao)) @@ -525,7 +525,7 @@ switch (strtoupper($funcao))
525 $codigo_tipo_regiao = $m->alteraTipoRegiao(); 525 $codigo_tipo_regiao = $m->alteraTipoRegiao();
526 } 526 }
527 else{ 527 else{
528 - $codigo_tipo_regiao = $m->alteraTipoRegiao($codigo_tipo_regiao,$nome_tipo_regiao,$descricao_tipo_regiao,$esquemadb,$tabela,$colunageo,$colunacentroide,$data,$identificador,$colunanomeregiao,$srid,$codigo_estat_conexao); 528 + $codigo_tipo_regiao = $m->alteraTipoRegiao($codigo_tipo_regiao,$nome_tipo_regiao,$descricao_tipo_regiao,$esquemadb,$tabela,$colunageo,$colunacentroide,$data,$identificador,$colunanomeregiao,$srid,$codigo_estat_conexao,$colunasvisiveis);
529 } 529 }
530 retornaJSON($m->listaTipoRegiao($codigo_tipo_regiao)); 530 retornaJSON($m->listaTipoRegiao($codigo_tipo_regiao));
531 exit; 531 exit;
admin/php/upgradebanco46_47.php
  Diff comments   View file @fdcef82
@@ -83,7 +83,7 @@ $tabelas = array( @@ -83,7 +83,7 @@ $tabelas = array(
83 "CREATE TABLE ".$esquemaadmin."i3geousr_grupotema (id_grupo NUMERIC, id_tema NUMERIC)", 83 "CREATE TABLE ".$esquemaadmin."i3geousr_grupotema (id_grupo NUMERIC, id_tema NUMERIC)",
84 "CREATE TABLE ".$esquemaadmin."i3geousr_grupos (id_grupo INTEGER PRIMARY KEY, nome TEXT)", 84 "CREATE TABLE ".$esquemaadmin."i3geousr_grupos (id_grupo INTEGER PRIMARY KEY, nome TEXT)",
85 "create table ".$esquemaadmin."i3geoestat_conexao (codigo_estat_conexao integer primary key,bancodedados text,host text,porta text,usuario text,senha text)", 85 "create table ".$esquemaadmin."i3geoestat_conexao (codigo_estat_conexao integer primary key,bancodedados text,host text,porta text,usuario text,senha text)",
86 - "create table ".$esquemaadmin."i3geoestat_tipo_regiao(codigo_tipo_regiao integer primary key,nome_tipo_regiao text,descricao_tipo_regiao text,codigo_estat_conexao integer,esquemadb text,tabela text,colunageo text,data text,identificador integer,colunanomeregiao text,srid text,colunacentroide text)", 86 + "create table ".$esquemaadmin."i3geoestat_tipo_regiao(codigo_tipo_regiao integer primary key,nome_tipo_regiao text,descricao_tipo_regiao text,codigo_estat_conexao integer,esquemadb text,tabela text,colunageo text,data text,identificador integer,colunanomeregiao text,srid text,colunacentroide text, colunasvisiveis text)",
87 "create table ".$esquemaadmin."i3geoestat_agregaregiao(id_agregaregiao integer primary key,codigo_tipo_regiao integer,codigo_tipo_regiao_pai integer,colunaligacao_regiaopai text)", 87 "create table ".$esquemaadmin."i3geoestat_agregaregiao(id_agregaregiao integer primary key,codigo_tipo_regiao integer,codigo_tipo_regiao_pai integer,colunaligacao_regiaopai text)",
88 "create table ".$esquemaadmin."i3geoestat_tipo_periodo(codigo_tipo_periodo integer primary key,nome text,descricao text)", 88 "create table ".$esquemaadmin."i3geoestat_tipo_periodo(codigo_tipo_periodo integer primary key,nome text,descricao text)",
89 "create table ".$esquemaadmin."i3geoestat_unidade_medida(codigo_unidade_medida integer primary key,nome text,sigla text,permitesoma integer default 0,permitemedia integer default 0)", 89 "create table ".$esquemaadmin."i3geoestat_unidade_medida(codigo_unidade_medida integer primary key,nome text,sigla text,permitesoma integer default 0,permitemedia integer default 0)",
admin/sql/metaestat.sql
  Diff comments   View file @fdcef82
@@ -61,6 +61,8 @@ create table i3geoestat_tipo_regiao @@ -61,6 +61,8 @@ create table i3geoestat_tipo_regiao
61 srid text default '4326', 61 srid text default '4326',
62 -- coluna que contém um ponto que representa cada local. pode ser o mesmo que colunageo 62 -- coluna que contém um ponto que representa cada local. pode ser o mesmo que colunageo
63 colunacentroide text, 63 colunacentroide text,
  64 + -- lista de noes de colunas que ficarão visíveis quando os sql de acesso aos dados forem montados
  65 + colunasvisiveis text,
64 foreign key (codigo_estat_conexao) 66 foreign key (codigo_estat_conexao)
65 references i3geoestat_conexao (codigo_estat_conexao) 67 references i3geoestat_conexao (codigo_estat_conexao)
66 ); 68 );
@@ -78,10 +80,10 @@ create table i3geoestat_agregaregiao @@ -78,10 +80,10 @@ create table i3geoestat_agregaregiao
78 ); 80 );
79 81
80 82
81 --- lista controlada de tipos de período de tempo  
82 -create table i3geoestat_tipo_periodo 83 +-- tabela com o nome e descrição de uma variável variável
  84 +create table i3geoestat_variavel
83 ( 85 (
84 - codigo_tipo_periodo integer not null unique primary key autoincrement, 86 + codigo_variavel integer not null unique primary key autoincrement,
85 nome text, 87 nome text,
86 descricao text 88 descricao text
87 ); 89 );
@@ -99,10 +101,10 @@ create table i3geoestat_unidade_medida @@ -99,10 +101,10 @@ create table i3geoestat_unidade_medida
99 ); 101 );
100 102
101 103
102 --- tabela com o nome e descrição de uma variável variável  
103 -create table i3geoestat_variavel 104 +-- lista controlada de tipos de período de tempo
  105 +create table i3geoestat_tipo_periodo
104 ( 106 (
105 - codigo_variavel integer not null unique primary key autoincrement, 107 + codigo_tipo_periodo integer not null unique primary key autoincrement,
106 nome text, 108 nome text,
107 descricao text 109 descricao text
108 ); 110 );
@@ -131,16 +133,16 @@ create table i3geoestat_medida_variavel @@ -131,16 +133,16 @@ create table i3geoestat_medida_variavel
131 nomemedida text, 133 nomemedida text,
132 -- nome da coluna da tabela que contem os dados e que é um identificador único de cada registro 134 -- nome da coluna da tabela que contem os dados e que é um identificador único de cada registro
133 colunaidunico text, 135 colunaidunico text,
134 - foreign key (codigo_tipo_periodo)  
135 - references i3geoestat_tipo_periodo (codigo_tipo_periodo),  
136 - foreign key (codigo_estat_conexao)  
137 - references i3geoestat_conexao (codigo_estat_conexao),  
138 - foreign key (codigo_unidade_medida)  
139 - references i3geoestat_unidade_medida (codigo_unidade_medida),  
140 foreign key (codigo_variavel) 136 foreign key (codigo_variavel)
141 references i3geoestat_variavel (codigo_variavel), 137 references i3geoestat_variavel (codigo_variavel),
142 foreign key (codigo_tipo_regiao) 138 foreign key (codigo_tipo_regiao)
143 - references i3geoestat_tipo_regiao (codigo_tipo_regiao) 139 + references i3geoestat_tipo_regiao (codigo_tipo_regiao),
  140 + foreign key (codigo_unidade_medida)
  141 + references i3geoestat_unidade_medida (codigo_unidade_medida),
  142 + foreign key (codigo_tipo_periodo)
  143 + references i3geoestat_tipo_periodo (codigo_tipo_periodo),
  144 + foreign key (codigo_estat_conexao)
  145 + references i3geoestat_conexao (codigo_estat_conexao)
144 ); 146 );
145 147
146 148
@@ -202,10 +204,10 @@ create table i3geoestat_fonteinfo_medida @@ -202,10 +204,10 @@ create table i3geoestat_fonteinfo_medida
202 ( 204 (
203 id_medida_variavel integer not null, 205 id_medida_variavel integer not null,
204 id_fonteinfo integer not null, 206 id_fonteinfo integer not null,
205 - foreign key (id_medida_variavel)  
206 - references i3geoestat_medida_variavel (id_medida_variavel),  
207 foreign key (id_fonteinfo) 207 foreign key (id_fonteinfo)
208 - references i3geoestat_fonteinfo (id_fonteinfo) 208 + references i3geoestat_fonteinfo (id_fonteinfo),
  209 + foreign key (id_medida_variavel)
  210 + references i3geoestat_medida_variavel (id_medida_variavel)
209 ); 211 );
210 212
211 213
admin/sql/metaestat_basededados.sql
  Diff comments   View file @fdcef82
@@ -11,9 +11,9 @@ INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUE @@ -11,9 +11,9 @@ INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUE
11 11
12 12
13 -- i3geoestat_tipo_regiao 13 -- i3geoestat_tipo_regiao
14 -INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('2', 'Município', 'Limites municipais', '1', 'i3geo_metaestat', 'municipios', 'the_geom', '2010', 'co_municipio', 'no_cidade', '4326', 'the_geom2');  
15 -INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('3', 'Estado', 'Limites estaduais', '1', 'i3geo_metaestat', 'uf', 'the_geom', '2010', 'co_uf', 'no_uf', '4326', 'the_geom');  
16 -INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('1', 'Bairro', 'Limites de bairros', '1', 'i3geo_metaestat', 'bairros', 'the_geom', '2010', 'co_bairro', 'no_bairro', '4326', 'the_geom'); 14 +INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide, colunasvisiveis) VALUES ('2', 'Município', 'Limites municipais', '1', 'i3geo_metaestat', 'municipios', 'the_geom', '2010', 'co_municipio', 'no_cidade', '4326', 'the_geom2', 'co_municipio,no_cidade,co_uf,area_territorial,nu_ano_instalacao');
  15 +INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide, colunasvisiveis) VALUES ('3', 'Estado', 'Limites estaduais', '1', 'i3geo_metaestat', 'uf', 'the_geom', '2010', 'co_uf', 'no_uf', '4326', 'the_geom', 'co_uf,sg_uf,no_uf,no_regiao');
  16 +INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide, colunasvisiveis) VALUES ('1', 'Bairro', 'Limites de bairros', '1', 'i3geo_metaestat', 'bairros', 'the_geom', '2010', 'co_bairro', 'no_bairro', '4326', 'the_geom', 'co_bairro,no_bairro,no_distr,no_municip');
17 17
18 18
19 -- i3geoestat_unidade_medida 19 -- i3geoestat_unidade_medida
aplicmap/geral1debianv6.map
  Diff comments   View file @fdcef82
@@ -34,8 +34,8 @@ MAP @@ -34,8 +34,8 @@ MAP
34 STATUS ON 34 STATUS ON
35 UNITS DD 35 UNITS DD
36 NAME "GERAL" 36 NAME "GERAL"
37 - DEBUG ON  
38 - CONFIG "MS_ERRORFILE" "/tmp/ms_tmp/ms_error.txt" 37 + DEBUG OFF
  38 + #CONFIG "MS_ERRORFILE" "/tmp/ms_tmp/ms_error.txt"
39 # 39 #
40 #utilize o agg apenas com mapserver 5x 40 #utilize o agg apenas com mapserver 5x
41 41
classesphp/mapa_controle.php
  Diff comments   View file @fdcef82
@@ -1088,7 +1088,7 @@ Altera uma classe de um tema, aplicando uma nova classificação ou @@ -1088,7 +1088,7 @@ Altera uma classe de um tema, aplicando uma nova classificação ou
1088 if ($opcao == "alteraclasses") 1088 if ($opcao == "alteraclasses")
1089 { 1089 {
1090 //esta operação é chamada com POST via cpaint 1090 //esta operação é chamada com POST via cpaint
1091 - error_reporting(E_ALL); 1091 + //error_reporting(E_ALL);
1092 alteraclassesPost($ids,$nomes,$exps); 1092 alteraclassesPost($ids,$nomes,$exps);
1093 restauraCon($map_file,$postgis_mapa); 1093 restauraCon($map_file,$postgis_mapa);
1094 cpjson(""); 1094 cpjson("");
documentacao/diagramas/metaestat.erm
  Diff comments   View file @fdcef82
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 </page_setting> 11 </page_setting>
12 <category_index>0</category_index> 12 <category_index>0</category_index>
13 <zoom>1.0</zoom> 13 <zoom>1.0</zoom>
14 - <x>-85</x>  
15 - <y>150</y> 14 + <x>-372</x>
  15 + <y>51</y>
16 <default_color> 16 <default_color>
17 <r>255</r> 17 <r>255</r>
18 <g>128</g> 18 <g>128</g>
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 </connections> 110 </connections>
111 <display>false</display> 111 <display>false</display>
112 <creation_date>2012-07-17 15:03:53</creation_date> 112 <creation_date>2012-07-17 15:03:53</creation_date>
113 - <updated_date>2012-10-10 14:40:16</updated_date> 113 + <updated_date>2012-10-23 08:35:27</updated_date>
114 <model_property> 114 <model_property>
115 <name>Project Name</name> 115 <name>Project Name</name>
116 <value></value> 116 <value></value>
@@ -346,13 +346,26 @@ @@ -346,13 +346,26 @@
346 <array_dimension>null</array_dimension> 346 <array_dimension>null</array_dimension>
347 <unsigned>false</unsigned> 347 <unsigned>false</unsigned>
348 <args></args> 348 <args></args>
  349 + <description>Lista de noes de colunas que ficarão visíveis quando os SQL de acesso aos dados forem montados</description>
  350 + <logical_name>colunasvisiveis</logical_name>
  351 + <physical_name>colunasvisiveis</physical_name>
  352 + <type>text</type>
  353 + </word>
  354 + <word>
  355 + <id>16</id>
  356 + <length>null</length>
  357 + <decimal>null</decimal>
  358 + <array>false</array>
  359 + <array_dimension>null</array_dimension>
  360 + <unsigned>false</unsigned>
  361 + <args></args>
349 <description>Nome da colouna que contém os valores da variável</description> 362 <description>Nome da colouna que contém os valores da variável</description>
350 <logical_name>colunavalor</logical_name> 363 <logical_name>colunavalor</logical_name>
351 <physical_name>colunavalor</physical_name> 364 <physical_name>colunavalor</physical_name>
352 <type>text</type> 365 <type>text</type>
353 </word> 366 </word>
354 <word> 367 <word>
355 - <id>16</id> 368 + <id>17</id>
356 <length>null</length> 369 <length>null</length>
357 <decimal>null</decimal> 370 <decimal>null</decimal>
358 <array>false</array> 371 <array>false</array>
@@ -365,7 +378,7 @@ @@ -365,7 +378,7 @@
365 <type>text</type> 378 <type>text</type>
366 </word> 379 </word>
367 <word> 380 <word>
368 - <id>17</id> 381 + <id>18</id>
369 <length>null</length> 382 <length>null</length>
370 <decimal>null</decimal> 383 <decimal>null</decimal>
371 <array>false</array> 384 <array>false</array>
@@ -378,7 +391,7 @@ @@ -378,7 +391,7 @@
378 <type>text</type> 391 <type>text</type>
379 </word> 392 </word>
380 <word> 393 <word>
381 - <id>18</id> 394 + <id>19</id>
382 <length>null</length> 395 <length>null</length>
383 <decimal>null</decimal> 396 <decimal>null</decimal>
384 <array>false</array> 397 <array>false</array>
@@ -391,7 +404,7 @@ @@ -391,7 +404,7 @@
391 <type>text</type> 404 <type>text</type>
392 </word> 405 </word>
393 <word> 406 <word>
394 - <id>19</id> 407 + <id>20</id>
395 <length>null</length> 408 <length>null</length>
396 <decimal>null</decimal> 409 <decimal>null</decimal>
397 <array>false</array> 410 <array>false</array>
@@ -404,7 +417,7 @@ @@ -404,7 +417,7 @@
404 <type>text</type> 417 <type>text</type>
405 </word> 418 </word>
406 <word> 419 <word>
407 - <id>20</id> 420 + <id>21</id>
408 <length>null</length> 421 <length>null</length>
409 <decimal>null</decimal> 422 <decimal>null</decimal>
410 <array>false</array> 423 <array>false</array>
@@ -417,7 +430,7 @@ @@ -417,7 +430,7 @@
417 <type>text</type> 430 <type>text</type>
418 </word> 431 </word>
419 <word> 432 <word>
420 - <id>21</id> 433 + <id>22</id>
421 <length>null</length> 434 <length>null</length>
422 <decimal>null</decimal> 435 <decimal>null</decimal>
423 <array>false</array> 436 <array>false</array>
@@ -430,7 +443,7 @@ @@ -430,7 +443,7 @@
430 <type>text</type> 443 <type>text</type>
431 </word> 444 </word>
432 <word> 445 <word>
433 - <id>22</id> 446 + <id>23</id>
434 <length>null</length> 447 <length>null</length>
435 <decimal>null</decimal> 448 <decimal>null</decimal>
436 <array>false</array> 449 <array>false</array>
@@ -443,7 +456,7 @@ @@ -443,7 +456,7 @@
443 <type>text</type> 456 <type>text</type>
444 </word> 457 </word>
445 <word> 458 <word>
446 - <id>23</id> 459 + <id>24</id>
447 <length>null</length> 460 <length>null</length>
448 <decimal>null</decimal> 461 <decimal>null</decimal>
449 <array>false</array> 462 <array>false</array>
@@ -456,7 +469,7 @@ @@ -456,7 +469,7 @@
456 <type>text</type> 469 <type>text</type>
457 </word> 470 </word>
458 <word> 471 <word>
459 - <id>24</id> 472 + <id>25</id>
460 <length>null</length> 473 <length>null</length>
461 <decimal>null</decimal> 474 <decimal>null</decimal>
462 <array>false</array> 475 <array>false</array>
@@ -469,7 +482,7 @@ @@ -469,7 +482,7 @@
469 <type>text</type> 482 <type>text</type>
470 </word> 483 </word>
471 <word> 484 <word>
472 - <id>25</id> 485 + <id>26</id>
473 <length>null</length> 486 <length>null</length>
474 <decimal>null</decimal> 487 <decimal>null</decimal>
475 <array>false</array> 488 <array>false</array>
@@ -482,7 +495,7 @@ @@ -482,7 +495,7 @@
482 <type>text</type> 495 <type>text</type>
483 </word> 496 </word>
484 <word> 497 <word>
485 - <id>26</id> 498 + <id>27</id>
486 <length>null</length> 499 <length>null</length>
487 <decimal>null</decimal> 500 <decimal>null</decimal>
488 <array>false</array> 501 <array>false</array>
@@ -495,7 +508,7 @@ @@ -495,7 +508,7 @@
495 <type>integer</type> 508 <type>integer</type>
496 </word> 509 </word>
497 <word> 510 <word>
498 - <id>27</id> 511 + <id>28</id>
499 <length>null</length> 512 <length>null</length>
500 <decimal>null</decimal> 513 <decimal>null</decimal>
501 <array>false</array> 514 <array>false</array>
@@ -508,7 +521,7 @@ @@ -508,7 +521,7 @@
508 <type>integer</type> 521 <type>integer</type>
509 </word> 522 </word>
510 <word> 523 <word>
511 - <id>28</id> 524 + <id>29</id>
512 <length>null</length> 525 <length>null</length>
513 <decimal>null</decimal> 526 <decimal>null</decimal>
514 <array>false</array> 527 <array>false</array>
@@ -521,7 +534,7 @@ @@ -521,7 +534,7 @@
521 <type>integer</type> 534 <type>integer</type>
522 </word> 535 </word>
523 <word> 536 <word>
524 - <id>29</id> 537 + <id>30</id>
525 <length>null</length> 538 <length>null</length>
526 <decimal>null</decimal> 539 <decimal>null</decimal>
527 <array>false</array> 540 <array>false</array>
@@ -534,7 +547,7 @@ @@ -534,7 +547,7 @@
534 <type>integer</type> 547 <type>integer</type>
535 </word> 548 </word>
536 <word> 549 <word>
537 - <id>30</id> 550 + <id>31</id>
538 <length>null</length> 551 <length>null</length>
539 <decimal>null</decimal> 552 <decimal>null</decimal>
540 <array>false</array> 553 <array>false</array>
@@ -547,7 +560,7 @@ @@ -547,7 +560,7 @@
547 <type>integer</type> 560 <type>integer</type>
548 </word> 561 </word>
549 <word> 562 <word>
550 - <id>31</id> 563 + <id>32</id>
551 <length>null</length> 564 <length>null</length>
552 <decimal>null</decimal> 565 <decimal>null</decimal>
553 <array>false</array> 566 <array>false</array>
@@ -560,7 +573,7 @@ @@ -560,7 +573,7 @@
560 <type>integer</type> 573 <type>integer</type>
561 </word> 574 </word>
562 <word> 575 <word>
563 - <id>32</id> 576 + <id>33</id>
564 <length>null</length> 577 <length>null</length>
565 <decimal>null</decimal> 578 <decimal>null</decimal>
566 <array>false</array> 579 <array>false</array>
@@ -573,7 +586,7 @@ @@ -573,7 +586,7 @@
573 <type>integer</type> 586 <type>integer</type>
574 </word> 587 </word>
575 <word> 588 <word>
576 - <id>33</id> 589 + <id>34</id>
577 <length>null</length> 590 <length>null</length>
578 <decimal>null</decimal> 591 <decimal>null</decimal>
579 <array>false</array> 592 <array>false</array>
@@ -586,7 +599,7 @@ @@ -586,7 +599,7 @@
586 <type>integer</type> 599 <type>integer</type>
587 </word> 600 </word>
588 <word> 601 <word>
589 - <id>34</id> 602 + <id>35</id>
590 <length>null</length> 603 <length>null</length>
591 <decimal>null</decimal> 604 <decimal>null</decimal>
592 <array>false</array> 605 <array>false</array>
@@ -599,7 +612,7 @@ @@ -599,7 +612,7 @@
599 <type>integer</type> 612 <type>integer</type>
600 </word> 613 </word>
601 <word> 614 <word>
602 - <id>35</id> 615 + <id>36</id>
603 <length>null</length> 616 <length>null</length>
604 <decimal>null</decimal> 617 <decimal>null</decimal>
605 <array>false</array> 618 <array>false</array>
@@ -612,7 +625,7 @@ @@ -612,7 +625,7 @@
612 <type>text</type> 625 <type>text</type>
613 </word> 626 </word>
614 <word> 627 <word>
615 - <id>36</id> 628 + <id>37</id>
616 <length>null</length> 629 <length>null</length>
617 <decimal>null</decimal> 630 <decimal>null</decimal>
618 <array>false</array> 631 <array>false</array>
@@ -625,7 +638,7 @@ @@ -625,7 +638,7 @@
625 <type>text</type> 638 <type>text</type>
626 </word> 639 </word>
627 <word> 640 <word>
628 - <id>37</id> 641 + <id>38</id>
629 <length>null</length> 642 <length>null</length>
630 <decimal>null</decimal> 643 <decimal>null</decimal>
631 <array>false</array> 644 <array>false</array>
@@ -638,7 +651,7 @@ @@ -638,7 +651,7 @@
638 <type>text</type> 651 <type>text</type>
639 </word> 652 </word>
640 <word> 653 <word>
641 - <id>38</id> 654 + <id>39</id>
642 <length>null</length> 655 <length>null</length>
643 <decimal>null</decimal> 656 <decimal>null</decimal>
644 <array>false</array> 657 <array>false</array>
@@ -651,7 +664,7 @@ @@ -651,7 +664,7 @@
651 <type>text</type> 664 <type>text</type>
652 </word> 665 </word>
653 <word> 666 <word>
654 - <id>39</id> 667 + <id>40</id>
655 <length>null</length> 668 <length>null</length>
656 <decimal>null</decimal> 669 <decimal>null</decimal>
657 <array>false</array> 670 <array>false</array>
@@ -664,7 +677,7 @@ @@ -664,7 +677,7 @@
664 <type>text</type> 677 <type>text</type>
665 </word> 678 </word>
666 <word> 679 <word>
667 - <id>40</id> 680 + <id>41</id>
668 <length>null</length> 681 <length>null</length>
669 <decimal>null</decimal> 682 <decimal>null</decimal>
670 <array>false</array> 683 <array>false</array>
@@ -677,7 +690,7 @@ @@ -677,7 +690,7 @@
677 <type>text</type> 690 <type>text</type>
678 </word> 691 </word>
679 <word> 692 <word>
680 - <id>41</id> 693 + <id>42</id>
681 <length>null</length> 694 <length>null</length>
682 <decimal>null</decimal> 695 <decimal>null</decimal>
683 <array>false</array> 696 <array>false</array>
@@ -690,7 +703,7 @@ @@ -690,7 +703,7 @@
690 <type>text</type> 703 <type>text</type>
691 </word> 704 </word>
692 <word> 705 <word>
693 - <id>42</id> 706 + <id>43</id>
694 <length>null</length> 707 <length>null</length>
695 <decimal>null</decimal> 708 <decimal>null</decimal>
696 <array>false</array> 709 <array>false</array>
@@ -703,7 +716,7 @@ @@ -703,7 +716,7 @@
703 <type>text</type> 716 <type>text</type>
704 </word> 717 </word>
705 <word> 718 <word>
706 - <id>43</id> 719 + <id>44</id>
707 <length>null</length> 720 <length>null</length>
708 <decimal>null</decimal> 721 <decimal>null</decimal>
709 <array>false</array> 722 <array>false</array>
@@ -716,7 +729,7 @@ @@ -716,7 +729,7 @@
716 <type>text</type> 729 <type>text</type>
717 </word> 730 </word>
718 <word> 731 <word>
719 - <id>44</id> 732 + <id>45</id>
720 <length>null</length> 733 <length>null</length>
721 <decimal>null</decimal> 734 <decimal>null</decimal>
722 <array>false</array> 735 <array>false</array>
@@ -729,7 +742,7 @@ @@ -729,7 +742,7 @@
729 <type>text</type> 742 <type>text</type>
730 </word> 743 </word>
731 <word> 744 <word>
732 - <id>45</id> 745 + <id>46</id>
733 <length>null</length> 746 <length>null</length>
734 <decimal>null</decimal> 747 <decimal>null</decimal>
735 <array>false</array> 748 <array>false</array>
@@ -742,7 +755,7 @@ @@ -742,7 +755,7 @@
742 <type>text</type> 755 <type>text</type>
743 </word> 756 </word>
744 <word> 757 <word>
745 - <id>46</id> 758 + <id>47</id>
746 <length>null</length> 759 <length>null</length>
747 <decimal>null</decimal> 760 <decimal>null</decimal>
748 <array>false</array> 761 <array>false</array>
@@ -755,7 +768,7 @@ @@ -755,7 +768,7 @@
755 <type>text</type> 768 <type>text</type>
756 </word> 769 </word>
757 <word> 770 <word>
758 - <id>47</id> 771 + <id>48</id>
759 <length>null</length> 772 <length>null</length>
760 <decimal>null</decimal> 773 <decimal>null</decimal>
761 <array>false</array> 774 <array>false</array>
@@ -768,7 +781,7 @@ @@ -768,7 +781,7 @@
768 <type>text</type> 781 <type>text</type>
769 </word> 782 </word>
770 <word> 783 <word>
771 - <id>48</id> 784 + <id>49</id>
772 <length>null</length> 785 <length>null</length>
773 <decimal>null</decimal> 786 <decimal>null</decimal>
774 <array>false</array> 787 <array>false</array>
@@ -781,7 +794,7 @@ @@ -781,7 +794,7 @@
781 <type>text</type> 794 <type>text</type>
782 </word> 795 </word>
783 <word> 796 <word>
784 - <id>49</id> 797 + <id>50</id>
785 <length>null</length> 798 <length>null</length>
786 <decimal>null</decimal> 799 <decimal>null</decimal>
787 <array>false</array> 800 <array>false</array>
@@ -794,7 +807,7 @@ @@ -794,7 +807,7 @@
794 <type>text</type> 807 <type>text</type>
795 </word> 808 </word>
796 <word> 809 <word>
797 - <id>50</id> 810 + <id>51</id>
798 <length>null</length> 811 <length>null</length>
799 <decimal>null</decimal> 812 <decimal>null</decimal>
800 <array>false</array> 813 <array>false</array>
@@ -807,7 +820,7 @@ @@ -807,7 +820,7 @@
807 <type>integer</type> 820 <type>integer</type>
808 </word> 821 </word>
809 <word> 822 <word>
810 - <id>51</id> 823 + <id>52</id>
811 <length>null</length> 824 <length>null</length>
812 <decimal>null</decimal> 825 <decimal>null</decimal>
813 <array>false</array> 826 <array>false</array>
@@ -820,7 +833,7 @@ @@ -820,7 +833,7 @@
820 <type>integer</type> 833 <type>integer</type>
821 </word> 834 </word>
822 <word> 835 <word>
823 - <id>52</id> 836 + <id>53</id>
824 <length>null</length> 837 <length>null</length>
825 <decimal>null</decimal> 838 <decimal>null</decimal>
826 <array>false</array> 839 <array>false</array>
@@ -833,7 +846,7 @@ @@ -833,7 +846,7 @@
833 <type>text</type> 846 <type>text</type>
834 </word> 847 </word>
835 <word> 848 <word>
836 - <id>53</id> 849 + <id>54</id>
837 <length>null</length> 850 <length>null</length>
838 <decimal>null</decimal> 851 <decimal>null</decimal>
839 <array>false</array> 852 <array>false</array>
@@ -846,7 +859,7 @@ @@ -846,7 +859,7 @@
846 <type>text</type> 859 <type>text</type>
847 </word> 860 </word>
848 <word> 861 <word>
849 - <id>54</id> 862 + <id>55</id>
850 <length>null</length> 863 <length>null</length>
851 <decimal>null</decimal> 864 <decimal>null</decimal>
852 <array>false</array> 865 <array>false</array>
@@ -859,7 +872,7 @@ @@ -859,7 +872,7 @@
859 <type>text</type> 872 <type>text</type>
860 </word> 873 </word>
861 <word> 874 <word>
862 - <id>55</id> 875 + <id>56</id>
863 <length>null</length> 876 <length>null</length>
864 <decimal>null</decimal> 877 <decimal>null</decimal>
865 <array>false</array> 878 <array>false</array>
@@ -872,7 +885,7 @@ @@ -872,7 +885,7 @@
872 <type>text</type> 885 <type>text</type>
873 </word> 886 </word>
874 <word> 887 <word>
875 - <id>56</id> 888 + <id>57</id>
876 <length>null</length> 889 <length>null</length>
877 <decimal>null</decimal> 890 <decimal>null</decimal>
878 <array>false</array> 891 <array>false</array>
@@ -885,7 +898,7 @@ @@ -885,7 +898,7 @@
885 <type>text</type> 898 <type>text</type>
886 </word> 899 </word>
887 <word> 900 <word>
888 - <id>57</id> 901 + <id>58</id>
889 <length>null</length> 902 <length>null</length>
890 <decimal>null</decimal> 903 <decimal>null</decimal>
891 <array>false</array> 904 <array>false</array>
@@ -898,7 +911,7 @@ @@ -898,7 +911,7 @@
898 <type>text</type> 911 <type>text</type>
899 </word> 912 </word>
900 <word> 913 <word>
901 - <id>58</id> 914 + <id>59</id>
902 <length>null</length> 915 <length>null</length>
903 <decimal>null</decimal> 916 <decimal>null</decimal>
904 <array>false</array> 917 <array>false</array>
@@ -911,7 +924,7 @@ @@ -911,7 +924,7 @@
911 <type>text</type> 924 <type>text</type>
912 </word> 925 </word>
913 <word> 926 <word>
914 - <id>59</id> 927 + <id>60</id>
915 <length>null</length> 928 <length>null</length>
916 <decimal>null</decimal> 929 <decimal>null</decimal>
917 <array>false</array> 930 <array>false</array>
@@ -924,7 +937,7 @@ @@ -924,7 +937,7 @@
924 <type>text</type> 937 <type>text</type>
925 </word> 938 </word>
926 <word> 939 <word>
927 - <id>60</id> 940 + <id>61</id>
928 <length>null</length> 941 <length>null</length>
929 <decimal>null</decimal> 942 <decimal>null</decimal>
930 <array>false</array> 943 <array>false</array>
@@ -937,7 +950,7 @@ @@ -937,7 +950,7 @@
937 <type>text</type> 950 <type>text</type>
938 </word> 951 </word>
939 <word> 952 <word>
940 - <id>61</id> 953 + <id>62</id>
941 <length>null</length> 954 <length>null</length>
942 <decimal>null</decimal> 955 <decimal>null</decimal>
943 <array>false</array> 956 <array>false</array>
@@ -950,7 +963,7 @@ @@ -950,7 +963,7 @@
950 <type>text</type> 963 <type>text</type>
951 </word> 964 </word>
952 <word> 965 <word>
953 - <id>62</id> 966 + <id>63</id>
954 <length>null</length> 967 <length>null</length>
955 <decimal>null</decimal> 968 <decimal>null</decimal>
956 <array>false</array> 969 <array>false</array>
@@ -963,7 +976,7 @@ @@ -963,7 +976,7 @@
963 <type>text</type> 976 <type>text</type>
964 </word> 977 </word>
965 <word> 978 <word>
966 - <id>63</id> 979 + <id>64</id>
967 <length>null</length> 980 <length>null</length>
968 <decimal>null</decimal> 981 <decimal>null</decimal>
969 <array>false</array> 982 <array>false</array>
@@ -976,7 +989,7 @@ @@ -976,7 +989,7 @@
976 <type>text</type> 989 <type>text</type>
977 </word> 990 </word>
978 <word> 991 <word>
979 - <id>64</id> 992 + <id>65</id>
980 <length>null</length> 993 <length>null</length>
981 <decimal>null</decimal> 994 <decimal>null</decimal>
982 <array>false</array> 995 <array>false</array>
@@ -1113,7 +1126,7 @@ @@ -1113,7 +1126,7 @@
1113 </sequence> 1126 </sequence>
1114 </normal_column> 1127 </normal_column>
1115 <normal_column> 1128 <normal_column>
1116 - <word_id>54</word_id> 1129 + <word_id>55</word_id>
1117 <id>2</id> 1130 <id>2</id>
1118 <description></description> 1131 <description></description>
1119 <unique_key_name></unique_key_name> 1132 <unique_key_name></unique_key_name>
@@ -1145,7 +1158,7 @@ @@ -1145,7 +1158,7 @@
1145 </sequence> 1158 </sequence>
1146 </normal_column> 1159 </normal_column>
1147 <normal_column> 1160 <normal_column>
1148 - <word_id>51</word_id> 1161 + <word_id>52</word_id>
1149 <id>3</id> 1162 <id>3</id>
1150 <description></description> 1163 <description></description>
1151 <unique_key_name></unique_key_name> 1164 <unique_key_name></unique_key_name>
@@ -1177,7 +1190,7 @@ @@ -1177,7 +1190,7 @@
1177 </sequence> 1190 </sequence>
1178 </normal_column> 1191 </normal_column>
1179 <normal_column> 1192 <normal_column>
1180 - <word_id>50</word_id> 1193 + <word_id>51</word_id>
1181 <id>4</id> 1194 <id>4</id>
1182 <description></description> 1195 <description></description>
1183 <unique_key_name></unique_key_name> 1196 <unique_key_name></unique_key_name>
@@ -1272,7 +1285,7 @@ @@ -1272,7 +1285,7 @@
1272 </sequence> 1285 </sequence>
1273 </normal_column> 1286 </normal_column>
1274 <normal_column> 1287 <normal_column>
1275 - <word_id>41</word_id> 1288 + <word_id>39</word_id>
1276 <id>6</id> 1289 <id>6</id>
1277 <description></description> 1290 <description></description>
1278 <unique_key_name></unique_key_name> 1291 <unique_key_name></unique_key_name>
@@ -1399,7 +1412,7 @@ @@ -1399,7 +1412,7 @@
1399 </sequence> 1412 </sequence>
1400 </normal_column> 1413 </normal_column>
1401 <normal_column> 1414 <normal_column>
1402 - <word_id>42</word_id> 1415 + <word_id>38</word_id>
1403 <id>9</id> 1416 <id>9</id>
1404 <description></description> 1417 <description></description>
1405 <unique_key_name></unique_key_name> 1418 <unique_key_name></unique_key_name>
@@ -1431,7 +1444,7 @@ @@ -1431,7 +1444,7 @@
1431 </sequence> 1444 </sequence>
1432 </normal_column> 1445 </normal_column>
1433 <normal_column> 1446 <normal_column>
1434 - <word_id>17</word_id> 1447 + <word_id>18</word_id>
1435 <id>10</id> 1448 <id>10</id>
1436 <description></description> 1449 <description></description>
1437 <unique_key_name></unique_key_name> 1450 <unique_key_name></unique_key_name>
@@ -1487,7 +1500,7 @@ @@ -1487,7 +1500,7 @@
1487 <connections> 1500 <connections>
1488 <relation> 1501 <relation>
1489 <id>0</id> 1502 <id>0</id>
1490 - <source>14</source> 1503 + <source>12</source>
1491 <target>5</target> 1504 <target>5</target>
1492 <child_cardinality>1..n</child_cardinality> 1505 <child_cardinality>1..n</child_cardinality>
1493 <parent_cardinality>1</parent_cardinality> 1506 <parent_cardinality>1</parent_cardinality>
@@ -1511,7 +1524,7 @@ @@ -1511,7 +1524,7 @@
1511 <option></option> 1524 <option></option>
1512 <columns> 1525 <columns>
1513 <normal_column> 1526 <normal_column>
1514 - <word_id>29</word_id> 1527 + <word_id>30</word_id>
1515 <id>11</id> 1528 <id>11</id>
1516 <description></description> 1529 <description></description>
1517 <unique_key_name></unique_key_name> 1530 <unique_key_name></unique_key_name>
@@ -1543,7 +1556,7 @@ @@ -1543,7 +1556,7 @@
1543 </sequence> 1556 </sequence>
1544 </normal_column> 1557 </normal_column>
1545 <normal_column> 1558 <normal_column>
1546 - <word_id>39</word_id> 1559 + <word_id>43</word_id>
1547 <id>12</id> 1560 <id>12</id>
1548 <description></description> 1561 <description></description>
1549 <unique_key_name></unique_key_name> 1562 <unique_key_name></unique_key_name>
@@ -1576,7 +1589,7 @@ @@ -1576,7 +1589,7 @@
1576 </normal_column> 1589 </normal_column>
1577 <normal_column> 1590 <normal_column>
1578 <id>13</id> 1591 <id>13</id>
1579 - <referenced_column>65</referenced_column> 1592 + <referenced_column>49</referenced_column>
1580 <relation>0</relation> 1593 <relation>0</relation>
1581 <description></description> 1594 <description></description>
1582 <unique_key_name></unique_key_name> 1595 <unique_key_name></unique_key_name>
@@ -1608,7 +1621,7 @@ @@ -1608,7 +1621,7 @@
1608 </sequence> 1621 </sequence>
1609 </normal_column> 1622 </normal_column>
1610 <normal_column> 1623 <normal_column>
1611 - <word_id>46</word_id> 1624 + <word_id>47</word_id>
1612 <id>14</id> 1625 <id>14</id>
1613 <description></description> 1626 <description></description>
1614 <unique_key_name></unique_key_name> 1627 <unique_key_name></unique_key_name>
@@ -1688,7 +1701,7 @@ @@ -1688,7 +1701,7 @@
1688 <option></option> 1701 <option></option>
1689 <columns> 1702 <columns>
1690 <normal_column> 1703 <normal_column>
1691 - <word_id>28</word_id> 1704 + <word_id>29</word_id>
1692 <id>15</id> 1705 <id>15</id>
1693 <description></description> 1706 <description></description>
1694 <unique_key_name></unique_key_name> 1707 <unique_key_name></unique_key_name>
@@ -1720,7 +1733,7 @@ @@ -1720,7 +1733,7 @@
1720 </sequence> 1733 </sequence>
1721 </normal_column> 1734 </normal_column>
1722 <normal_column> 1735 <normal_column>
1723 - <word_id>23</word_id> 1736 + <word_id>24</word_id>
1724 <id>16</id> 1737 <id>16</id>
1725 <description></description> 1738 <description></description>
1726 <unique_key_name></unique_key_name> 1739 <unique_key_name></unique_key_name>
@@ -1752,7 +1765,7 @@ @@ -1752,7 +1765,7 @@
1752 </sequence> 1765 </sequence>
1753 </normal_column> 1766 </normal_column>
1754 <normal_column> 1767 <normal_column>
1755 - <word_id>61</word_id> 1768 + <word_id>62</word_id>
1756 <id>17</id> 1769 <id>17</id>
1757 <description></description> 1770 <description></description>
1758 <unique_key_name></unique_key_name> 1771 <unique_key_name></unique_key_name>
@@ -1784,7 +1797,7 @@ @@ -1784,7 +1797,7 @@
1784 </sequence> 1797 </sequence>
1785 </normal_column> 1798 </normal_column>
1786 <normal_column> 1799 <normal_column>
1787 - <word_id>64</word_id> 1800 + <word_id>65</word_id>
1788 <id>18</id> 1801 <id>18</id>
1789 <description></description> 1802 <description></description>
1790 <unique_key_name></unique_key_name> 1803 <unique_key_name></unique_key_name>
@@ -1816,7 +1829,7 @@ @@ -1816,7 +1829,7 @@
1816 </sequence> 1829 </sequence>
1817 </normal_column> 1830 </normal_column>
1818 <normal_column> 1831 <normal_column>
1819 - <word_id>63</word_id> 1832 + <word_id>64</word_id>
1820 <id>19</id> 1833 <id>19</id>
1821 <description></description> 1834 <description></description>
1822 <unique_key_name></unique_key_name> 1835 <unique_key_name></unique_key_name>
@@ -1913,7 +1926,7 @@ @@ -1913,7 +1926,7 @@
1913 </sequence> 1926 </sequence>
1914 </normal_column> 1927 </normal_column>
1915 <normal_column> 1928 <normal_column>
1916 - <word_id>59</word_id> 1929 + <word_id>60</word_id>
1917 <id>22</id> 1930 <id>22</id>
1918 <description></description> 1931 <description></description>
1919 <unique_key_name></unique_key_name> 1932 <unique_key_name></unique_key_name>
@@ -1945,7 +1958,7 @@ @@ -1945,7 +1958,7 @@
1945 </sequence> 1958 </sequence>
1946 </normal_column> 1959 </normal_column>
1947 <normal_column> 1960 <normal_column>
1948 - <word_id>55</word_id> 1961 + <word_id>56</word_id>
1949 <id>23</id> 1962 <id>23</id>
1950 <description></description> 1963 <description></description>
1951 <unique_key_name></unique_key_name> 1964 <unique_key_name></unique_key_name>
@@ -1977,7 +1990,7 @@ @@ -1977,7 +1990,7 @@
1977 </sequence> 1990 </sequence>
1978 </normal_column> 1991 </normal_column>
1979 <normal_column> 1992 <normal_column>
1980 - <word_id>49</word_id> 1993 + <word_id>50</word_id>
1981 <id>24</id> 1994 <id>24</id>
1982 <description></description> 1995 <description></description>
1983 <unique_key_name></unique_key_name> 1996 <unique_key_name></unique_key_name>
@@ -2009,7 +2022,7 @@ @@ -2009,7 +2022,7 @@
2009 </sequence> 2022 </sequence>
2010 </normal_column> 2023 </normal_column>
2011 <normal_column> 2024 <normal_column>
2012 - <word_id>48</word_id> 2025 + <word_id>49</word_id>
2013 <id>25</id> 2026 <id>25</id>
2014 <description></description> 2027 <description></description>
2015 <unique_key_name></unique_key_name> 2028 <unique_key_name></unique_key_name>
@@ -2041,7 +2054,7 @@ @@ -2041,7 +2054,7 @@
2041 </sequence> 2054 </sequence>
2042 </normal_column> 2055 </normal_column>
2043 <normal_column> 2056 <normal_column>
2044 - <word_id>45</word_id> 2057 + <word_id>46</word_id>
2045 <id>26</id> 2058 <id>26</id>
2046 <description></description> 2059 <description></description>
2047 <unique_key_name></unique_key_name> 2060 <unique_key_name></unique_key_name>
@@ -2073,7 +2086,7 @@ @@ -2073,7 +2086,7 @@
2073 </sequence> 2086 </sequence>
2074 </normal_column> 2087 </normal_column>
2075 <normal_column> 2088 <normal_column>
2076 - <word_id>47</word_id> 2089 + <word_id>48</word_id>
2077 <id>27</id> 2090 <id>27</id>
2078 <description></description> 2091 <description></description>
2079 <unique_key_name></unique_key_name> 2092 <unique_key_name></unique_key_name>
@@ -2136,7 +2149,7 @@ @@ -2136,7 +2149,7 @@
2136 <option></option> 2149 <option></option>
2137 <columns> 2150 <columns>
2138 <normal_column> 2151 <normal_column>
2139 - <word_id>30</word_id> 2152 + <word_id>31</word_id>
2140 <id>28</id> 2153 <id>28</id>
2141 <description></description> 2154 <description></description>
2142 <unique_key_name></unique_key_name> 2155 <unique_key_name></unique_key_name>
@@ -2168,7 +2181,7 @@ @@ -2168,7 +2181,7 @@
2168 </sequence> 2181 </sequence>
2169 </normal_column> 2182 </normal_column>
2170 <normal_column> 2183 <normal_column>
2171 - <word_id>60</word_id> 2184 + <word_id>61</word_id>
2172 <id>29</id> 2185 <id>29</id>
2173 <description></description> 2186 <description></description>
2174 <unique_key_name></unique_key_name> 2187 <unique_key_name></unique_key_name>
@@ -2200,7 +2213,7 @@ @@ -2200,7 +2213,7 @@
2200 </sequence> 2213 </sequence>
2201 </normal_column> 2214 </normal_column>
2202 <normal_column> 2215 <normal_column>
2203 - <word_id>35</word_id> 2216 + <word_id>37</word_id>
2204 <id>30</id> 2217 <id>30</id>
2205 <description></description> 2218 <description></description>
2206 <unique_key_name></unique_key_name> 2219 <unique_key_name></unique_key_name>
@@ -2256,7 +2269,7 @@ @@ -2256,7 +2269,7 @@
2256 <connections> 2269 <connections>
2257 <relation> 2270 <relation>
2258 <id>2</id> 2271 <id>2</id>
2259 - <source>14</source> 2272 + <source>12</source>
2260 <target>8</target> 2273 <target>8</target>
2261 <child_cardinality>1..n</child_cardinality> 2274 <child_cardinality>1..n</child_cardinality>
2262 <parent_cardinality>1</parent_cardinality> 2275 <parent_cardinality>1</parent_cardinality>
@@ -2313,7 +2326,7 @@ @@ -2313,7 +2326,7 @@
2313 </normal_column> 2326 </normal_column>
2314 <normal_column> 2327 <normal_column>
2315 <id>32</id> 2328 <id>32</id>
2316 - <referenced_column>65</referenced_column> 2329 + <referenced_column>49</referenced_column>
2317 <relation>2</relation> 2330 <relation>2</relation>
2318 <description></description> 2331 <description></description>
2319 <unique_key_name></unique_key_name> 2332 <unique_key_name></unique_key_name>
@@ -2345,7 +2358,7 @@ @@ -2345,7 +2358,7 @@
2345 </sequence> 2358 </sequence>
2346 </normal_column> 2359 </normal_column>
2347 <normal_column> 2360 <normal_column>
2348 - <word_id>38</word_id> 2361 + <word_id>42</word_id>
2349 <id>33</id> 2362 <id>33</id>
2350 <description></description> 2363 <description></description>
2351 <unique_key_name></unique_key_name> 2364 <unique_key_name></unique_key_name>
@@ -2377,7 +2390,7 @@ @@ -2377,7 +2390,7 @@
2377 </sequence> 2390 </sequence>
2378 </normal_column> 2391 </normal_column>
2379 <normal_column> 2392 <normal_column>
2380 - <word_id>31</word_id> 2393 + <word_id>32</word_id>
2381 <id>34</id> 2394 <id>34</id>
2382 <description></description> 2395 <description></description>
2383 <unique_key_name></unique_key_name> 2396 <unique_key_name></unique_key_name>
@@ -2433,7 +2446,7 @@ @@ -2433,7 +2446,7 @@
2433 <connections> 2446 <connections>
2434 <relation> 2447 <relation>
2435 <id>3</id> 2448 <id>3</id>
2436 - <source>14</source> 2449 + <source>7</source>
2437 <target>9</target> 2450 <target>9</target>
2438 <child_cardinality>1..n</child_cardinality> 2451 <child_cardinality>1..n</child_cardinality>
2439 <parent_cardinality>1</parent_cardinality> 2452 <parent_cardinality>1</parent_cardinality>
@@ -2450,7 +2463,7 @@ @@ -2450,7 +2463,7 @@
2450 </relation> 2463 </relation>
2451 <relation> 2464 <relation>
2452 <id>4</id> 2465 <id>4</id>
2453 - <source>7</source> 2466 + <source>12</source>
2454 <target>9</target> 2467 <target>9</target>
2455 <child_cardinality>1..n</child_cardinality> 2468 <child_cardinality>1..n</child_cardinality>
2456 <parent_cardinality>1</parent_cardinality> 2469 <parent_cardinality>1</parent_cardinality>
@@ -2475,8 +2488,8 @@ @@ -2475,8 +2488,8 @@
2475 <columns> 2488 <columns>
2476 <normal_column> 2489 <normal_column>
2477 <id>35</id> 2490 <id>35</id>
2478 - <referenced_column>65</referenced_column>  
2479 - <relation>3</relation> 2491 + <referenced_column>49</referenced_column>
  2492 + <relation>4</relation>
2480 <description></description> 2493 <description></description>
2481 <unique_key_name></unique_key_name> 2494 <unique_key_name></unique_key_name>
2482 <logical_name></logical_name> 2495 <logical_name></logical_name>
@@ -2509,7 +2522,7 @@ @@ -2509,7 +2522,7 @@
2509 <normal_column> 2522 <normal_column>
2510 <id>36</id> 2523 <id>36</id>
2511 <referenced_column>28</referenced_column> 2524 <referenced_column>28</referenced_column>
2512 - <relation>4</relation> 2525 + <relation>3</relation>
2513 <description></description> 2526 <description></description>
2514 <unique_key_name></unique_key_name> 2527 <unique_key_name></unique_key_name>
2515 <logical_name></logical_name> 2528 <logical_name></logical_name>
@@ -2564,7 +2577,7 @@ @@ -2564,7 +2577,7 @@
2564 <connections> 2577 <connections>
2565 <relation> 2578 <relation>
2566 <id>5</id> 2579 <id>5</id>
2567 - <source>14</source> 2580 + <source>12</source>
2568 <target>10</target> 2581 <target>10</target>
2569 <child_cardinality>1..n</child_cardinality> 2582 <child_cardinality>1..n</child_cardinality>
2570 <parent_cardinality>1</parent_cardinality> 2583 <parent_cardinality>1</parent_cardinality>
@@ -2588,7 +2601,7 @@ @@ -2588,7 +2601,7 @@
2588 <option></option> 2601 <option></option>
2589 <columns> 2602 <columns>
2590 <normal_column> 2603 <normal_column>
2591 - <word_id>34</word_id> 2604 + <word_id>35</word_id>
2592 <id>37</id> 2605 <id>37</id>
2593 <description></description> 2606 <description></description>
2594 <unique_key_name></unique_key_name> 2607 <unique_key_name></unique_key_name>
@@ -2652,7 +2665,7 @@ @@ -2652,7 +2665,7 @@
2652 </sequence> 2665 </sequence>
2653 </normal_column> 2666 </normal_column>
2654 <normal_column> 2667 <normal_column>
2655 - <word_id>37</word_id> 2668 + <word_id>41</word_id>
2656 <id>39</id> 2669 <id>39</id>
2657 <description></description> 2670 <description></description>
2658 <unique_key_name></unique_key_name> 2671 <unique_key_name></unique_key_name>
@@ -2684,7 +2697,7 @@ @@ -2684,7 +2697,7 @@
2684 </sequence> 2697 </sequence>
2685 </normal_column> 2698 </normal_column>
2686 <normal_column> 2699 <normal_column>
2687 - <word_id>18</word_id> 2700 + <word_id>20</word_id>
2688 <id>40</id> 2701 <id>40</id>
2689 <description></description> 2702 <description></description>
2690 <unique_key_name></unique_key_name> 2703 <unique_key_name></unique_key_name>
@@ -2716,7 +2729,7 @@ @@ -2716,7 +2729,7 @@
2716 </sequence> 2729 </sequence>
2717 </normal_column> 2730 </normal_column>
2718 <normal_column> 2731 <normal_column>
2719 - <word_id>33</word_id> 2732 + <word_id>34</word_id>
2720 <id>41</id> 2733 <id>41</id>
2721 <description></description> 2734 <description></description>
2722 <unique_key_name></unique_key_name> 2735 <unique_key_name></unique_key_name>
@@ -2749,7 +2762,7 @@ @@ -2749,7 +2762,7 @@
2749 </normal_column> 2762 </normal_column>
2750 <normal_column> 2763 <normal_column>
2751 <id>42</id> 2764 <id>42</id>
2752 - <referenced_column>65</referenced_column> 2765 + <referenced_column>49</referenced_column>
2753 <relation>5</relation> 2766 <relation>5</relation>
2754 <description></description> 2767 <description></description>
2755 <unique_key_name></unique_key_name> 2768 <unique_key_name></unique_key_name>
@@ -2791,45 +2804,28 @@ @@ -2791,45 +2804,28 @@
2791 </table> 2804 </table>
2792 <table> 2805 <table>
2793 <id>11</id> 2806 <id>11</id>
2794 - <height>275</height> 2807 + <height>170</height>
2795 <width>292</width> 2808 <width>292</width>
2796 <font_name>Ubuntu</font_name> 2809 <font_name>Ubuntu</font_name>
2797 <font_size>9</font_size> 2810 <font_size>9</font_size>
2798 - <x>-336</x>  
2799 - <y>236</y> 2811 + <x>8</x>
  2812 + <y>499</y>
2800 <color> 2813 <color>
2801 <r>255</r> 2814 <r>255</r>
2802 - <g>128</g>  
2803 - <b>255</b> 2815 + <g>165</g>
  2816 + <b>0</b>
2804 </color> 2817 </color>
2805 <connections> 2818 <connections>
2806 - <relation>  
2807 - <id>6</id>  
2808 - <source>13</source>  
2809 - <target>11</target>  
2810 - <child_cardinality>1..n</child_cardinality>  
2811 - <parent_cardinality>1</parent_cardinality>  
2812 - <reference_for_pk>true</reference_for_pk>  
2813 - <name></name>  
2814 - <on_delete_action>RESTRICT</on_delete_action>  
2815 - <on_update_action>RESTRICT</on_update_action>  
2816 - <source_xp>-1</source_xp>  
2817 - <source_yp>-1</source_yp>  
2818 - <target_xp>-1</target_xp>  
2819 - <target_yp>-1</target_yp>  
2820 - <referenced_column>null</referenced_column>  
2821 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
2822 - </relation>  
2823 </connections> 2819 </connections>
2824 - <physical_name>i3geoestat_tipo_regiao</physical_name>  
2825 - <logical_name>i3geoestat_tipo_regiao</logical_name>  
2826 - <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description> 2820 + <physical_name>i3geoestat_conexao</physical_name>
  2821 + <logical_name>i3geoestat_conexao</logical_name>
  2822 + <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados&#x0A;Código 0 indica que será utilizada a conexão padrão</description>
2827 <constraint></constraint> 2823 <constraint></constraint>
2828 <primary_key_name></primary_key_name> 2824 <primary_key_name></primary_key_name>
2829 <option></option> 2825 <option></option>
2830 <columns> 2826 <columns>
2831 <normal_column> 2827 <normal_column>
2832 - <word_id>4</word_id> 2828 + <word_id>2</word_id>
2833 <id>43</id> 2829 <id>43</id>
2834 <description></description> 2830 <description></description>
2835 <unique_key_name></unique_key_name> 2831 <unique_key_name></unique_key_name>
@@ -2861,7 +2857,7 @@ @@ -2861,7 +2857,7 @@
2861 </sequence> 2857 </sequence>
2862 </normal_column> 2858 </normal_column>
2863 <normal_column> 2859 <normal_column>
2864 - <word_id>44</word_id> 2860 + <word_id>1</word_id>
2865 <id>44</id> 2861 <id>44</id>
2866 <description></description> 2862 <description></description>
2867 <unique_key_name></unique_key_name> 2863 <unique_key_name></unique_key_name>
@@ -2893,7 +2889,7 @@ @@ -2893,7 +2889,7 @@
2893 </sequence> 2889 </sequence>
2894 </normal_column> 2890 </normal_column>
2895 <normal_column> 2891 <normal_column>
2896 - <word_id>20</word_id> 2892 + <word_id>26</word_id>
2897 <id>45</id> 2893 <id>45</id>
2898 <description></description> 2894 <description></description>
2899 <unique_key_name></unique_key_name> 2895 <unique_key_name></unique_key_name>
@@ -2925,41 +2921,8 @@ @@ -2925,41 +2921,8 @@
2925 </sequence> 2921 </sequence>
2926 </normal_column> 2922 </normal_column>
2927 <normal_column> 2923 <normal_column>
  2924 + <word_id>53</word_id>
2928 <id>46</id> 2925 <id>46</id>
2929 - <referenced_column>59</referenced_column>  
2930 - <relation>6</relation>  
2931 - <description></description>  
2932 - <unique_key_name></unique_key_name>  
2933 - <logical_name></logical_name>  
2934 - <physical_name></physical_name>  
2935 - <type>integer</type>  
2936 - <constraint></constraint>  
2937 - <default_value></default_value>  
2938 - <auto_increment>false</auto_increment>  
2939 - <foreign_key>true</foreign_key>  
2940 - <not_null>false</not_null>  
2941 - <primary_key>false</primary_key>  
2942 - <unique_key>false</unique_key>  
2943 - <character_set></character_set>  
2944 - <collation></collation>  
2945 - <sequence>  
2946 - <name></name>  
2947 - <schema></schema>  
2948 - <increment></increment>  
2949 - <min_value></min_value>  
2950 - <max_value></max_value>  
2951 - <start></start>  
2952 - <cache></cache>  
2953 - <cycle>false</cycle>  
2954 - <order>false</order>  
2955 - <description></description>  
2956 - <data_type></data_type>  
2957 - <decimal_size>0</decimal_size>  
2958 - </sequence>  
2959 - </normal_column>  
2960 - <normal_column>  
2961 - <word_id>22</word_id>  
2962 - <id>47</id>  
2963 <description></description> 2926 <description></description>
2964 <unique_key_name></unique_key_name> 2927 <unique_key_name></unique_key_name>
2965 <logical_name></logical_name> 2928 <logical_name></logical_name>
@@ -2990,8 +2953,8 @@ @@ -2990,8 +2953,8 @@
2990 </sequence> 2953 </sequence>
2991 </normal_column> 2954 </normal_column>
2992 <normal_column> 2955 <normal_column>
2993 - <word_id>58</word_id>  
2994 - <id>48</id> 2956 + <word_id>63</word_id>
  2957 + <id>47</id>
2995 <description></description> 2958 <description></description>
2996 <unique_key_name></unique_key_name> 2959 <unique_key_name></unique_key_name>
2997 <logical_name></logical_name> 2960 <logical_name></logical_name>
@@ -3022,8 +2985,8 @@ @@ -3022,8 +2985,8 @@
3022 </sequence> 2985 </sequence>
3023 </normal_column> 2986 </normal_column>
3024 <normal_column> 2987 <normal_column>
3025 - <word_id>10</word_id>  
3026 - <id>49</id> 2988 + <word_id>54</word_id>
  2989 + <id>48</id>
3027 <description></description> 2990 <description></description>
3028 <unique_key_name></unique_key_name> 2991 <unique_key_name></unique_key_name>
3029 <logical_name></logical_name> 2992 <logical_name></logical_name>
@@ -3053,18 +3016,167 @@ @@ -3053,18 +3016,167 @@
3053 <decimal_size>0</decimal_size> 3016 <decimal_size>0</decimal_size>
3054 </sequence> 3017 </sequence>
3055 </normal_column> 3018 </normal_column>
3056 - <normal_column>  
3057 - <word_id>16</word_id>  
3058 - <id>50</id> 3019 + </columns>
  3020 + <indexes>
  3021 + </indexes>
  3022 + <complex_unique_key_list>
  3023 + </complex_unique_key_list>
  3024 + <table_properties>
  3025 + <schema></schema>
  3026 + </table_properties>
  3027 + </table>
  3028 + <table>
  3029 + <id>12</id>
  3030 + <height>339</height>
  3031 + <width>292</width>
  3032 + <font_name>Ubuntu</font_name>
  3033 + <font_size>9</font_size>
  3034 + <x>353</x>
  3035 + <y>155</y>
  3036 + <color>
  3037 + <r>160</r>
  3038 + <g>32</g>
  3039 + <b>240</b>
  3040 + </color>
  3041 + <connections>
  3042 + <relation>
  3043 + <id>6</id>
  3044 + <source>4</source>
  3045 + <target>12</target>
  3046 + <child_cardinality>1..n</child_cardinality>
  3047 + <parent_cardinality>1</parent_cardinality>
  3048 + <reference_for_pk>true</reference_for_pk>
  3049 + <name></name>
  3050 + <on_delete_action>RESTRICT</on_delete_action>
  3051 + <on_update_action>RESTRICT</on_update_action>
  3052 + <source_xp>-1</source_xp>
  3053 + <source_yp>-1</source_yp>
  3054 + <target_xp>-1</target_xp>
  3055 + <target_yp>-1</target_yp>
  3056 + <referenced_column>null</referenced_column>
  3057 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3058 + </relation>
  3059 + <relation>
  3060 + <id>7</id>
  3061 + <source>14</source>
  3062 + <target>12</target>
  3063 + <child_cardinality>1..n</child_cardinality>
  3064 + <parent_cardinality>1</parent_cardinality>
  3065 + <reference_for_pk>true</reference_for_pk>
  3066 + <name></name>
  3067 + <on_delete_action>RESTRICT</on_delete_action>
  3068 + <on_update_action>RESTRICT</on_update_action>
  3069 + <source_xp>-1</source_xp>
  3070 + <source_yp>-1</source_yp>
  3071 + <target_xp>-1</target_xp>
  3072 + <target_yp>-1</target_yp>
  3073 + <referenced_column>null</referenced_column>
  3074 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3075 + </relation>
  3076 + <relation>
  3077 + <id>8</id>
  3078 + <source>2</source>
  3079 + <target>12</target>
  3080 + <child_cardinality>1..n</child_cardinality>
  3081 + <parent_cardinality>1</parent_cardinality>
  3082 + <reference_for_pk>true</reference_for_pk>
  3083 + <name></name>
  3084 + <on_delete_action>RESTRICT</on_delete_action>
  3085 + <on_update_action>RESTRICT</on_update_action>
  3086 + <source_xp>-1</source_xp>
  3087 + <source_yp>-1</source_yp>
  3088 + <target_xp>-1</target_xp>
  3089 + <target_yp>-1</target_yp>
  3090 + <referenced_column>null</referenced_column>
  3091 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3092 + </relation>
  3093 + <relation>
  3094 + <id>9</id>
  3095 + <source>3</source>
  3096 + <target>12</target>
  3097 + <child_cardinality>1..n</child_cardinality>
  3098 + <parent_cardinality>1</parent_cardinality>
  3099 + <reference_for_pk>true</reference_for_pk>
  3100 + <name></name>
  3101 + <on_delete_action>RESTRICT</on_delete_action>
  3102 + <on_update_action>RESTRICT</on_update_action>
  3103 + <source_xp>-1</source_xp>
  3104 + <source_yp>-1</source_yp>
  3105 + <target_xp>-1</target_xp>
  3106 + <target_yp>-1</target_yp>
  3107 + <referenced_column>null</referenced_column>
  3108 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3109 + </relation>
  3110 + <relation>
  3111 + <id>10</id>
  3112 + <source>11</source>
  3113 + <target>12</target>
  3114 + <child_cardinality>1..n</child_cardinality>
  3115 + <parent_cardinality>1</parent_cardinality>
  3116 + <reference_for_pk>true</reference_for_pk>
  3117 + <name></name>
  3118 + <on_delete_action>RESTRICT</on_delete_action>
  3119 + <on_update_action>RESTRICT</on_update_action>
  3120 + <source_xp>-1</source_xp>
  3121 + <source_yp>-1</source_yp>
  3122 + <target_xp>-1</target_xp>
  3123 + <target_yp>-1</target_yp>
  3124 + <referenced_column>null</referenced_column>
  3125 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3126 + </relation>
  3127 + </connections>
  3128 + <physical_name>i3geoestat_medida_variavel</physical_name>
  3129 + <logical_name>i3geoestat_medida_variavel</logical_name>
  3130 + <description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description>
  3131 + <constraint></constraint>
  3132 + <primary_key_name></primary_key_name>
  3133 + <option></option>
  3134 + <columns>
  3135 + <normal_column>
  3136 + <word_id>33</word_id>
  3137 + <id>49</id>
3059 <description></description> 3138 <description></description>
3060 <unique_key_name></unique_key_name> 3139 <unique_key_name></unique_key_name>
3061 <logical_name></logical_name> 3140 <logical_name></logical_name>
3062 <physical_name></physical_name> 3141 <physical_name></physical_name>
3063 - <type>text</type> 3142 + <type>integer</type>
3064 <constraint></constraint> 3143 <constraint></constraint>
3065 <default_value></default_value> 3144 <default_value></default_value>
3066 - <auto_increment>false</auto_increment> 3145 + <auto_increment>true</auto_increment>
3067 <foreign_key>false</foreign_key> 3146 <foreign_key>false</foreign_key>
  3147 + <not_null>true</not_null>
  3148 + <primary_key>true</primary_key>
  3149 + <unique_key>true</unique_key>
  3150 + <character_set></character_set>
  3151 + <collation></collation>
  3152 + <sequence>
  3153 + <name></name>
  3154 + <schema></schema>
  3155 + <increment></increment>
  3156 + <min_value></min_value>
  3157 + <max_value></max_value>
  3158 + <start></start>
  3159 + <cache></cache>
  3160 + <cycle>false</cycle>
  3161 + <order>false</order>
  3162 + <description></description>
  3163 + <data_type></data_type>
  3164 + <decimal_size>0</decimal_size>
  3165 + </sequence>
  3166 + </normal_column>
  3167 + <normal_column>
  3168 + <id>50</id>
  3169 + <referenced_column>0</referenced_column>
  3170 + <relation>8</relation>
  3171 + <description></description>
  3172 + <unique_key_name></unique_key_name>
  3173 + <logical_name></logical_name>
  3174 + <physical_name></physical_name>
  3175 + <type>integer</type>
  3176 + <constraint></constraint>
  3177 + <default_value></default_value>
  3178 + <auto_increment>false</auto_increment>
  3179 + <foreign_key>true</foreign_key>
3068 <not_null>false</not_null> 3180 <not_null>false</not_null>
3069 <primary_key>false</primary_key> 3181 <primary_key>false</primary_key>
3070 <unique_key>false</unique_key> 3182 <unique_key>false</unique_key>
@@ -3086,8 +3198,9 @@ @@ -3086,8 +3198,9 @@
3086 </sequence> 3198 </sequence>
3087 </normal_column> 3199 </normal_column>
3088 <normal_column> 3200 <normal_column>
3089 - <word_id>26</word_id>  
3090 <id>51</id> 3201 <id>51</id>
  3202 + <referenced_column>5</referenced_column>
  3203 + <relation>9</relation>
3091 <description></description> 3204 <description></description>
3092 <unique_key_name></unique_key_name> 3205 <unique_key_name></unique_key_name>
3093 <logical_name></logical_name> 3206 <logical_name></logical_name>
@@ -3096,7 +3209,7 @@ @@ -3096,7 +3209,7 @@
3096 <constraint></constraint> 3209 <constraint></constraint>
3097 <default_value></default_value> 3210 <default_value></default_value>
3098 <auto_increment>false</auto_increment> 3211 <auto_increment>false</auto_increment>
3099 - <foreign_key>false</foreign_key> 3212 + <foreign_key>true</foreign_key>
3100 <not_null>false</not_null> 3213 <not_null>false</not_null>
3101 <primary_key>false</primary_key> 3214 <primary_key>false</primary_key>
3102 <unique_key>false</unique_key> 3215 <unique_key>false</unique_key>
@@ -3118,17 +3231,18 @@ @@ -3118,17 +3231,18 @@
3118 </sequence> 3231 </sequence>
3119 </normal_column> 3232 </normal_column>
3120 <normal_column> 3233 <normal_column>
3121 - <word_id>14</word_id>  
3122 <id>52</id> 3234 <id>52</id>
  3235 + <referenced_column>8</referenced_column>
  3236 + <relation>6</relation>
3123 <description></description> 3237 <description></description>
3124 <unique_key_name></unique_key_name> 3238 <unique_key_name></unique_key_name>
3125 <logical_name></logical_name> 3239 <logical_name></logical_name>
3126 <physical_name></physical_name> 3240 <physical_name></physical_name>
3127 - <type>text</type> 3241 + <type>integer</type>
3128 <constraint></constraint> 3242 <constraint></constraint>
3129 <default_value></default_value> 3243 <default_value></default_value>
3130 <auto_increment>false</auto_increment> 3244 <auto_increment>false</auto_increment>
3131 - <foreign_key>false</foreign_key> 3245 + <foreign_key>true</foreign_key>
3132 <not_null>false</not_null> 3246 <not_null>false</not_null>
3133 <primary_key>false</primary_key> 3247 <primary_key>false</primary_key>
3134 <unique_key>false</unique_key> 3248 <unique_key>false</unique_key>
@@ -3150,17 +3264,18 @@ @@ -3150,17 +3264,18 @@
3150 </sequence> 3264 </sequence>
3151 </normal_column> 3265 </normal_column>
3152 <normal_column> 3266 <normal_column>
3153 - <word_id>56</word_id>  
3154 <id>53</id> 3267 <id>53</id>
  3268 + <referenced_column>66</referenced_column>
  3269 + <relation>7</relation>
3155 <description></description> 3270 <description></description>
3156 <unique_key_name></unique_key_name> 3271 <unique_key_name></unique_key_name>
3157 <logical_name></logical_name> 3272 <logical_name></logical_name>
3158 <physical_name></physical_name> 3273 <physical_name></physical_name>
3159 - <type>text</type> 3274 + <type>integer</type>
3160 <constraint></constraint> 3275 <constraint></constraint>
3161 - <default_value>4326</default_value> 3276 + <default_value></default_value>
3162 <auto_increment>false</auto_increment> 3277 <auto_increment>false</auto_increment>
3163 - <foreign_key>false</foreign_key> 3278 + <foreign_key>true</foreign_key>
3164 <not_null>false</not_null> 3279 <not_null>false</not_null>
3165 <primary_key>false</primary_key> 3280 <primary_key>false</primary_key>
3166 <unique_key>false</unique_key> 3281 <unique_key>false</unique_key>
@@ -3182,17 +3297,18 @@ @@ -3182,17 +3297,18 @@
3182 </sequence> 3297 </sequence>
3183 </normal_column> 3298 </normal_column>
3184 <normal_column> 3299 <normal_column>
3185 - <word_id>9</word_id>  
3186 <id>54</id> 3300 <id>54</id>
  3301 + <referenced_column>43</referenced_column>
  3302 + <relation>10</relation>
3187 <description></description> 3303 <description></description>
3188 <unique_key_name></unique_key_name> 3304 <unique_key_name></unique_key_name>
3189 <logical_name></logical_name> 3305 <logical_name></logical_name>
3190 <physical_name></physical_name> 3306 <physical_name></physical_name>
3191 - <type>text</type> 3307 + <type>integer</type>
3192 <constraint></constraint> 3308 <constraint></constraint>
3193 <default_value></default_value> 3309 <default_value></default_value>
3194 <auto_increment>false</auto_increment> 3310 <auto_increment>false</auto_increment>
3195 - <foreign_key>false</foreign_key> 3311 + <foreign_key>true</foreign_key>
3196 <not_null>false</not_null> 3312 <not_null>false</not_null>
3197 <primary_key>false</primary_key> 3313 <primary_key>false</primary_key>
3198 <unique_key>false</unique_key> 3314 <unique_key>false</unique_key>
@@ -3213,69 +3329,21 @@ @@ -3213,69 +3329,21 @@
3213 <decimal_size>0</decimal_size> 3329 <decimal_size>0</decimal_size>
3214 </sequence> 3330 </sequence>
3215 </normal_column> 3331 </normal_column>
3216 - </columns>  
3217 - <indexes>  
3218 - </indexes>  
3219 - <complex_unique_key_list>  
3220 - </complex_unique_key_list>  
3221 - <table_properties>  
3222 - <schema></schema>  
3223 - </table_properties>  
3224 - </table>  
3225 - <table>  
3226 - <id>12</id>  
3227 - <height>128</height>  
3228 - <width>270</width>  
3229 - <font_name>Ubuntu</font_name>  
3230 - <font_size>9</font_size>  
3231 - <x>-372</x>  
3232 - <y>596</y>  
3233 - <color>  
3234 - <r>255</r>  
3235 - <g>128</g>  
3236 - <b>255</b>  
3237 - </color>  
3238 - <connections>  
3239 - <relation>  
3240 - <id>7</id>  
3241 - <source>11</source>  
3242 - <target>12</target>  
3243 - <child_cardinality>1..n</child_cardinality>  
3244 - <parent_cardinality>1</parent_cardinality>  
3245 - <reference_for_pk>true</reference_for_pk>  
3246 - <name></name>  
3247 - <on_delete_action>RESTRICT</on_delete_action>  
3248 - <on_update_action>RESTRICT</on_update_action>  
3249 - <source_xp>-1</source_xp>  
3250 - <source_yp>-1</source_yp>  
3251 - <target_xp>-1</target_xp>  
3252 - <target_yp>-1</target_yp>  
3253 - <referenced_column>null</referenced_column>  
3254 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3255 - </relation>  
3256 - </connections>  
3257 - <physical_name>i3geoestat_agregaregiao</physical_name>  
3258 - <logical_name>i3geoestat_agregaregiao</logical_name>  
3259 - <description></description>  
3260 - <constraint></constraint>  
3261 - <primary_key_name></primary_key_name>  
3262 - <option></option>  
3263 - <columns>  
3264 <normal_column> 3332 <normal_column>
3265 - <word_id>27</word_id> 3333 + <word_id>22</word_id>
3266 <id>55</id> 3334 <id>55</id>
3267 <description></description> 3335 <description></description>
3268 <unique_key_name></unique_key_name> 3336 <unique_key_name></unique_key_name>
3269 <logical_name></logical_name> 3337 <logical_name></logical_name>
3270 <physical_name></physical_name> 3338 <physical_name></physical_name>
3271 - <type>integer</type> 3339 + <type>text</type>
3272 <constraint></constraint> 3340 <constraint></constraint>
3273 <default_value></default_value> 3341 <default_value></default_value>
3274 - <auto_increment>true</auto_increment> 3342 + <auto_increment>false</auto_increment>
3275 <foreign_key>false</foreign_key> 3343 <foreign_key>false</foreign_key>
3276 - <not_null>true</not_null>  
3277 - <primary_key>true</primary_key>  
3278 - <unique_key>true</unique_key> 3344 + <not_null>false</not_null>
  3345 + <primary_key>false</primary_key>
  3346 + <unique_key>false</unique_key>
3279 <character_set></character_set> 3347 <character_set></character_set>
3280 <collation></collation> 3348 <collation></collation>
3281 <sequence> 3349 <sequence>
@@ -3294,18 +3362,17 @@ @@ -3294,18 +3362,17 @@
3294 </sequence> 3362 </sequence>
3295 </normal_column> 3363 </normal_column>
3296 <normal_column> 3364 <normal_column>
  3365 + <word_id>58</word_id>
3297 <id>56</id> 3366 <id>56</id>
3298 - <referenced_column>43</referenced_column>  
3299 - <relation>7</relation>  
3300 <description></description> 3367 <description></description>
3301 <unique_key_name></unique_key_name> 3368 <unique_key_name></unique_key_name>
3302 <logical_name></logical_name> 3369 <logical_name></logical_name>
3303 <physical_name></physical_name> 3370 <physical_name></physical_name>
3304 - <type>integer</type> 3371 + <type>text</type>
3305 <constraint></constraint> 3372 <constraint></constraint>
3306 <default_value></default_value> 3373 <default_value></default_value>
3307 <auto_increment>false</auto_increment> 3374 <auto_increment>false</auto_increment>
3308 - <foreign_key>true</foreign_key> 3375 + <foreign_key>false</foreign_key>
3309 <not_null>false</not_null> 3376 <not_null>false</not_null>
3310 <primary_key>false</primary_key> 3377 <primary_key>false</primary_key>
3311 <unique_key>false</unique_key> 3378 <unique_key>false</unique_key>
@@ -3327,13 +3394,13 @@ @@ -3327,13 +3394,13 @@
3327 </sequence> 3394 </sequence>
3328 </normal_column> 3395 </normal_column>
3329 <normal_column> 3396 <normal_column>
3330 - <word_id>5</word_id> 3397 + <word_id>16</word_id>
3331 <id>57</id> 3398 <id>57</id>
3332 <description></description> 3399 <description></description>
3333 <unique_key_name></unique_key_name> 3400 <unique_key_name></unique_key_name>
3334 <logical_name></logical_name> 3401 <logical_name></logical_name>
3335 <physical_name></physical_name> 3402 <physical_name></physical_name>
3336 - <type>integer</type> 3403 + <type>text</type>
3337 <constraint></constraint> 3404 <constraint></constraint>
3338 <default_value></default_value> 3405 <default_value></default_value>
3339 <auto_increment>false</auto_increment> 3406 <auto_increment>false</auto_increment>
@@ -3359,7 +3426,7 @@ @@ -3359,7 +3426,7 @@
3359 </sequence> 3426 </sequence>
3360 </normal_column> 3427 </normal_column>
3361 <normal_column> 3428 <normal_column>
3362 - <word_id>13</word_id> 3429 + <word_id>11</word_id>
3363 <id>58</id> 3430 <id>58</id>
3364 <description></description> 3431 <description></description>
3365 <unique_key_name></unique_key_name> 3432 <unique_key_name></unique_key_name>
@@ -3381,61 +3448,30 @@ @@ -3381,61 +3448,30 @@
3381 <increment></increment> 3448 <increment></increment>
3382 <min_value></min_value> 3449 <min_value></min_value>
3383 <max_value></max_value> 3450 <max_value></max_value>
3384 - <start></start>  
3385 - <cache></cache>  
3386 - <cycle>false</cycle>  
3387 - <order>false</order>  
3388 - <description></description>  
3389 - <data_type></data_type>  
3390 - <decimal_size>0</decimal_size>  
3391 - </sequence>  
3392 - </normal_column>  
3393 - </columns>  
3394 - <indexes>  
3395 - </indexes>  
3396 - <complex_unique_key_list>  
3397 - </complex_unique_key_list>  
3398 - <table_properties>  
3399 - <schema></schema>  
3400 - </table_properties>  
3401 - </table>  
3402 - <table>  
3403 - <id>13</id>  
3404 - <height>170</height>  
3405 - <width>292</width>  
3406 - <font_name>Ubuntu</font_name>  
3407 - <font_size>9</font_size>  
3408 - <x>8</x>  
3409 - <y>499</y>  
3410 - <color>  
3411 - <r>255</r>  
3412 - <g>165</g>  
3413 - <b>0</b>  
3414 - </color>  
3415 - <connections>  
3416 - </connections>  
3417 - <physical_name>i3geoestat_conexao</physical_name>  
3418 - <logical_name>i3geoestat_conexao</logical_name>  
3419 - <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados&#x0A;Código 0 indica que será utilizada a conexão padrão</description>  
3420 - <constraint></constraint>  
3421 - <primary_key_name></primary_key_name>  
3422 - <option></option>  
3423 - <columns> 3451 + <start></start>
  3452 + <cache></cache>
  3453 + <cycle>false</cycle>
  3454 + <order>false</order>
  3455 + <description></description>
  3456 + <data_type></data_type>
  3457 + <decimal_size>0</decimal_size>
  3458 + </sequence>
  3459 + </normal_column>
3424 <normal_column> 3460 <normal_column>
3425 - <word_id>2</word_id> 3461 + <word_id>25</word_id>
3426 <id>59</id> 3462 <id>59</id>
3427 <description></description> 3463 <description></description>
3428 <unique_key_name></unique_key_name> 3464 <unique_key_name></unique_key_name>
3429 <logical_name></logical_name> 3465 <logical_name></logical_name>
3430 <physical_name></physical_name> 3466 <physical_name></physical_name>
3431 - <type>integer</type> 3467 + <type>text</type>
3432 <constraint></constraint> 3468 <constraint></constraint>
3433 <default_value></default_value> 3469 <default_value></default_value>
3434 - <auto_increment>true</auto_increment> 3470 + <auto_increment>false</auto_increment>
3435 <foreign_key>false</foreign_key> 3471 <foreign_key>false</foreign_key>
3436 - <not_null>true</not_null>  
3437 - <primary_key>true</primary_key>  
3438 - <unique_key>true</unique_key> 3472 + <not_null>false</not_null>
  3473 + <primary_key>false</primary_key>
  3474 + <unique_key>false</unique_key>
3439 <character_set></character_set> 3475 <character_set></character_set>
3440 <collation></collation> 3476 <collation></collation>
3441 <sequence> 3477 <sequence>
@@ -3454,7 +3490,7 @@ @@ -3454,7 +3490,7 @@
3454 </sequence> 3490 </sequence>
3455 </normal_column> 3491 </normal_column>
3456 <normal_column> 3492 <normal_column>
3457 - <word_id>1</word_id> 3493 + <word_id>44</word_id>
3458 <id>60</id> 3494 <id>60</id>
3459 <description></description> 3495 <description></description>
3460 <unique_key_name></unique_key_name> 3496 <unique_key_name></unique_key_name>
@@ -3486,7 +3522,7 @@ @@ -3486,7 +3522,7 @@
3486 </sequence> 3522 </sequence>
3487 </normal_column> 3523 </normal_column>
3488 <normal_column> 3524 <normal_column>
3489 - <word_id>25</word_id> 3525 + <word_id>12</word_id>
3490 <id>61</id> 3526 <id>61</id>
3491 <description></description> 3527 <description></description>
3492 <unique_key_name></unique_key_name> 3528 <unique_key_name></unique_key_name>
@@ -3517,18 +3553,99 @@ @@ -3517,18 +3553,99 @@
3517 <decimal_size>0</decimal_size> 3553 <decimal_size>0</decimal_size>
3518 </sequence> 3554 </sequence>
3519 </normal_column> 3555 </normal_column>
  3556 + </columns>
  3557 + <indexes>
  3558 + </indexes>
  3559 + <complex_unique_key_list>
  3560 + </complex_unique_key_list>
  3561 + <table_properties>
  3562 + <schema></schema>
  3563 + </table_properties>
  3564 + </table>
  3565 + <table>
  3566 + <id>13</id>
  3567 + <height>128</height>
  3568 + <width>270</width>
  3569 + <font_name>Ubuntu</font_name>
  3570 + <font_size>9</font_size>
  3571 + <x>-372</x>
  3572 + <y>596</y>
  3573 + <color>
  3574 + <r>255</r>
  3575 + <g>128</g>
  3576 + <b>255</b>
  3577 + </color>
  3578 + <connections>
  3579 + <relation>
  3580 + <id>11</id>
  3581 + <source>14</source>
  3582 + <target>13</target>
  3583 + <child_cardinality>1..n</child_cardinality>
  3584 + <parent_cardinality>1</parent_cardinality>
  3585 + <reference_for_pk>true</reference_for_pk>
  3586 + <name></name>
  3587 + <on_delete_action>RESTRICT</on_delete_action>
  3588 + <on_update_action>RESTRICT</on_update_action>
  3589 + <source_xp>-1</source_xp>
  3590 + <source_yp>-1</source_yp>
  3591 + <target_xp>-1</target_xp>
  3592 + <target_yp>-1</target_yp>
  3593 + <referenced_column>null</referenced_column>
  3594 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3595 + </relation>
  3596 + </connections>
  3597 + <physical_name>i3geoestat_agregaregiao</physical_name>
  3598 + <logical_name>i3geoestat_agregaregiao</logical_name>
  3599 + <description></description>
  3600 + <constraint></constraint>
  3601 + <primary_key_name></primary_key_name>
  3602 + <option></option>
  3603 + <columns>
3520 <normal_column> 3604 <normal_column>
3521 - <word_id>52</word_id> 3605 + <word_id>28</word_id>
3522 <id>62</id> 3606 <id>62</id>
3523 <description></description> 3607 <description></description>
3524 <unique_key_name></unique_key_name> 3608 <unique_key_name></unique_key_name>
3525 <logical_name></logical_name> 3609 <logical_name></logical_name>
3526 <physical_name></physical_name> 3610 <physical_name></physical_name>
3527 - <type>text</type> 3611 + <type>integer</type>
3528 <constraint></constraint> 3612 <constraint></constraint>
3529 <default_value></default_value> 3613 <default_value></default_value>
3530 - <auto_increment>false</auto_increment> 3614 + <auto_increment>true</auto_increment>
3531 <foreign_key>false</foreign_key> 3615 <foreign_key>false</foreign_key>
  3616 + <not_null>true</not_null>
  3617 + <primary_key>true</primary_key>
  3618 + <unique_key>true</unique_key>
  3619 + <character_set></character_set>
  3620 + <collation></collation>
  3621 + <sequence>
  3622 + <name></name>
  3623 + <schema></schema>
  3624 + <increment></increment>
  3625 + <min_value></min_value>
  3626 + <max_value></max_value>
  3627 + <start></start>
  3628 + <cache></cache>
  3629 + <cycle>false</cycle>
  3630 + <order>false</order>
  3631 + <description></description>
  3632 + <data_type></data_type>
  3633 + <decimal_size>0</decimal_size>
  3634 + </sequence>
  3635 + </normal_column>
  3636 + <normal_column>
  3637 + <id>63</id>
  3638 + <referenced_column>66</referenced_column>
  3639 + <relation>11</relation>
  3640 + <description></description>
  3641 + <unique_key_name></unique_key_name>
  3642 + <logical_name></logical_name>
  3643 + <physical_name></physical_name>
  3644 + <type>integer</type>
  3645 + <constraint></constraint>
  3646 + <default_value></default_value>
  3647 + <auto_increment>false</auto_increment>
  3648 + <foreign_key>true</foreign_key>
3532 <not_null>false</not_null> 3649 <not_null>false</not_null>
3533 <primary_key>false</primary_key> 3650 <primary_key>false</primary_key>
3534 <unique_key>false</unique_key> 3651 <unique_key>false</unique_key>
@@ -3550,13 +3667,13 @@ @@ -3550,13 +3667,13 @@
3550 </sequence> 3667 </sequence>
3551 </normal_column> 3668 </normal_column>
3552 <normal_column> 3669 <normal_column>
3553 - <word_id>62</word_id>  
3554 - <id>63</id> 3670 + <word_id>5</word_id>
  3671 + <id>64</id>
3555 <description></description> 3672 <description></description>
3556 <unique_key_name></unique_key_name> 3673 <unique_key_name></unique_key_name>
3557 <logical_name></logical_name> 3674 <logical_name></logical_name>
3558 <physical_name></physical_name> 3675 <physical_name></physical_name>
3559 - <type>text</type> 3676 + <type>integer</type>
3560 <constraint></constraint> 3677 <constraint></constraint>
3561 <default_value></default_value> 3678 <default_value></default_value>
3562 <auto_increment>false</auto_increment> 3679 <auto_increment>false</auto_increment>
@@ -3582,8 +3699,8 @@ @@ -3582,8 +3699,8 @@
3582 </sequence> 3699 </sequence>
3583 </normal_column> 3700 </normal_column>
3584 <normal_column> 3701 <normal_column>
3585 - <word_id>53</word_id>  
3586 - <id>64</id> 3702 + <word_id>13</word_id>
  3703 + <id>65</id>
3587 <description></description> 3704 <description></description>
3588 <unique_key_name></unique_key_name> 3705 <unique_key_name></unique_key_name>
3589 <logical_name></logical_name> 3706 <logical_name></logical_name>
@@ -3624,87 +3741,19 @@ @@ -3624,87 +3741,19 @@
3624 </table> 3741 </table>
3625 <table> 3742 <table>
3626 <id>14</id> 3743 <id>14</id>
3627 - <height>339</height> 3744 + <height>275</height>
3628 <width>292</width> 3745 <width>292</width>
3629 <font_name>Ubuntu</font_name> 3746 <font_name>Ubuntu</font_name>
3630 <font_size>9</font_size> 3747 <font_size>9</font_size>
3631 - <x>353</x>  
3632 - <y>155</y> 3748 + <x>-336</x>
  3749 + <y>236</y>
3633 <color> 3750 <color>
3634 - <r>160</r>  
3635 - <g>32</g>  
3636 - <b>240</b> 3751 + <r>255</r>
  3752 + <g>128</g>
  3753 + <b>255</b>
3637 </color> 3754 </color>
3638 <connections> 3755 <connections>
3639 <relation> 3756 <relation>
3640 - <id>8</id>  
3641 - <source>3</source>  
3642 - <target>14</target>  
3643 - <child_cardinality>1..n</child_cardinality>  
3644 - <parent_cardinality>1</parent_cardinality>  
3645 - <reference_for_pk>true</reference_for_pk>  
3646 - <name></name>  
3647 - <on_delete_action>RESTRICT</on_delete_action>  
3648 - <on_update_action>RESTRICT</on_update_action>  
3649 - <source_xp>-1</source_xp>  
3650 - <source_yp>-1</source_yp>  
3651 - <target_xp>-1</target_xp>  
3652 - <target_yp>-1</target_yp>  
3653 - <referenced_column>null</referenced_column>  
3654 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3655 - </relation>  
3656 - <relation>  
3657 - <id>9</id>  
3658 - <source>13</source>  
3659 - <target>14</target>  
3660 - <child_cardinality>1..n</child_cardinality>  
3661 - <parent_cardinality>1</parent_cardinality>  
3662 - <reference_for_pk>true</reference_for_pk>  
3663 - <name></name>  
3664 - <on_delete_action>RESTRICT</on_delete_action>  
3665 - <on_update_action>RESTRICT</on_update_action>  
3666 - <source_xp>-1</source_xp>  
3667 - <source_yp>-1</source_yp>  
3668 - <target_xp>-1</target_xp>  
3669 - <target_yp>-1</target_yp>  
3670 - <referenced_column>null</referenced_column>  
3671 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3672 - </relation>  
3673 - <relation>  
3674 - <id>10</id>  
3675 - <source>2</source>  
3676 - <target>14</target>  
3677 - <child_cardinality>1..n</child_cardinality>  
3678 - <parent_cardinality>1</parent_cardinality>  
3679 - <reference_for_pk>true</reference_for_pk>  
3680 - <name></name>  
3681 - <on_delete_action>RESTRICT</on_delete_action>  
3682 - <on_update_action>RESTRICT</on_update_action>  
3683 - <source_xp>-1</source_xp>  
3684 - <source_yp>-1</source_yp>  
3685 - <target_xp>-1</target_xp>  
3686 - <target_yp>-1</target_yp>  
3687 - <referenced_column>null</referenced_column>  
3688 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3689 - </relation>  
3690 - <relation>  
3691 - <id>11</id>  
3692 - <source>4</source>  
3693 - <target>14</target>  
3694 - <child_cardinality>1..n</child_cardinality>  
3695 - <parent_cardinality>1</parent_cardinality>  
3696 - <reference_for_pk>true</reference_for_pk>  
3697 - <name></name>  
3698 - <on_delete_action>RESTRICT</on_delete_action>  
3699 - <on_update_action>RESTRICT</on_update_action>  
3700 - <source_xp>-1</source_xp>  
3701 - <source_yp>-1</source_yp>  
3702 - <target_xp>-1</target_xp>  
3703 - <target_yp>-1</target_yp>  
3704 - <referenced_column>null</referenced_column>  
3705 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3706 - </relation>  
3707 - <relation>  
3708 <id>12</id> 3757 <id>12</id>
3709 <source>11</source> 3758 <source>11</source>
3710 <target>14</target> 3759 <target>14</target>
@@ -3722,16 +3771,16 @@ @@ -3722,16 +3771,16 @@
3722 <referenced_complex_unique_key>null</referenced_complex_unique_key> 3771 <referenced_complex_unique_key>null</referenced_complex_unique_key>
3723 </relation> 3772 </relation>
3724 </connections> 3773 </connections>
3725 - <physical_name>i3geoestat_medida_variavel</physical_name>  
3726 - <logical_name>i3geoestat_medida_variavel</logical_name>  
3727 - <description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description> 3774 + <physical_name>i3geoestat_tipo_regiao</physical_name>
  3775 + <logical_name>i3geoestat_tipo_regiao</logical_name>
  3776 + <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description>
3728 <constraint></constraint> 3777 <constraint></constraint>
3729 <primary_key_name></primary_key_name> 3778 <primary_key_name></primary_key_name>
3730 <option></option> 3779 <option></option>
3731 <columns> 3780 <columns>
3732 <normal_column> 3781 <normal_column>
3733 - <word_id>32</word_id>  
3734 - <id>65</id> 3782 + <word_id>4</word_id>
  3783 + <id>66</id>
3735 <description></description> 3784 <description></description>
3736 <unique_key_name></unique_key_name> 3785 <unique_key_name></unique_key_name>
3737 <logical_name></logical_name> 3786 <logical_name></logical_name>
@@ -3762,18 +3811,17 @@ @@ -3762,18 +3811,17 @@
3762 </sequence> 3811 </sequence>
3763 </normal_column> 3812 </normal_column>
3764 <normal_column> 3813 <normal_column>
3765 - <id>66</id>  
3766 - <referenced_column>0</referenced_column>  
3767 - <relation>10</relation> 3814 + <word_id>45</word_id>
  3815 + <id>67</id>
3768 <description></description> 3816 <description></description>
3769 <unique_key_name></unique_key_name> 3817 <unique_key_name></unique_key_name>
3770 <logical_name></logical_name> 3818 <logical_name></logical_name>
3771 <physical_name></physical_name> 3819 <physical_name></physical_name>
3772 - <type>integer</type> 3820 + <type>text</type>
3773 <constraint></constraint> 3821 <constraint></constraint>
3774 <default_value></default_value> 3822 <default_value></default_value>
3775 <auto_increment>false</auto_increment> 3823 <auto_increment>false</auto_increment>
3776 - <foreign_key>true</foreign_key> 3824 + <foreign_key>false</foreign_key>
3777 <not_null>false</not_null> 3825 <not_null>false</not_null>
3778 <primary_key>false</primary_key> 3826 <primary_key>false</primary_key>
3779 <unique_key>false</unique_key> 3827 <unique_key>false</unique_key>
@@ -3795,18 +3843,17 @@ @@ -3795,18 +3843,17 @@
3795 </sequence> 3843 </sequence>
3796 </normal_column> 3844 </normal_column>
3797 <normal_column> 3845 <normal_column>
3798 - <id>67</id>  
3799 - <referenced_column>5</referenced_column>  
3800 - <relation>8</relation> 3846 + <word_id>21</word_id>
  3847 + <id>68</id>
3801 <description></description> 3848 <description></description>
3802 <unique_key_name></unique_key_name> 3849 <unique_key_name></unique_key_name>
3803 <logical_name></logical_name> 3850 <logical_name></logical_name>
3804 <physical_name></physical_name> 3851 <physical_name></physical_name>
3805 - <type>integer</type> 3852 + <type>text</type>
3806 <constraint></constraint> 3853 <constraint></constraint>
3807 <default_value></default_value> 3854 <default_value></default_value>
3808 <auto_increment>false</auto_increment> 3855 <auto_increment>false</auto_increment>
3809 - <foreign_key>true</foreign_key> 3856 + <foreign_key>false</foreign_key>
3810 <not_null>false</not_null> 3857 <not_null>false</not_null>
3811 <primary_key>false</primary_key> 3858 <primary_key>false</primary_key>
3812 <unique_key>false</unique_key> 3859 <unique_key>false</unique_key>
@@ -3828,9 +3875,9 @@ @@ -3828,9 +3875,9 @@
3828 </sequence> 3875 </sequence>
3829 </normal_column> 3876 </normal_column>
3830 <normal_column> 3877 <normal_column>
3831 - <id>68</id>  
3832 - <referenced_column>8</referenced_column>  
3833 - <relation>11</relation> 3878 + <id>69</id>
  3879 + <referenced_column>43</referenced_column>
  3880 + <relation>12</relation>
3834 <description></description> 3881 <description></description>
3835 <unique_key_name></unique_key_name> 3882 <unique_key_name></unique_key_name>
3836 <logical_name></logical_name> 3883 <logical_name></logical_name>
@@ -3861,18 +3908,17 @@ @@ -3861,18 +3908,17 @@
3861 </sequence> 3908 </sequence>
3862 </normal_column> 3909 </normal_column>
3863 <normal_column> 3910 <normal_column>
3864 - <id>69</id>  
3865 - <referenced_column>43</referenced_column>  
3866 - <relation>12</relation> 3911 + <word_id>23</word_id>
  3912 + <id>70</id>
3867 <description></description> 3913 <description></description>
3868 <unique_key_name></unique_key_name> 3914 <unique_key_name></unique_key_name>
3869 <logical_name></logical_name> 3915 <logical_name></logical_name>
3870 <physical_name></physical_name> 3916 <physical_name></physical_name>
3871 - <type>integer</type> 3917 + <type>text</type>
3872 <constraint></constraint> 3918 <constraint></constraint>
3873 <default_value></default_value> 3919 <default_value></default_value>
3874 <auto_increment>false</auto_increment> 3920 <auto_increment>false</auto_increment>
3875 - <foreign_key>true</foreign_key> 3921 + <foreign_key>false</foreign_key>
3876 <not_null>false</not_null> 3922 <not_null>false</not_null>
3877 <primary_key>false</primary_key> 3923 <primary_key>false</primary_key>
3878 <unique_key>false</unique_key> 3924 <unique_key>false</unique_key>
@@ -3894,18 +3940,17 @@ @@ -3894,18 +3940,17 @@
3894 </sequence> 3940 </sequence>
3895 </normal_column> 3941 </normal_column>
3896 <normal_column> 3942 <normal_column>
3897 - <id>70</id>  
3898 - <referenced_column>59</referenced_column>  
3899 - <relation>9</relation> 3943 + <word_id>59</word_id>
  3944 + <id>71</id>
3900 <description></description> 3945 <description></description>
3901 <unique_key_name></unique_key_name> 3946 <unique_key_name></unique_key_name>
3902 <logical_name></logical_name> 3947 <logical_name></logical_name>
3903 <physical_name></physical_name> 3948 <physical_name></physical_name>
3904 - <type>integer</type> 3949 + <type>text</type>
3905 <constraint></constraint> 3950 <constraint></constraint>
3906 <default_value></default_value> 3951 <default_value></default_value>
3907 <auto_increment>false</auto_increment> 3952 <auto_increment>false</auto_increment>
3908 - <foreign_key>true</foreign_key> 3953 + <foreign_key>false</foreign_key>
3909 <not_null>false</not_null> 3954 <not_null>false</not_null>
3910 <primary_key>false</primary_key> 3955 <primary_key>false</primary_key>
3911 <unique_key>false</unique_key> 3956 <unique_key>false</unique_key>
@@ -3927,8 +3972,8 @@ @@ -3927,8 +3972,8 @@
3927 </sequence> 3972 </sequence>
3928 </normal_column> 3973 </normal_column>
3929 <normal_column> 3974 <normal_column>
3930 - <word_id>21</word_id>  
3931 - <id>71</id> 3975 + <word_id>10</word_id>
  3976 + <id>72</id>
3932 <description></description> 3977 <description></description>
3933 <unique_key_name></unique_key_name> 3978 <unique_key_name></unique_key_name>
3934 <logical_name></logical_name> 3979 <logical_name></logical_name>
@@ -3959,8 +4004,8 @@ @@ -3959,8 +4004,8 @@
3959 </sequence> 4004 </sequence>
3960 </normal_column> 4005 </normal_column>
3961 <normal_column> 4006 <normal_column>
3962 - <word_id>57</word_id>  
3963 - <id>72</id> 4007 + <word_id>17</word_id>
  4008 + <id>73</id>
3964 <description></description> 4009 <description></description>
3965 <unique_key_name></unique_key_name> 4010 <unique_key_name></unique_key_name>
3966 <logical_name></logical_name> 4011 <logical_name></logical_name>
@@ -3991,13 +4036,13 @@ @@ -3991,13 +4036,13 @@
3991 </sequence> 4036 </sequence>
3992 </normal_column> 4037 </normal_column>
3993 <normal_column> 4038 <normal_column>
3994 - <word_id>15</word_id>  
3995 - <id>73</id> 4039 + <word_id>27</word_id>
  4040 + <id>74</id>
3996 <description></description> 4041 <description></description>
3997 <unique_key_name></unique_key_name> 4042 <unique_key_name></unique_key_name>
3998 <logical_name></logical_name> 4043 <logical_name></logical_name>
3999 <physical_name></physical_name> 4044 <physical_name></physical_name>
4000 - <type>text</type> 4045 + <type>integer</type>
4001 <constraint></constraint> 4046 <constraint></constraint>
4002 <default_value></default_value> 4047 <default_value></default_value>
4003 <auto_increment>false</auto_increment> 4048 <auto_increment>false</auto_increment>
@@ -4023,8 +4068,8 @@ @@ -4023,8 +4068,8 @@
4023 </sequence> 4068 </sequence>
4024 </normal_column> 4069 </normal_column>
4025 <normal_column> 4070 <normal_column>
4026 - <word_id>11</word_id>  
4027 - <id>74</id> 4071 + <word_id>14</word_id>
  4072 + <id>75</id>
4028 <description></description> 4073 <description></description>
4029 <unique_key_name></unique_key_name> 4074 <unique_key_name></unique_key_name>
4030 <logical_name></logical_name> 4075 <logical_name></logical_name>
@@ -4055,15 +4100,15 @@ @@ -4055,15 +4100,15 @@
4055 </sequence> 4100 </sequence>
4056 </normal_column> 4101 </normal_column>
4057 <normal_column> 4102 <normal_column>
4058 - <word_id>24</word_id>  
4059 - <id>75</id> 4103 + <word_id>57</word_id>
  4104 + <id>76</id>
4060 <description></description> 4105 <description></description>
4061 <unique_key_name></unique_key_name> 4106 <unique_key_name></unique_key_name>
4062 <logical_name></logical_name> 4107 <logical_name></logical_name>
4063 <physical_name></physical_name> 4108 <physical_name></physical_name>
4064 <type>text</type> 4109 <type>text</type>
4065 <constraint></constraint> 4110 <constraint></constraint>
4066 - <default_value></default_value> 4111 + <default_value>4326</default_value>
4067 <auto_increment>false</auto_increment> 4112 <auto_increment>false</auto_increment>
4068 <foreign_key>false</foreign_key> 4113 <foreign_key>false</foreign_key>
4069 <not_null>false</not_null> 4114 <not_null>false</not_null>
@@ -4087,8 +4132,8 @@ @@ -4087,8 +4132,8 @@
4087 </sequence> 4132 </sequence>
4088 </normal_column> 4133 </normal_column>
4089 <normal_column> 4134 <normal_column>
4090 - <word_id>43</word_id>  
4091 - <id>76</id> 4135 + <word_id>9</word_id>
  4136 + <id>77</id>
4092 <description></description> 4137 <description></description>
4093 <unique_key_name></unique_key_name> 4138 <unique_key_name></unique_key_name>
4094 <logical_name></logical_name> 4139 <logical_name></logical_name>
@@ -4119,8 +4164,8 @@ @@ -4119,8 +4164,8 @@
4119 </sequence> 4164 </sequence>
4120 </normal_column> 4165 </normal_column>
4121 <normal_column> 4166 <normal_column>
4122 - <word_id>12</word_id>  
4123 - <id>77</id> 4167 + <word_id>15</word_id>
  4168 + <id>78</id>
4124 <description></description> 4169 <description></description>
4125 <unique_key_name></unique_key_name> 4170 <unique_key_name></unique_key_name>
4126 <logical_name></logical_name> 4171 <logical_name></logical_name>
@@ -4167,57 +4212,57 @@ @@ -4167,57 +4212,57 @@
4167 <name>metaestat_basededados</name> 4212 <name>metaestat_basededados</name>
4168 <export_order>0</export_order> 4213 <export_order>0</export_order>
4169 <table_test_data> 4214 <table_test_data>
4170 - <table_id>13</table_id> 4215 + <table_id>11</table_id>
4171 <direct_test_data> 4216 <direct_test_data>
4172 <data> 4217 <data>
4173 <column_data> 4218 <column_data>
4174 - <column_id>59</column_id> 4219 + <column_id>43</column_id>
4175 <value>1</value> 4220 <value>1</value>
4176 </column_data> 4221 </column_data>
4177 <column_data> 4222 <column_data>
4178 - <column_id>60</column_id> 4223 + <column_id>44</column_id>
4179 <value>geosaude</value> 4224 <value>geosaude</value>
4180 </column_data> 4225 </column_data>
4181 <column_data> 4226 <column_data>
4182 - <column_id>61</column_id> 4227 + <column_id>45</column_id>
4183 <value>localhost</value> 4228 <value>localhost</value>
4184 </column_data> 4229 </column_data>
4185 <column_data> 4230 <column_data>
4186 - <column_id>62</column_id> 4231 + <column_id>46</column_id>
4187 <value>5432</value> 4232 <value>5432</value>
4188 </column_data> 4233 </column_data>
4189 <column_data> 4234 <column_data>
4190 - <column_id>63</column_id> 4235 + <column_id>47</column_id>
4191 <value>postgres</value> 4236 <value>postgres</value>
4192 </column_data> 4237 </column_data>
4193 <column_data> 4238 <column_data>
4194 - <column_id>64</column_id> 4239 + <column_id>48</column_id>
4195 <value>postgres</value> 4240 <value>postgres</value>
4196 </column_data> 4241 </column_data>
4197 </data> 4242 </data>
4198 <data> 4243 <data>
4199 <column_data> 4244 <column_data>
4200 - <column_id>59</column_id> 4245 + <column_id>43</column_id>
4201 <value>0</value> 4246 <value>0</value>
4202 </column_data> 4247 </column_data>
4203 <column_data> 4248 <column_data>
4204 - <column_id>60</column_id> 4249 + <column_id>44</column_id>
4205 <value>i3geo_metaestat</value> 4250 <value>i3geo_metaestat</value>
4206 </column_data> 4251 </column_data>
4207 <column_data> 4252 <column_data>
4208 - <column_id>61</column_id> 4253 + <column_id>45</column_id>
4209 <value>localhost</value> 4254 <value>localhost</value>
4210 </column_data> 4255 </column_data>
4211 <column_data> 4256 <column_data>
4212 - <column_id>62</column_id> 4257 + <column_id>46</column_id>
4213 <value>5432</value> 4258 <value>5432</value>
4214 </column_data> 4259 </column_data>
4215 <column_data> 4260 <column_data>
4216 - <column_id>63</column_id> 4261 + <column_id>47</column_id>
4217 <value>postgres</value> 4262 <value>postgres</value>
4218 </column_data> 4263 </column_data>
4219 <column_data> 4264 <column_data>
4220 - <column_id>64</column_id> 4265 + <column_id>48</column_id>
4221 <value>postgres</value> 4266 <value>postgres</value>
4222 </column_data> 4267 </column_data>
4223 </data> 4268 </data>
@@ -4226,7 +4271,7 @@ @@ -4226,7 +4271,7 @@
4226 <test_data_num>0</test_data_num> 4271 <test_data_num>0</test_data_num>
4227 <data_def_list> 4272 <data_def_list>
4228 <data_def> 4273 <data_def>
4229 - <column_id>59</column_id> 4274 + <column_id>43</column_id>
4230 <type>Format</type> 4275 <type>Format</type>
4231 <repeat_num>1</repeat_num> 4276 <repeat_num>1</repeat_num>
4232 <template>%</template> 4277 <template>%</template>
@@ -4241,7 +4286,7 @@ @@ -4241,7 +4286,7 @@
4241 </modified_values> 4286 </modified_values>
4242 </data_def> 4287 </data_def>
4243 <data_def> 4288 <data_def>
4244 - <column_id>60</column_id> 4289 + <column_id>44</column_id>
4245 <type>Format</type> 4290 <type>Format</type>
4246 <repeat_num>1</repeat_num> 4291 <repeat_num>1</repeat_num>
4247 <template>database%</template> 4292 <template>database%</template>
@@ -4256,7 +4301,7 @@ @@ -4256,7 +4301,7 @@
4256 </modified_values> 4301 </modified_values>
4257 </data_def> 4302 </data_def>
4258 <data_def> 4303 <data_def>
4259 - <column_id>61</column_id> 4304 + <column_id>45</column_id>
4260 <type>Format</type> 4305 <type>Format</type>
4261 <repeat_num>1</repeat_num> 4306 <repeat_num>1</repeat_num>
4262 <template>host%</template> 4307 <template>host%</template>
@@ -4271,7 +4316,7 @@ @@ -4271,7 +4316,7 @@
4271 </modified_values> 4316 </modified_values>
4272 </data_def> 4317 </data_def>
4273 <data_def> 4318 <data_def>
4274 - <column_id>62</column_id> 4319 + <column_id>46</column_id>
4275 <type>Format</type> 4320 <type>Format</type>
4276 <repeat_num>1</repeat_num> 4321 <repeat_num>1</repeat_num>
4277 <template>porta%</template> 4322 <template>porta%</template>
@@ -4286,7 +4331,7 @@ @@ -4286,7 +4331,7 @@
4286 </modified_values> 4331 </modified_values>
4287 </data_def> 4332 </data_def>
4288 <data_def> 4333 <data_def>
4289 - <column_id>63</column_id> 4334 + <column_id>47</column_id>
4290 <type>Format</type> 4335 <type>Format</type>
4291 <repeat_num>1</repeat_num> 4336 <repeat_num>1</repeat_num>
4292 <template>usuario%</template> 4337 <template>usuario%</template>
@@ -4301,7 +4346,7 @@ @@ -4301,7 +4346,7 @@
4301 </modified_values> 4346 </modified_values>
4302 </data_def> 4347 </data_def>
4303 <data_def> 4348 <data_def>
4304 - <column_id>64</column_id> 4349 + <column_id>48</column_id>
4305 <type>Format</type> 4350 <type>Format</type>
4306 <repeat_num>1</repeat_num> 4351 <repeat_num>1</repeat_num>
4307 <template>senha%</template> 4352 <template>senha%</template>
@@ -4430,164 +4475,176 @@ @@ -4430,164 +4475,176 @@
4430 </repeat_test_data> 4475 </repeat_test_data>
4431 </table_test_data> 4476 </table_test_data>
4432 <table_test_data> 4477 <table_test_data>
4433 - <table_id>11</table_id> 4478 + <table_id>14</table_id>
4434 <direct_test_data> 4479 <direct_test_data>
4435 <data> 4480 <data>
4436 <column_data> 4481 <column_data>
4437 - <column_id>43</column_id> 4482 + <column_id>66</column_id>
4438 <value>2</value> 4483 <value>2</value>
4439 </column_data> 4484 </column_data>
4440 <column_data> 4485 <column_data>
4441 - <column_id>44</column_id> 4486 + <column_id>67</column_id>
4442 <value>Município</value> 4487 <value>Município</value>
4443 </column_data> 4488 </column_data>
4444 <column_data> 4489 <column_data>
4445 - <column_id>45</column_id> 4490 + <column_id>68</column_id>
4446 <value>Limites municipais</value> 4491 <value>Limites municipais</value>
4447 </column_data> 4492 </column_data>
4448 <column_data> 4493 <column_data>
4449 - <column_id>46</column_id> 4494 + <column_id>69</column_id>
4450 <value>1</value> 4495 <value>1</value>
4451 </column_data> 4496 </column_data>
4452 <column_data> 4497 <column_data>
4453 - <column_id>47</column_id> 4498 + <column_id>70</column_id>
4454 <value>i3geo_metaestat</value> 4499 <value>i3geo_metaestat</value>
4455 </column_data> 4500 </column_data>
4456 <column_data> 4501 <column_data>
4457 - <column_id>48</column_id> 4502 + <column_id>71</column_id>
4458 <value>municipios</value> 4503 <value>municipios</value>
4459 </column_data> 4504 </column_data>
4460 <column_data> 4505 <column_data>
4461 - <column_id>49</column_id> 4506 + <column_id>72</column_id>
4462 <value>the_geom</value> 4507 <value>the_geom</value>
4463 </column_data> 4508 </column_data>
4464 <column_data> 4509 <column_data>
4465 - <column_id>50</column_id> 4510 + <column_id>73</column_id>
4466 <value>2010</value> 4511 <value>2010</value>
4467 </column_data> 4512 </column_data>
4468 <column_data> 4513 <column_data>
4469 - <column_id>51</column_id> 4514 + <column_id>74</column_id>
4470 <value>co_municipio</value> 4515 <value>co_municipio</value>
4471 </column_data> 4516 </column_data>
4472 <column_data> 4517 <column_data>
4473 - <column_id>52</column_id> 4518 + <column_id>75</column_id>
4474 <value>no_cidade</value> 4519 <value>no_cidade</value>
4475 </column_data> 4520 </column_data>
4476 <column_data> 4521 <column_data>
4477 - <column_id>53</column_id> 4522 + <column_id>76</column_id>
4478 <value>4326</value> 4523 <value>4326</value>
4479 </column_data> 4524 </column_data>
4480 <column_data> 4525 <column_data>
4481 - <column_id>54</column_id> 4526 + <column_id>77</column_id>
4482 <value>the_geom2</value> 4527 <value>the_geom2</value>
4483 </column_data> 4528 </column_data>
  4529 + <column_data>
  4530 + <column_id>78</column_id>
  4531 + <value>co_municipio,no_cidade,co_uf,area_territorial,nu_ano_instalacao</value>
  4532 + </column_data>
4484 </data> 4533 </data>
4485 <data> 4534 <data>
4486 <column_data> 4535 <column_data>
4487 - <column_id>43</column_id> 4536 + <column_id>66</column_id>
4488 <value>3</value> 4537 <value>3</value>
4489 </column_data> 4538 </column_data>
4490 <column_data> 4539 <column_data>
4491 - <column_id>44</column_id> 4540 + <column_id>67</column_id>
4492 <value>Estado</value> 4541 <value>Estado</value>
4493 </column_data> 4542 </column_data>
4494 <column_data> 4543 <column_data>
4495 - <column_id>45</column_id> 4544 + <column_id>68</column_id>
4496 <value>Limites estaduais</value> 4545 <value>Limites estaduais</value>
4497 </column_data> 4546 </column_data>
4498 <column_data> 4547 <column_data>
4499 - <column_id>46</column_id> 4548 + <column_id>69</column_id>
4500 <value>1</value> 4549 <value>1</value>
4501 </column_data> 4550 </column_data>
4502 <column_data> 4551 <column_data>
4503 - <column_id>47</column_id> 4552 + <column_id>70</column_id>
4504 <value>i3geo_metaestat</value> 4553 <value>i3geo_metaestat</value>
4505 </column_data> 4554 </column_data>
4506 <column_data> 4555 <column_data>
4507 - <column_id>48</column_id> 4556 + <column_id>71</column_id>
4508 <value>uf</value> 4557 <value>uf</value>
4509 </column_data> 4558 </column_data>
4510 <column_data> 4559 <column_data>
4511 - <column_id>49</column_id> 4560 + <column_id>72</column_id>
4512 <value>the_geom</value> 4561 <value>the_geom</value>
4513 </column_data> 4562 </column_data>
4514 <column_data> 4563 <column_data>
4515 - <column_id>50</column_id> 4564 + <column_id>73</column_id>
4516 <value>2010</value> 4565 <value>2010</value>
4517 </column_data> 4566 </column_data>
4518 <column_data> 4567 <column_data>
4519 - <column_id>51</column_id> 4568 + <column_id>74</column_id>
4520 <value>co_uf</value> 4569 <value>co_uf</value>
4521 </column_data> 4570 </column_data>
4522 <column_data> 4571 <column_data>
4523 - <column_id>52</column_id> 4572 + <column_id>75</column_id>
4524 <value>no_uf</value> 4573 <value>no_uf</value>
4525 </column_data> 4574 </column_data>
4526 <column_data> 4575 <column_data>
4527 - <column_id>53</column_id> 4576 + <column_id>76</column_id>
4528 <value>4326</value> 4577 <value>4326</value>
4529 </column_data> 4578 </column_data>
4530 <column_data> 4579 <column_data>
4531 - <column_id>54</column_id> 4580 + <column_id>77</column_id>
4532 <value>the_geom</value> 4581 <value>the_geom</value>
4533 </column_data> 4582 </column_data>
  4583 + <column_data>
  4584 + <column_id>78</column_id>
  4585 + <value>co_uf,sg_uf,no_uf,no_regiao</value>
  4586 + </column_data>
4534 </data> 4587 </data>
4535 <data> 4588 <data>
4536 <column_data> 4589 <column_data>
4537 - <column_id>43</column_id> 4590 + <column_id>66</column_id>
4538 <value>1</value> 4591 <value>1</value>
4539 </column_data> 4592 </column_data>
4540 <column_data> 4593 <column_data>
4541 - <column_id>44</column_id> 4594 + <column_id>67</column_id>
4542 <value>Bairro</value> 4595 <value>Bairro</value>
4543 </column_data> 4596 </column_data>
4544 <column_data> 4597 <column_data>
4545 - <column_id>45</column_id> 4598 + <column_id>68</column_id>
4546 <value>Limites de bairros</value> 4599 <value>Limites de bairros</value>
4547 </column_data> 4600 </column_data>
4548 <column_data> 4601 <column_data>
4549 - <column_id>46</column_id> 4602 + <column_id>69</column_id>
4550 <value>1</value> 4603 <value>1</value>
4551 </column_data> 4604 </column_data>
4552 <column_data> 4605 <column_data>
4553 - <column_id>47</column_id> 4606 + <column_id>70</column_id>
4554 <value>i3geo_metaestat</value> 4607 <value>i3geo_metaestat</value>
4555 </column_data> 4608 </column_data>
4556 <column_data> 4609 <column_data>
4557 - <column_id>48</column_id> 4610 + <column_id>71</column_id>
4558 <value>bairros</value> 4611 <value>bairros</value>
4559 </column_data> 4612 </column_data>
4560 <column_data> 4613 <column_data>
4561 - <column_id>49</column_id> 4614 + <column_id>72</column_id>
4562 <value>the_geom</value> 4615 <value>the_geom</value>
4563 </column_data> 4616 </column_data>
4564 <column_data> 4617 <column_data>
4565 - <column_id>50</column_id> 4618 + <column_id>73</column_id>
4566 <value>2010</value> 4619 <value>2010</value>
4567 </column_data> 4620 </column_data>
4568 <column_data> 4621 <column_data>
4569 - <column_id>51</column_id> 4622 + <column_id>74</column_id>
4570 <value>co_bairro</value> 4623 <value>co_bairro</value>
4571 </column_data> 4624 </column_data>
4572 <column_data> 4625 <column_data>
4573 - <column_id>52</column_id> 4626 + <column_id>75</column_id>
4574 <value>no_bairro</value> 4627 <value>no_bairro</value>
4575 </column_data> 4628 </column_data>
4576 <column_data> 4629 <column_data>
4577 - <column_id>53</column_id> 4630 + <column_id>76</column_id>
4578 <value>4326</value> 4631 <value>4326</value>
4579 </column_data> 4632 </column_data>
4580 <column_data> 4633 <column_data>
4581 - <column_id>54</column_id> 4634 + <column_id>77</column_id>
4582 <value>the_geom</value> 4635 <value>the_geom</value>
4583 </column_data> 4636 </column_data>
  4637 + <column_data>
  4638 + <column_id>78</column_id>
  4639 + <value>co_bairro,no_bairro,no_distr,no_municip</value>
  4640 + </column_data>
4584 </data> 4641 </data>
4585 </direct_test_data> 4642 </direct_test_data>
4586 <repeat_test_data> 4643 <repeat_test_data>
4587 <test_data_num>0</test_data_num> 4644 <test_data_num>0</test_data_num>
4588 <data_def_list> 4645 <data_def_list>
4589 <data_def> 4646 <data_def>
4590 - <column_id>43</column_id> 4647 + <column_id>66</column_id>
4591 <type>Format</type> 4648 <type>Format</type>
4592 <repeat_num>1</repeat_num> 4649 <repeat_num>1</repeat_num>
4593 <template>%</template> 4650 <template>%</template>
@@ -4602,7 +4659,7 @@ @@ -4602,7 +4659,7 @@
4602 </modified_values> 4659 </modified_values>
4603 </data_def> 4660 </data_def>
4604 <data_def> 4661 <data_def>
4605 - <column_id>44</column_id> 4662 + <column_id>67</column_id>
4606 <type>Format</type> 4663 <type>Format</type>
4607 <repeat_num>1</repeat_num> 4664 <repeat_num>1</repeat_num>
4608 <template>nome_tipo_regiao%</template> 4665 <template>nome_tipo_regiao%</template>
@@ -4617,7 +4674,7 @@ @@ -4617,7 +4674,7 @@
4617 </modified_values> 4674 </modified_values>
4618 </data_def> 4675 </data_def>
4619 <data_def> 4676 <data_def>
4620 - <column_id>45</column_id> 4677 + <column_id>68</column_id>
4621 <type>Format</type> 4678 <type>Format</type>
4622 <repeat_num>1</repeat_num> 4679 <repeat_num>1</repeat_num>
4623 <template>descricao_tipo_regiao%</template> 4680 <template>descricao_tipo_regiao%</template>
@@ -4632,7 +4689,7 @@ @@ -4632,7 +4689,7 @@
4632 </modified_values> 4689 </modified_values>
4633 </data_def> 4690 </data_def>
4634 <data_def> 4691 <data_def>
4635 - <column_id>46</column_id> 4692 + <column_id>69</column_id>
4636 <type>Foreign Key</type> 4693 <type>Foreign Key</type>
4637 <repeat_num>1</repeat_num> 4694 <repeat_num>1</repeat_num>
4638 <template>%</template> 4695 <template>%</template>
@@ -4647,7 +4704,7 @@ @@ -4647,7 +4704,7 @@
4647 </modified_values> 4704 </modified_values>
4648 </data_def> 4705 </data_def>
4649 <data_def> 4706 <data_def>
4650 - <column_id>47</column_id> 4707 + <column_id>70</column_id>
4651 <type>Format</type> 4708 <type>Format</type>
4652 <repeat_num>1</repeat_num> 4709 <repeat_num>1</repeat_num>
4653 <template>esquemadb%</template> 4710 <template>esquemadb%</template>
@@ -4662,7 +4719,7 @@ @@ -4662,7 +4719,7 @@
4662 </modified_values> 4719 </modified_values>
4663 </data_def> 4720 </data_def>
4664 <data_def> 4721 <data_def>
4665 - <column_id>48</column_id> 4722 + <column_id>71</column_id>
4666 <type>Format</type> 4723 <type>Format</type>
4667 <repeat_num>1</repeat_num> 4724 <repeat_num>1</repeat_num>
4668 <template>tabela%</template> 4725 <template>tabela%</template>
@@ -4677,7 +4734,7 @@ @@ -4677,7 +4734,7 @@
4677 </modified_values> 4734 </modified_values>
4678 </data_def> 4735 </data_def>
4679 <data_def> 4736 <data_def>
4680 - <column_id>49</column_id> 4737 + <column_id>72</column_id>
4681 <type>Format</type> 4738 <type>Format</type>
4682 <repeat_num>1</repeat_num> 4739 <repeat_num>1</repeat_num>
4683 <template>colunageo%</template> 4740 <template>colunageo%</template>
@@ -4692,7 +4749,7 @@ @@ -4692,7 +4749,7 @@
4692 </modified_values> 4749 </modified_values>
4693 </data_def> 4750 </data_def>
4694 <data_def> 4751 <data_def>
4695 - <column_id>50</column_id> 4752 + <column_id>73</column_id>
4696 <type>Format</type> 4753 <type>Format</type>
4697 <repeat_num>1</repeat_num> 4754 <repeat_num>1</repeat_num>
4698 <template>data%</template> 4755 <template>data%</template>
@@ -4707,7 +4764,7 @@ @@ -4707,7 +4764,7 @@
4707 </modified_values> 4764 </modified_values>
4708 </data_def> 4765 </data_def>
4709 <data_def> 4766 <data_def>
4710 - <column_id>51</column_id> 4767 + <column_id>74</column_id>
4711 <type>Format</type> 4768 <type>Format</type>
4712 <repeat_num>1</repeat_num> 4769 <repeat_num>1</repeat_num>
4713 <template>%</template> 4770 <template>%</template>
@@ -4722,7 +4779,7 @@ @@ -4722,7 +4779,7 @@
4722 </modified_values> 4779 </modified_values>
4723 </data_def> 4780 </data_def>
4724 <data_def> 4781 <data_def>
4725 - <column_id>52</column_id> 4782 + <column_id>75</column_id>
4726 <type>Format</type> 4783 <type>Format</type>
4727 <repeat_num>1</repeat_num> 4784 <repeat_num>1</repeat_num>
4728 <template>colunanomeregiao%</template> 4785 <template>colunanomeregiao%</template>
@@ -4737,7 +4794,7 @@ @@ -4737,7 +4794,7 @@
4737 </modified_values> 4794 </modified_values>
4738 </data_def> 4795 </data_def>
4739 <data_def> 4796 <data_def>
4740 - <column_id>53</column_id> 4797 + <column_id>76</column_id>
4741 <type>Format</type> 4798 <type>Format</type>
4742 <repeat_num>1</repeat_num> 4799 <repeat_num>1</repeat_num>
4743 <template>srid%</template> 4800 <template>srid%</template>
@@ -4752,7 +4809,7 @@ @@ -4752,7 +4809,7 @@
4752 </modified_values> 4809 </modified_values>
4753 </data_def> 4810 </data_def>
4754 <data_def> 4811 <data_def>
4755 - <column_id>54</column_id> 4812 + <column_id>77</column_id>
4756 <type>Format</type> 4813 <type>Format</type>
4757 <repeat_num>1</repeat_num> 4814 <repeat_num>1</repeat_num>
4758 <template>colunacentroide%</template> 4815 <template>colunacentroide%</template>
@@ -4766,6 +4823,21 @@ @@ -4766,6 +4823,21 @@
4766 <modified_values> 4823 <modified_values>
4767 </modified_values> 4824 </modified_values>
4768 </data_def> 4825 </data_def>
  4826 + <data_def>
  4827 + <column_id>78</column_id>
  4828 + <type>Format</type>
  4829 + <repeat_num>1</repeat_num>
  4830 + <template>colunasvisiveis%</template>
  4831 + <from>1</from>
  4832 + <to>100</to>
  4833 + <increment>1</increment>
  4834 + <select>colunasvisiveis1</select>
  4835 + <select>colunasvisiveis2</select>
  4836 + <select>colunasvisiveis3</select>
  4837 + <select>colunasvisiveis4</select>
  4838 + <modified_values>
  4839 + </modified_values>
  4840 + </data_def>
4769 </data_def_list> 4841 </data_def_list>
4770 </repeat_test_data> 4842 </repeat_test_data>
4771 </table_test_data> 4843 </table_test_data>
@@ -4877,59 +4949,59 @@ @@ -4877,59 +4949,59 @@
4877 </repeat_test_data> 4949 </repeat_test_data>
4878 </table_test_data> 4950 </table_test_data>
4879 <table_test_data> 4951 <table_test_data>
4880 - <table_id>14</table_id> 4952 + <table_id>12</table_id>
4881 <direct_test_data> 4953 <direct_test_data>
4882 <data> 4954 <data>
4883 <column_data> 4955 <column_data>
4884 - <column_id>65</column_id> 4956 + <column_id>49</column_id>
4885 <value>1</value> 4957 <value>1</value>
4886 </column_data> 4958 </column_data>
4887 <column_data> 4959 <column_data>
4888 - <column_id>66</column_id> 4960 + <column_id>50</column_id>
4889 <value>1</value> 4961 <value>1</value>
4890 </column_data> 4962 </column_data>
4891 <column_data> 4963 <column_data>
4892 - <column_id>67</column_id> 4964 + <column_id>51</column_id>
4893 <value>2</value> 4965 <value>2</value>
4894 </column_data> 4966 </column_data>
4895 <column_data> 4967 <column_data>
4896 - <column_id>68</column_id> 4968 + <column_id>52</column_id>
4897 <value>1</value> 4969 <value>1</value>
4898 </column_data> 4970 </column_data>
4899 <column_data> 4971 <column_data>
4900 - <column_id>69</column_id> 4972 + <column_id>53</column_id>
4901 <value>2</value> 4973 <value>2</value>
4902 </column_data> 4974 </column_data>
4903 <column_data> 4975 <column_data>
4904 - <column_id>70</column_id> 4976 + <column_id>54</column_id>
4905 <value>1</value> 4977 <value>1</value>
4906 </column_data> 4978 </column_data>
4907 <column_data> 4979 <column_data>
4908 - <column_id>71</column_id> 4980 + <column_id>55</column_id>
4909 <value>dbdemografia</value> 4981 <value>dbdemografia</value>
4910 </column_data> 4982 </column_data>
4911 <column_data> 4983 <column_data>
4912 - <column_id>72</column_id> 4984 + <column_id>56</column_id>
4913 <value>tb_demografia</value> 4985 <value>tb_demografia</value>
4914 </column_data> 4986 </column_data>
4915 <column_data> 4987 <column_data>
4916 - <column_id>73</column_id> 4988 + <column_id>57</column_id>
4917 <value>nu_populacao</value> 4989 <value>nu_populacao</value>
4918 </column_data> 4990 </column_data>
4919 <column_data> 4991 <column_data>
4920 - <column_id>74</column_id> 4992 + <column_id>58</column_id>
4921 <value>co_ibge</value> 4993 <value>co_ibge</value>
4922 </column_data> 4994 </column_data>
4923 <column_data> 4995 <column_data>
4924 - <column_id>75</column_id> 4996 + <column_id>59</column_id>
4925 <value></value> 4997 <value></value>
4926 </column_data> 4998 </column_data>
4927 <column_data> 4999 <column_data>
4928 - <column_id>76</column_id> 5000 + <column_id>60</column_id>
4929 <value>População residente</value> 5001 <value>População residente</value>
4930 </column_data> 5002 </column_data>
4931 <column_data> 5003 <column_data>
4932 - <column_id>77</column_id> 5004 + <column_id>61</column_id>
4933 <value></value> 5005 <value></value>
4934 </column_data> 5006 </column_data>
4935 </data> 5007 </data>
@@ -4938,7 +5010,7 @@ @@ -4938,7 +5010,7 @@
4938 <test_data_num>0</test_data_num> 5010 <test_data_num>0</test_data_num>
4939 <data_def_list> 5011 <data_def_list>
4940 <data_def> 5012 <data_def>
4941 - <column_id>65</column_id> 5013 + <column_id>49</column_id>
4942 <type>Format</type> 5014 <type>Format</type>
4943 <repeat_num>1</repeat_num> 5015 <repeat_num>1</repeat_num>
4944 <template>%</template> 5016 <template>%</template>
@@ -4953,7 +5025,7 @@ @@ -4953,7 +5025,7 @@
4953 </modified_values> 5025 </modified_values>
4954 </data_def> 5026 </data_def>
4955 <data_def> 5027 <data_def>
4956 - <column_id>66</column_id> 5028 + <column_id>50</column_id>
4957 <type>Foreign Key</type> 5029 <type>Foreign Key</type>
4958 <repeat_num>1</repeat_num> 5030 <repeat_num>1</repeat_num>
4959 <template>%</template> 5031 <template>%</template>
@@ -4968,7 +5040,7 @@ @@ -4968,7 +5040,7 @@
4968 </modified_values> 5040 </modified_values>
4969 </data_def> 5041 </data_def>
4970 <data_def> 5042 <data_def>
4971 - <column_id>67</column_id> 5043 + <column_id>51</column_id>
4972 <type>Foreign Key</type> 5044 <type>Foreign Key</type>
4973 <repeat_num>1</repeat_num> 5045 <repeat_num>1</repeat_num>
4974 <template>%</template> 5046 <template>%</template>
@@ -4983,7 +5055,7 @@ @@ -4983,7 +5055,7 @@
4983 </modified_values> 5055 </modified_values>
4984 </data_def> 5056 </data_def>
4985 <data_def> 5057 <data_def>
4986 - <column_id>68</column_id> 5058 + <column_id>52</column_id>
4987 <type>Foreign Key</type> 5059 <type>Foreign Key</type>
4988 <repeat_num>1</repeat_num> 5060 <repeat_num>1</repeat_num>
4989 <template>%</template> 5061 <template>%</template>
@@ -4998,7 +5070,7 @@ @@ -4998,7 +5070,7 @@
4998 </modified_values> 5070 </modified_values>
4999 </data_def> 5071 </data_def>
5000 <data_def> 5072 <data_def>
5001 - <column_id>69</column_id> 5073 + <column_id>53</column_id>
5002 <type>Foreign Key</type> 5074 <type>Foreign Key</type>
5003 <repeat_num>1</repeat_num> 5075 <repeat_num>1</repeat_num>
5004 <template>%</template> 5076 <template>%</template>
@@ -5013,7 +5085,7 @@ @@ -5013,7 +5085,7 @@
5013 </modified_values> 5085 </modified_values>
5014 </data_def> 5086 </data_def>
5015 <data_def> 5087 <data_def>
5016 - <column_id>70</column_id> 5088 + <column_id>54</column_id>
5017 <type>Foreign Key</type> 5089 <type>Foreign Key</type>
5018 <repeat_num>1</repeat_num> 5090 <repeat_num>1</repeat_num>
5019 <template>%</template> 5091 <template>%</template>
@@ -5028,7 +5100,7 @@ @@ -5028,7 +5100,7 @@
5028 </modified_values> 5100 </modified_values>
5029 </data_def> 5101 </data_def>
5030 <data_def> 5102 <data_def>
5031 - <column_id>71</column_id> 5103 + <column_id>55</column_id>
5032 <type>Format</type> 5104 <type>Format</type>
5033 <repeat_num>1</repeat_num> 5105 <repeat_num>1</repeat_num>
5034 <template>esquemadb%</template> 5106 <template>esquemadb%</template>
@@ -5043,7 +5115,7 @@ @@ -5043,7 +5115,7 @@
5043 </modified_values> 5115 </modified_values>
5044 </data_def> 5116 </data_def>
5045 <data_def> 5117 <data_def>
5046 - <column_id>72</column_id> 5118 + <column_id>56</column_id>
5047 <type>Format</type> 5119 <type>Format</type>
5048 <repeat_num>1</repeat_num> 5120 <repeat_num>1</repeat_num>
5049 <template>tabela%</template> 5121 <template>tabela%</template>
@@ -5058,7 +5130,7 @@ @@ -5058,7 +5130,7 @@
5058 </modified_values> 5130 </modified_values>
5059 </data_def> 5131 </data_def>
5060 <data_def> 5132 <data_def>
5061 - <column_id>73</column_id> 5133 + <column_id>57</column_id>
5062 <type>Format</type> 5134 <type>Format</type>
5063 <repeat_num>1</repeat_num> 5135 <repeat_num>1</repeat_num>
5064 <template>colunavalor%</template> 5136 <template>colunavalor%</template>
@@ -5073,7 +5145,7 @@ @@ -5073,7 +5145,7 @@
5073 </modified_values> 5145 </modified_values>
5074 </data_def> 5146 </data_def>
5075 <data_def> 5147 <data_def>
5076 - <column_id>74</column_id> 5148 + <column_id>58</column_id>
5077 <type>Format</type> 5149 <type>Format</type>
5078 <repeat_num>1</repeat_num> 5150 <repeat_num>1</repeat_num>
5079 <template>colunaidgeo_%</template> 5151 <template>colunaidgeo_%</template>
@@ -5088,7 +5160,7 @@ @@ -5088,7 +5160,7 @@
5088 </modified_values> 5160 </modified_values>
5089 </data_def> 5161 </data_def>
5090 <data_def> 5162 <data_def>
5091 - <column_id>75</column_id> 5163 + <column_id>59</column_id>
5092 <type>Format</type> 5164 <type>Format</type>
5093 <repeat_num>1</repeat_num> 5165 <repeat_num>1</repeat_num>
5094 <template>filtro%</template> 5166 <template>filtro%</template>
@@ -5103,7 +5175,7 @@ @@ -5103,7 +5175,7 @@
5103 </modified_values> 5175 </modified_values>
5104 </data_def> 5176 </data_def>
5105 <data_def> 5177 <data_def>
5106 - <column_id>76</column_id> 5178 + <column_id>60</column_id>
5107 <type>Format</type> 5179 <type>Format</type>
5108 <repeat_num>1</repeat_num> 5180 <repeat_num>1</repeat_num>
5109 <template>nomemedida_%</template> 5181 <template>nomemedida_%</template>
@@ -5118,7 +5190,7 @@ @@ -5118,7 +5190,7 @@
5118 </modified_values> 5190 </modified_values>
5119 </data_def> 5191 </data_def>
5120 <data_def> 5192 <data_def>
5121 - <column_id>77</column_id> 5193 + <column_id>61</column_id>
5122 <type>Format</type> 5194 <type>Format</type>
5123 <repeat_num>1</repeat_num> 5195 <repeat_num>1</repeat_num>
5124 <template>colunaidunico%</template> 5196 <template>colunaidunico%</template>
@@ -6047,41 +6119,41 @@ @@ -6047,41 +6119,41 @@
6047 </repeat_test_data> 6119 </repeat_test_data>
6048 </table_test_data> 6120 </table_test_data>
6049 <table_test_data> 6121 <table_test_data>
6050 - <table_id>12</table_id> 6122 + <table_id>13</table_id>
6051 <direct_test_data> 6123 <direct_test_data>
6052 <data> 6124 <data>
6053 <column_data> 6125 <column_data>
6054 - <column_id>55</column_id> 6126 + <column_id>62</column_id>
6055 <value>1</value> 6127 <value>1</value>
6056 </column_data> 6128 </column_data>
6057 <column_data> 6129 <column_data>
6058 - <column_id>56</column_id> 6130 + <column_id>63</column_id>
6059 <value>1</value> 6131 <value>1</value>
6060 </column_data> 6132 </column_data>
6061 <column_data> 6133 <column_data>
6062 - <column_id>57</column_id> 6134 + <column_id>64</column_id>
6063 <value>2</value> 6135 <value>2</value>
6064 </column_data> 6136 </column_data>
6065 <column_data> 6137 <column_data>
6066 - <column_id>58</column_id> 6138 + <column_id>65</column_id>
6067 <value>co_municipio</value> 6139 <value>co_municipio</value>
6068 </column_data> 6140 </column_data>
6069 </data> 6141 </data>
6070 <data> 6142 <data>
6071 <column_data> 6143 <column_data>
6072 - <column_id>55</column_id> 6144 + <column_id>62</column_id>
6073 <value>2</value> 6145 <value>2</value>
6074 </column_data> 6146 </column_data>
6075 <column_data> 6147 <column_data>
6076 - <column_id>56</column_id> 6148 + <column_id>63</column_id>
6077 <value>2</value> 6149 <value>2</value>
6078 </column_data> 6150 </column_data>
6079 <column_data> 6151 <column_data>
6080 - <column_id>57</column_id> 6152 + <column_id>64</column_id>
6081 <value>3</value> 6153 <value>3</value>
6082 </column_data> 6154 </column_data>
6083 <column_data> 6155 <column_data>
6084 - <column_id>58</column_id> 6156 + <column_id>65</column_id>
6085 <value>co_uf</value> 6157 <value>co_uf</value>
6086 </column_data> 6158 </column_data>
6087 </data> 6159 </data>
@@ -6090,7 +6162,7 @@ @@ -6090,7 +6162,7 @@
6090 <test_data_num>0</test_data_num> 6162 <test_data_num>0</test_data_num>
6091 <data_def_list> 6163 <data_def_list>
6092 <data_def> 6164 <data_def>
6093 - <column_id>55</column_id> 6165 + <column_id>62</column_id>
6094 <type>Format</type> 6166 <type>Format</type>
6095 <repeat_num>1</repeat_num> 6167 <repeat_num>1</repeat_num>
6096 <template>%</template> 6168 <template>%</template>
@@ -6105,7 +6177,7 @@ @@ -6105,7 +6177,7 @@
6105 </modified_values> 6177 </modified_values>
6106 </data_def> 6178 </data_def>
6107 <data_def> 6179 <data_def>
6108 - <column_id>56</column_id> 6180 + <column_id>63</column_id>
6109 <type>Foreign Key</type> 6181 <type>Foreign Key</type>
6110 <repeat_num>1</repeat_num> 6182 <repeat_num>1</repeat_num>
6111 <template>%</template> 6183 <template>%</template>
@@ -6120,7 +6192,7 @@ @@ -6120,7 +6192,7 @@
6120 </modified_values> 6192 </modified_values>
6121 </data_def> 6193 </data_def>
6122 <data_def> 6194 <data_def>
6123 - <column_id>57</column_id> 6195 + <column_id>64</column_id>
6124 <type>Format</type> 6196 <type>Format</type>
6125 <repeat_num>1</repeat_num> 6197 <repeat_num>1</repeat_num>
6126 <template>%</template> 6198 <template>%</template>
@@ -6135,7 +6207,7 @@ @@ -6135,7 +6207,7 @@
6135 </modified_values> 6207 </modified_values>
6136 </data_def> 6208 </data_def>
6137 <data_def> 6209 <data_def>
6138 - <column_id>58</column_id> 6210 + <column_id>65</column_id>
6139 <type>Format</type> 6211 <type>Format</type>
6140 <repeat_num>1</repeat_num> 6212 <repeat_num>1</repeat_num>
6141 <template>colunaligacao_regiaopai%</template> 6213 <template>colunaligacao_regiaopai%</template>
ferramentas/metaestat/analise.php
  Diff comments   View file @fdcef82
@@ -37,6 +37,7 @@ O par&amp;acirc;metro principal &amp;eacute; &quot;funcao&quot;, que define qual opera&amp;ccedil;&amp;ati @@ -37,6 +37,7 @@ O par&amp;acirc;metro principal &amp;eacute; &quot;funcao&quot;, que define qual opera&amp;ccedil;&amp;ati
37 37
38 Cada opera&ccedil;&atilde;o possu&iacute; seus próprios par&acirc;metros, que devem ser enviados tamb&eacute;m na requisi&ccedil;&atilde;o da opera&ccedil;&atilde;o. 38 Cada opera&ccedil;&atilde;o possu&iacute; seus próprios par&acirc;metros, que devem ser enviados tamb&eacute;m na requisi&ccedil;&atilde;o da opera&ccedil;&atilde;o.
39 */ 39 */
  40 +error_reporting(0);
40 include(__DIR__."/../../admin/php/admin.php"); 41 include(__DIR__."/../../admin/php/admin.php");
41 include(__DIR__."/../../admin/php/classe_metaestat.php"); 42 include(__DIR__."/../../admin/php/classe_metaestat.php");
42 session_name("i3GeoPHP"); 43 session_name("i3GeoPHP");
ferramentas/metaestat/editorlimites.php
  Diff comments   View file @fdcef82
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 */ 32 */
33 33
34 //TODO incluir verificacao de login 34 //TODO incluir verificacao de login
35 - 35 +error_reporting(0);
36 include_once(__DIR__."/../../ms_configura.php"); 36 include_once(__DIR__."/../../ms_configura.php");
37 ?> 37 ?>
38 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> 38 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
ferramentas/metaestat/index.js
  Diff comments   View file @fdcef82
@@ -58,6 +58,7 @@ i3GEOF.metaestat = { @@ -58,6 +58,7 @@ i3GEOF.metaestat = {
58 }, 58 },
59 analise: { 59 analise: {
60 inicia: function(iddiv){ 60 inicia: function(iddiv){
  61 + var ics,n,i;
61 if(!iddiv || !$i(iddiv)){ 62 if(!iddiv || !$i(iddiv)){
62 iddiv = "i3geoCartoAnalise_corpo"; 63 iddiv = "i3geoCartoAnalise_corpo";
63 } 64 }
@@ -65,6 +66,19 @@ i3GEOF.metaestat = { @@ -65,6 +66,19 @@ i3GEOF.metaestat = {
65 i3GEOF.metaestat.analise.abreJanela(); 66 i3GEOF.metaestat.analise.abreJanela();
66 } 67 }
67 $i(iddiv).innerHTML = i3GEOF.metaestat.analise.html(); 68 $i(iddiv).innerHTML = i3GEOF.metaestat.analise.html();
  69 + ics = $i(iddiv).getElementsByTagName("button");
  70 + n = ics.length;
  71 + for(i=0;i<n;i++){
  72 + ics[i].style.backgroundColor = "white";
  73 + ics[i].className = "iconeGuiaMovel";
  74 + ics[i].onmouseout = function(){this.className = "iconeGuiaMovel iconeGuiaMovelMouseOut";};
  75 + ics[i].onmouseover = function(){this.className = "iconeGuiaMovel iconeGuiaMovelMouseOver";};
  76 + ics[i].style.backgroundImage = "none";
  77 + ics[i].style.height = "32px";
  78 + ics[i].style.width = "32px";
  79 + ics[i].style.border = "1px solid gray";
  80 + ics[i].style.margin = "0px";
  81 + }
68 }, 82 },
69 abreJanela: function(){ 83 abreJanela: function(){
70 var cabecalho,minimiza,imagemxy,janela; 84 var cabecalho,minimiza,imagemxy,janela;
@@ -75,8 +89,8 @@ i3GEOF.metaestat = { @@ -75,8 +89,8 @@ i3GEOF.metaestat = {
75 i3GEO.janela.minimiza("i3geoCartoAnalise"); 89 i3GEO.janela.minimiza("i3geoCartoAnalise");
76 }; 90 };
77 janela = i3GEO.janela.cria( 91 janela = i3GEO.janela.cria(
78 - i3GEOF.metaestat.LARGURA+"px",  
79 - i3GEOF.metaestat.ALTURA+"px", 92 + "200px",
  93 + "100px",
80 "", 94 "",
81 "", 95 "",
82 "", 96 "",
@@ -100,8 +114,20 @@ i3GEOF.metaestat = { @@ -100,8 +114,20 @@ i3GEOF.metaestat = {
100 }, 114 },
101 html: function(){ 115 html: function(){
102 var ins = '<div id="i3geoCartoAnaliseContainer" style="margin-left:5px;">' + 116 var ins = '<div id="i3geoCartoAnaliseContainer" style="margin-left:5px;">' +
  117 + ' <button title="Localizar regi&atilde;o" onclick="i3GEO.mapa.dialogo.locregiao()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/open-street-maps.png" /></button>' +
  118 + ' <button title="Filtrar regi&atilde;o" onclick="i3GEO.mapa.dialogo.filtraregiao()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/open-street-maps-filtro.png" /></button>' +
  119 + ' <button title="Tabela com os dados" onclick="i3GEO.tema.dialogo.tabela()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/table.png" /></button>' +
103 '</div>'; 120 '</div>';
104 return ins; 121 return ins;
  122 + },
  123 + mudaicone: function(){
  124 + var c = $i(editoripam.iddiv),
  125 + ci = c.getElementsByTagName("img"),
  126 + n = ci.length,
  127 + i;
  128 + for(i=0;i<n;i++){
  129 + ci[i].parentNode.style.backgroundColor = "#F5F5F5";
  130 + }
105 } 131 }
106 }, 132 },
107 classes:{ 133 classes:{
@@ -277,6 +303,7 @@ i3GEOF.metaestat = { @@ -277,6 +303,7 @@ i3GEOF.metaestat = {
277 i3GEOF.metaestat.comum.desligaCamadas(); 303 i3GEOF.metaestat.comum.desligaCamadas();
278 i3GEO.php.adtema(i3GEO.atualiza,retorno.mapfile); 304 i3GEO.php.adtema(i3GEO.atualiza,retorno.mapfile);
279 i3GEOF.metaestat.CAMADAS.push(retorno.layer); 305 i3GEOF.metaestat.CAMADAS.push(retorno.layer);
  306 + i3GEO.mapa.ativaTema(retorno.layer);
280 } 307 }
281 }; 308 };
282 if(v != true){ 309 if(v != true){
imagens/gisicons/open-street-maps-filtro.png 0 → 100755
View file @fdcef82

1.45 KB