Download as
Browse Code »

Commit fc7d47b67b9912fbd42906a18f352552f6e6fb5d

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

--no commit message

Showing 14 changed files with 1404 additions and 1276 deletions   Show diff stats
admin/admin.db
View file @fc7d47b
No preview for this file type
admin/php/admin.php
  Diff comments   View file @fc7d47b
... ... @@ -33,9 +33,7 @@ Arquivo:
33 33  
34 34 i3geo/admin/php/admin.php
35 35 */
36   -
37   -if(!isset($locaplic))
38   -{
  36 +if(!isset($locaplic)){
39 37 $locaplic = "";
40 38 include(__DIR__."/../../ms_configura.php");
41 39 }
... ... @@ -44,6 +42,7 @@ if(!file_exists($dir_tmp)){
44 42 }
45 43 include_once($locaplic."/classesphp/pega_variaveis.php");
46 44 error_reporting(0);
  45 +
47 46 //
48 47 //carrega o phpmapscript
49 48 //
... ...
admin/php/criabanco.php
  Diff comments   View file @fc7d47b
... ... @@ -46,16 +46,14 @@
46 46  
47 47 i3geo/admin/php/criabanco.php
48 48 */
49   -
50 49 /**
51 50 *
52 51 * TODO verificar se as tabelas estao corretas em funcao do sistema de administracao e incluir o login e senha
53 52 */
54 53 $funcao = "";
55   - include_once("admin.php");
  54 + //echo __DIR__;
  55 + include("admin.php");
56 56 error_reporting(E_ALL);
57   -
58   -
59 57 $tabelas = array(
60 58 "CREATE TABLE ".$esquemaadmin."i3geoadmin_grupos (desc_grupo TEXT, id_grupo INTEGER PRIMARY KEY, nome_grupo TEXT, it TEXT, es TEXT, en TEXT)",
61 59 "CREATE TABLE ".$esquemaadmin."i3geoadmin_sistemasf (abrir_funcao TEXT, h_funcao NUMERIC, id_funcao INTEGER PRIMARY KEY, id_sistema NUMERIC, nome_funcao TEXT, perfil_funcao TEXT, w_funcao NUMERIC)",
... ... @@ -82,14 +80,9 @@
82 80 "CREATE TABLE ".$esquemaadmin."i3geousr_operacoes (id_operacao INTEGER PRIMARY KEY, codigo TEXT, descricao TEXT)",
83 81 "CREATE TABLE ".$esquemaadmin."i3geousr_operacoespapeis (id_operacao NUMERIC, id_papel NUMERIC)"
84 82 );
85   - if($conexaoadmin == "")
86   - {
87   - if(file_exists("../../admin/admin.db"))
88   - {
89   - echo "Arquivo admin/admin.db ja existe. Vc deve apagá-lo para poder criá-lo novamente";exit;
90   - }
  83 + if($conexaoadmin == ""){
91 84 if(empty($_POST["senha"]) || empty($_POST["usuario"])){
92   - formularioLoginMaster("criabanco.php");
  85 + criabancoformularioLoginMaster("criabanco.php");
93 86 exit;
94 87 }
95 88 else{
... ... @@ -99,80 +92,92 @@
99 92 exit;
100 93 }
101 94 }
102   - if(function_exists("sqlite_open")){
103   - $banco = sqlite_open("../../admin/admin.db",0666);
104   - $banco = null;
105   - $dbhw = new PDO('sqlite:../../admin/admin.db');
  95 + if(file_exists("../../admin/admin.db")) {
  96 + echo "<br>Arquivo admin/admin.db ja existe. Vc deve apag&aacute;-lo para poder cri&aacute;-lo novamente caso precise";
106 97 }
107 98 else{
108   - echo "A fun&ccedil;&atilde;o de cria&ccedil;&atilde;o do banco sqlite n&atilde;o existe no PHP. Vc pode usar o arquivo i3geo/admin/adminvazio.db e renome&aacute;-lo para admin.db.";
109   - exit;
  99 + if(function_exists("sqlite_open")){
  100 + //cria o banco de dados de administracao
  101 + $banco = sqlite_open("../../admin/admin.db",0666);
  102 + $banco = null;
  103 + $dbhw = new PDO('sqlite:../../admin/admin.db');
  104 + }
  105 + else{
  106 + //TODO esse arquivo vazio existe mesmo?
  107 + echo "<br>A fun&ccedil;&atilde;o de cria&ccedil;&atilde;o do banco sqlite n&atilde;o existe no PHP. Vc pode usar o arquivo i3geo/admin/adminvazio.db e renome&aacute;-lo para admin.db.";
  108 + }
  109 + }
  110 + if(file_exists("../../admin/metaestat.db")) {
  111 + echo "<br>Arquivo admin/metaestat.db ja existe. Vc deve apag&aacute;-lo para poder cri&aacute;-lo novamente caso precise";
  112 + }
  113 + else{
  114 + //TODO nao funciona
  115 + //if(function_exists("SQLite3")){
  116 + //cria o banco de dados de metadados estatisticos
  117 + //$banco = new SQLite3("../../admin/metaestat.db",SQLITE3_OPEN_CREATE);
  118 + //$banco->close();
  119 + //}
  120 + //else{
  121 + //echo "<br>A fun&ccedil;&atilde;o de cria&ccedil;&atilde;o do banco sqlite3 n&atilde;o existe no PHP. N&atilde;o foi poss&iacute;vel criar o bando para o sistema de metadados.";
  122 + //exit;
  123 + //}
110 124 }
111 125 }
112   - else
113   - {
  126 + else{
114 127 include($conexaoadmin);
115 128 }
116   - foreach($tabelas as $tabela)
117   - {
118   - if($dbhw->getAttribute(PDO::ATTR_DRIVER_NAME) == "pgsql")
119   - {
  129 + if(empty($dbhw)){
  130 + echo "<br>Fim";
  131 + }
  132 + foreach($tabelas as $tabela){
  133 + if($dbhw->getAttribute(PDO::ATTR_DRIVER_NAME) == "pgsql"){
120 134 $tabela = str_replace("INTEGER PRIMARY KEY","SERIAL PRIMARY KEY NOT NULL",$tabela);
121 135 }
122 136 //echo $tabela."<br>";
123 137 $q = $dbhw->query($tabela);
124 138 }
125   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem executar qualquer tarefa, inclusive cadastrar novos administradores',1,'admin')");
126   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem criar/editar qualquer tema (mapfile) mas nao podem editar a arvore do catalogo de temas',2,'editores')");
127   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem alterar a arvore do catalogo e dos atlas',3,'publicadores')");
128   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem editar dados geograficos',4,'editoresgeo')");
129   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',1,'admin','admin','admin')");
130   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papelusuario VALUES(1,1)");
131   -
132   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(1,'admin/html/editormapfile','editor de mapfiles do sistema de administracao')");
133   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(2,'admin/html/operacoes','abre o editor de operacoes')");
134   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(3,'teste/','teste')");
135   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(4,'admin/html/arvore','edicao da arvore do catalogo de temas')");
136   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(5,'admin/html/menus','edicao da lista de menus')");
137   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(6,'admin/html/ogcws','edicao das preferencias do servico WMS')");
138   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(7,'admin/html/atlas','edicao de atlas')");
139   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(8,'admin/html/identifica','lista de sistemas incluidos na ferramenta de identificacao')");
140   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(9,'admin/html/incluimap','adapta mapfiles antigos para versoes novas do Mapserver')");
141   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(10,'admin/html/mapas','lista de links para mapas')");
142   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(11,'admin/html/perfis','lista controlada de perfis')");
143   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(12,'admin/html/sistemas','lista de sistemas complementares que sao mostrados no catalogo')");
144   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(13,'admin/html/subirshapefile','upload de shapefile para uma pasta especifica no servidor')");
145   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(14,'admin/html/tags','edicao da lista controlada de tags')");
146   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(15,'admin/html/webservices','cadastro de links para webservices')");
147   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,2)");
148   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,3)");
149   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(4,3)");
150   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(5,3)");
151   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(7,3)");
152   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(10,3)");
153   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,2)");
154   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,4)");
155   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(15,3)");
156   -
157   -
158   -
159   -
160   - $banco = null;
161   - echo "Banco criado!!! administrador: admin / admin - n&atilde;o esque&ccedil;a de alterar essa senha na op&ccedil;&atilde;o de edi&ccedil;&atilde;o do cadastro de usu&aacute;rios";
162   - function formularioLoginMaster($action){
  139 + if(!empty($banco)){
  140 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem executar qualquer tarefa, inclusive cadastrar novos administradores',1,'admin')");
  141 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem criar/editar qualquer tema (mapfile) mas nao podem editar a arvore do catalogo de temas',2,'editores')");
  142 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem alterar a arvore do catalogo e dos atlas',3,'publicadores')");
  143 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem editar dados geograficos',4,'editoresgeo')");
  144 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',1,'admin','admin','admin')");
  145 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papelusuario VALUES(1,1)");
  146 +
  147 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(1,'admin/html/editormapfile','editor de mapfiles do sistema de administracao')");
  148 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(2,'admin/html/operacoes','abre o editor de operacoes')");
  149 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(3,'teste/','teste')");
  150 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(4,'admin/html/arvore','edicao da arvore do catalogo de temas')");
  151 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(5,'admin/html/menus','edicao da lista de menus')");
  152 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(6,'admin/html/ogcws','edicao das preferencias do servico WMS')");
  153 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(7,'admin/html/atlas','edicao de atlas')");
  154 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(8,'admin/html/identifica','lista de sistemas incluidos na ferramenta de identificacao')");
  155 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(9,'admin/html/incluimap','adapta mapfiles antigos para versoes novas do Mapserver')");
  156 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(10,'admin/html/mapas','lista de links para mapas')");
  157 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(11,'admin/html/perfis','lista controlada de perfis')");
  158 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(12,'admin/html/sistemas','lista de sistemas complementares que sao mostrados no catalogo')");
  159 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(13,'admin/html/subirshapefile','upload de shapefile para uma pasta especifica no servidor')");
  160 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(14,'admin/html/tags','edicao da lista controlada de tags')");
  161 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(15,'admin/html/webservices','cadastro de links para webservices')");
  162 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,2)");
  163 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,3)");
  164 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(4,3)");
  165 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(5,3)");
  166 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(7,3)");
  167 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(10,3)");
  168 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,2)");
  169 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,4)");
  170 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(15,3)");
  171 + $banco = null;
  172 + echo "Banco criado!!! administrador: admin / admin - n&atilde;o esque&ccedil;a de alterar essa senha na op&ccedil;&atilde;o de edi&ccedil;&atilde;o do cadastro de usu&aacute;rios";
  173 + }
  174 + function criabancoformularioLoginMaster($action){
163 175 echo "<form method=post action=$action >";
164 176 echo "<br>Essa conex&atilde;o pode n&atilde;o ser segura e os dados de usu&aacute;rio/senha podem ser descobertos<br><br>";
165 177 echo "Nome do usu&aacute;rio master cadastrado em ms_configura.php:<br> <input type=text name=usuario /><br>";
166 178 echo "Senha:<br> <input type=password name=senha /><br>";
167 179 echo "<input type=submit />";
168 180 }
169   - function verificaMaster($usuario,$senha,$i3geomaster){
170   - foreach($i3geomaster as $teste){
171   - if(!empty($usuario) && !empty($senha) && $teste["usuario"] == $usuario && $teste["senha"] == $senha){
172   - return true;
173   - }
174   - }
175   - return false;
176   - }
  181 +
177 182 ?>
178 183 </div>
179 184 \ No newline at end of file
... ...
admin/php/upgradebanco46_47.php
  Diff comments   View file @fc7d47b
... ... @@ -174,8 +174,15 @@ if(!in_array($teste,&#39;13-4&#39;))
174 174 $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,4)");
175 175 if(!in_array($teste,'15-3'))
176 176 $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(15,3)");
177   -
178   -echo "Feito!";
  177 +//cria o banco de dados de metadados estatisticos
  178 +if(file_exists("../../admin/metaestat.db")) {
  179 + echo "<br>Arquivo admin/metaestat.db ja existe. Vc deve apag&aacute;-lo para poder cri&aacute;-lo novamente caso precise";
  180 +}
  181 +else{
  182 + $banco = sqlite_open("../../admin/metaestat.db",0666);
  183 + $banco = null;
  184 +}
  185 +echo "<br>Feito!";
179 186 function lista($sql,$coluna,$coluna1=""){
180 187 global $dbh;
181 188 $lista = array();
... ...
admin/sql/metaestat_basededados.sql
  Diff comments   View file @fc7d47b
1 1 -- i3geoestat_conexao
2 2 INSERT INTO i3geoestat_conexao (codigo_estat_conexao, bancodedados, host, porta, usuario, senha) VALUES ('1', 'dbspo', 'localhost', '5432', 'postgres', 'postgres');
  3 +INSERT INTO i3geoestat_conexao (codigo_estat_conexao, bancodedados, host, porta, usuario, senha) VALUES ('0', 'default', '', '', '', '');
3 4  
4 5  
5 6 -- i3geoestat_tipo_periodo
... ... @@ -9,6 +10,7 @@ INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUE
9 10  
10 11 -- i3geoestat_tipo_regiao
11 12 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', 'Município', 'Limites municipais', '1', 'public', 'tb_ibge', 'the_geom', '', 'ibge', 'no_cidade', '4326', 'the_geom2');
  13 +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', 'Estados', 'Limites estaduais', '1', 'public', 'tb_ibge_estados', 'the_geom', '', 'co_ibge_uf', 'no_uf', '4326', 'the_geom');
12 14  
13 15  
14 16 -- i3geoestat_unidade_medida
... ...
classesjs/classe_cartograma.js
View file @2ed2884
... ... @@ -1,555 +0,0 @@
1   -/*
2   -Title: Cartogramas estat&iacute;sticos
3   -
4   -Arquivo:
5   -
6   -i3geo/classesjs/classe_cartograma.js
7   -
8   -Licenca:
9   -
10   -GPL2
11   -
12   -i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
13   -
14   -Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil
15   -Desenvolvedor: Edmar Moretti edmar.moretti@mma.gov.br
16   -
17   -Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo
18   -e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a P&uacute;blica Geral
19   -GNU conforme publicada pela Free Software Foundation;
20   -
21   -Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til,
22   -por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a garantia impl&iacute;cita
23   -de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA.
24   -Consulte a Licen&ccedil;a P&uacute;blica Geral do GNU para mais detalhes.
25   -Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do
26   -GNU junto com este programa; se n&atilde;o, escreva para a
27   -Free Software Foundation, Inc., no endere&ccedil;o
28   -59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
29   -*/
30   -if(typeof(i3GEO) === 'undefined'){
31   - var i3GEO = {};
32   -}
33   -/*
34   -Classe: i3GEO.cartograma
35   -
36   -Gerencia os componentes do m&oacute;dulo de gera&ccedil;&atilde;o de cartogramas estat&iacute;sticos
37   -*/
38   -i3GEO.cartograma = {
39   - INTERFACE: "flutuante",
40   - TOP: 50,
41   - LEFT: 100,
42   - LARGURA: 260,
43   - ALTURA: 300,
44   - //lista das camadas que foram adicionadas ao mapa
45   - CAMADAS: [],
46   - inicia: function(iddiv){
47   - i3GEO.cartograma.principal.inicia(iddiv);
48   - },
49   - desligaCamadas: function(){
50   - if(i3GEO.cartograma.CAMADAS.length > 0){
51   - i3GEO.arvoreDeCamadas.ligaDesligaTemas(i3GEO.cartograma.CAMADAS.join(","),false);
52   - }
53   - },
54   - adicionaCamada: function(){
55   - //function mapfileMedidaVariavel($id_medida_variavel,$filtro="",$todasascolunas = 0,$tipolayer="polygon",$titulolayer="",$id_classificacao="",$agruparpor=""){
56   - var v = i3GEO.cartograma.verificaParametros(),
57   - temp = function(retorno){
58   - if(i3GEO.arvoreDeCamadas.pegaTema(retorno.layer) == ""){
59   - i3GEO.cartograma.desligaCamadas();
60   - i3GEO.php.adtema(i3GEO.atualiza,retorno.mapfile);
61   - i3GEO.cartograma.CAMADAS.push(retorno.layer);
62   - }
63   - };
64   - if(v != true){
65   - alert("erro: "+v);
66   - }
67   - i3GEO.php.mapfileMedidaVariavel(
68   - temp,
69   - $i("i3geoCartoComboMedidasVariavel").value,
70   - i3GEO.cartograma.defineFiltro(),
71   - 0,
72   - $i("i3geoCartoComboTipoRep").value,
73   - i3GEO.cartograma.defineTitulo(),
74   - $i("i3geoCartoComboTipoClassificacao").value,
75   - i3GEO.cartograma.defineAgruparPor()
76   - );
77   - },
78   - defineTitulo: function(){
79   - //se nao tiver parametros, filtro e vazio
80   - if(i3GEO.cartograma.parametros.dados.length == 0){
81   - return "";
82   - }
83   - //se tiver parametro e todos estiverem vazios, aborta
84   - var i,n,c,titulo,
85   - t=[],
86   - dados = i3GEO.cartograma.parametros.dados;
87   - titulo = $i("i3geoCartoComboVariavel").options[$i("i3geoCartoComboVariavel").selectedIndex].label +" - "+
88   - $i("i3geoCartoComboMedidasVariavel").options[$i("i3geoCartoComboMedidasVariavel").selectedIndex].label +" - "+
89   - $i("i3geoCartoComboTipoRep").options[$i("i3geoCartoComboTipoRep").selectedIndex].label +" - "+
90   - $i("i3geoCartoComboTipoClassificacao").options[$i("i3geoCartoComboTipoClassificacao").selectedIndex].label;
91   - n = dados.length;
92   - for(i=0;i<n;i++){
93   - c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai);
94   - if(c && c.value != ""){
95   - t.push(dados[i].nome+" = "+c.value);
96   - }
97   - }
98   - if(t.length > 0){
99   - return titulo+" - "+t.join(", ");
100   - }
101   - else{
102   - return titulo;
103   - }
104   - },
105   - defineFiltro: function(){
106   - //se nao tiver parametros, filtro e vazio
107   - if(i3GEO.cartograma.parametros.dados.length == 0){
108   - return "";
109   - }
110   - //se tiver parametro e todos estiverem vazios, aborta
111   - var i,n,c,
112   - t=[],
113   - dados = i3GEO.cartograma.parametros.dados;
114   - n = dados.length;
115   - for(i=0;i<n;i++){
116   - c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai);
117   - if(c && c.value != ""){
118   - t.push(dados[i].coluna+"="+c.value);
119   - }
120   - }
121   - if(t.length > 0){
122   - return t.join(" and ");
123   - }
124   - else{
125   - return "";
126   - }
127   - },
128   - defineAgruparPor: function(){
129   - //se nao tiver parametros, filtro e vazio
130   - if(i3GEO.cartograma.parametros.dados.length == 0){
131   - return "";
132   - }
133   - //se tiver parametro e todos estiverem vazios, aborta
134   - var i,n,c,
135   - t=[],
136   - dados = i3GEO.cartograma.parametros.dados;
137   - n = dados.length;
138   - for(i=0;i<n;i++){
139   - c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai);
140   - if(c && c.value != ""){
141   - t.push(dados[i].coluna);
142   - }
143   - }
144   - if(t.length > 0){
145   - return t.join(",");
146   - }
147   - else{
148   - return "";
149   - }
150   - },
151   - verificaParametros: function(){
152   - var ok = true,
153   - combos = ["i3geoCartoComboVariavel","i3geoCartoComboMedidasVariavel","i3geoCartoComboTipoRep","i3geoCartoComboTipoClassificacao"],
154   - n = combos.length,
155   - i,temp;
156   - for(i=0;i<n;i++){
157   - temp = $i(combos[i]);
158   - if(!temp){
159   - return combos[i];
160   - }
161   - if(temp.value == ""){
162   - return combos[i];
163   - }
164   - }
165   - return ok;
166   - },
167   - aguarde: function(obj){
168   - if(!obj){
169   - return "<img style='display:block;z-index:2' src=\'"+i3GEO.configura.locaplic+"/imagens/aguarde.gif\' />";
170   - }
171   - var i = $i(obj.id+"_imagem");
172   - if(!i){
173   - obj.innerHTML = "<img id='"+obj.id+"_imagem' style='display:block;z-index:2' src=\'"+i3GEO.configura.locaplic+"/imagens/aguarde.gif\' />";
174   - }
175   - else{
176   - if(i.style.display == "block"){
177   - i.style.display = "none";
178   - }
179   - else{
180   - i.style.display = "block";
181   - }
182   - }
183   - },
184   - principal: {
185   - inicia: function(iddiv){
186   - if(!iddiv){
187   - iddiv = "i3geoCartoParametros_corpo";
188   - }
189   - if(i3GEO.cartograma.INTERFACE == "flutuante"){
190   - i3GEO.cartograma.principal.abreJanela();
191   - }
192   - $i(iddiv).innerHTML = i3GEO.cartograma.principal.html();
193   - i3GEO.cartograma.principal.comboVariaveis();
194   - },
195   - abreJanela: function(){
196   - var cabecalho,minimiza,imagemxy,janela;
197   - if (!$i("i3geoCartoParametros")){
198   - cabecalho = function(){
199   - };
200   - minimiza = function(){
201   - i3GEO.janela.minimiza("i3geoCartoParametros");
202   - };
203   - janela = i3GEO.janela.cria(
204   - i3GEO.cartograma.LARGURA+"px",
205   - i3GEO.cartograma.ALTURA+"px",
206   - "",
207   - "",
208   - "",
209   - $trad("x57"),
210   - "i3geoCartoParametros",
211   - false,
212   - "hd",
213   - cabecalho,
214   - minimiza
215   - );
216   - janela = janela[0];
217   - YAHOO.i3GEO.janela.manager.register(janela);
218   - janela.render();
219   - }
220   - else{
221   - janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoParametros");
222   - }
223   - janela.show();
224   - imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO));
225   - janela.moveTo(imagemxy[0]+i3GEO.cartograma.LEFT,i3GEO.cartograma.TOP);
226   - },
227   - html: function(){
228   - var ins = '<div id="i3geoCartoVariaveisContainer" style="margin-left:5px;">' +
229   - '<div class="paragrafo" id="i3geoCartoVariaveis" >' +
230   - '</div>' +
231   - '<div class="paragrafo" id="i3geoCartoMedidasVariavel" >' +
232   - '</div>' +
233   - '<div class="paragrafo" id="i3geoCartoParametrosMedidasVariavel" >' +
234   - '</div>' +
235   - '</div>';
236   - return ins;
237   - },
238   - maisInfo: function(){
239   - var temp = "",
240   - v = $i("i3geoCartoComboVariavel");
241   - if(!v || v.value === ""){
242   - alert($trad("x61"));
243   - }
244   - else{
245   - var cabecalho,minimiza,janela;
246   - if (!$i("i3geoCartoMaisInfo")){
247   - cabecalho = function(){
248   - };
249   - minimiza = function(){
250   - i3GEO.janela.minimiza("i3geoCartoMaisInfo");
251   - };
252   - janela = i3GEO.janela.cria(
253   - "400px",
254   - "300px",
255   - "",
256   - "",
257   - "",
258   - $trad("x62"),
259   - "i3geoCartoMaisInfo",
260   - false,
261   - "hd",
262   - cabecalho,
263   - minimiza
264   - );
265   - janela = janela[0];
266   - YAHOO.i3GEO.janela.manager.register(janela);
267   - janela.render();
268   - //YAHOO.util.Event.addListener(janela.close, "click", i3GEO.cartograma.fechaJanelaParametros);
269   - }
270   - else{
271   - janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoMaisInfo");
272   - }
273   - janela.setBody(i3GEO.cartograma.aguarde());
274   - temp = function(retorno){
275   - janela.setBody(retorno);
276   - janela.show();
277   - //imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO));
278   - //janela.moveTo(imagemxy[0]+i3GEO.cartograma.LEFT,imagemxy[1]+i3GEO.cartograma.TOP);
279   - };
280   - i3GEO.php.relatorioVariavel(v.value,temp);
281   - }
282   - },
283   - comboVariaveis: function(){
284   - var onde = $i("i3geoCartoVariaveis"),
285   - temp = function(dados){
286   - var n = dados.length,
287   - ins = '<p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoInfo" onclick="i3GEO.cartograma.principal.maisInfo()" value="'+$trad("x60")+'"class="paragrafo" style="width:200px;cursor:pointer;color:blue" /></p><br><p class="paragrafo" >'+$trad("x58")+'</p>',
288   - i;
289   - ins += "<select id='i3geoCartoComboVariavel' style='box-shadow:0 1px 5px gray;width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange='i3GEO.cartograma.principal.comboVariaveisOnchange(this)'><option value=''>---</option>";
290   - for(i=0;i<n;i++){
291   - ins += "<option title='"+dados[i].descricao+"' value='"+dados[i].codigo_variavel+"'>"+dados[i].nome+"</option>";
292   - }
293   - ins += "</select>";
294   - if(onde){
295   - onde.innerHTML = ins;
296   - new YAHOO.widget.Button(
297   - "i3GEOcartoBotaoInfo",
298   - {onclick:{fn: i3GEO.cartograma.principal.maisInfo}}
299   - );
300   - $i("i3GEOcartoBotaoInfo-button").style.width = i3GEO.cartograma.LARGURA - 25 + "px";
301   - }
302   - return ins;
303   - };
304   - i3GEO.cartograma.aguarde(onde);
305   - i3GEO.php.listaVariavel(temp);
306   - },
307   - comboVariaveisOnchange: function(combo){
308   - if(combo.value != ""){
309   - i3GEO.cartograma.principal.comboMedidasVariavel(combo.value);
310   - }
311   - else{
312   - $i("i3geoCartoMedidasVariavel").innerHTML = "";
313   - $i("i3geoCartoParametrosMedidasVariavel").innerHTML = "";
314   - }
315   - },
316   - comboMedidasVariavel: function(codigo_variavel){
317   - var onde = $i("i3geoCartoMedidasVariavel"),
318   - temp = function(dados){
319   - var n = dados.length,
320   - ins = '<p class="paragrafo" >'+$trad("x59")+'</p>',
321   - i;
322   - ins += "<select id='i3geoCartoComboMedidasVariavel' style='width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange='i3GEO.cartograma.principal.comboMedidaVariavelOnchange(this)'><option value=''>---</option>";
323   - for(i=0;i<n;i++){
324   - ins += "<option value='"+dados[i].id_medida_variavel+"'>"+dados[i].nomemedida+"</option>";
325   - }
326   - ins += "</select>";
327   - if(onde){
328   - onde.innerHTML = ins;
329   - }
330   - return ins;
331   - };
332   - i3GEO.cartograma.aguarde(onde);
333   - i3GEO.php.listaMedidaVariavel(codigo_variavel,temp);
334   - },
335   - comboMedidaVariavelOnchange: function(combo){
336   - i3GEO.cartograma.classes.inicia();
337   - if(combo.value != ""){
338   - i3GEO.cartograma.parametros.lista(combo.value);
339   - }
340   - else{
341   - $i("i3geoCartoParametrosMedidasVariavel").innerHTML = "";
342   - }
343   - }
344   - },
345   - parametros: {
346   - //guarda a lista de parametros
347   - dados: [],
348   - //obtem a lista com os parametros da medida
349   - //cria os combos para os parametros que sao pai de todos
350   - lista: function(id_medida_variavel){
351   - i3GEO.cartograma.aguarde($i("i3geoCartoParametrosMedidasVariavel"));
352   - var temp = function(dados){
353   - i3GEO.cartograma.parametros.dados = dados;
354   - i3GEO.cartograma.parametros.combos("0");
355   - i3GEO.cartograma.aguarde($i("i3geoCartoParametrosMedidasVariavel"));
356   - };
357   - i3GEO.php.listaParametrosMedidaVariavel(id_medida_variavel,temp);
358   - },
359   - //cria um combo para escolher os valores de um parametro
360   - combos: function(nivel){
361   - var dados = i3GEO.cartograma.parametros.dados,
362   - n = dados.length,
363   - onde = $i("i3geoCartoParametrosMedidasVariavel"),
364   - idpar,idcombo,i,novoel,teste;
365   - //cria o combo para o parametro cujo id_pai for do nivel escolhido
366   - for(i=0;i<n;i++){
367   - if(dados[i].id_pai == nivel){
368   - idpar = "parametro_"+dados[i].id_parametro_medida;
369   - idcombo = "parametro_"+dados[i].id_parametro_medida+"_"+nivel;
370   - teste = i3GEO.cartograma.parametros.retornaIdPai(dados[i].id_parametro_medida);
371   - if(teste != false){
372   - idpar = "parametro_"+teste;
373   - }
374   - if(!$i(idpar)){
375   - novoel = document.createElement("div");
376   - novoel.id = idpar;
377   - novoel.className = "paragrafo";
378   - onde.appendChild(novoel);
379   - onde = novoel;
380   - }
381   - onde = $i(idpar);
382   - if(!$i(idcombo)){
383   - i3GEO.cartograma.aguarde(onde);
384   - novoel = document.createElement("div");
385   - novoel.id = idcombo;
386   - novoel.className = "paragrafo";
387   - onde.appendChild(novoel);
388   - i3GEO.cartograma.parametros.valoresCombo(dados[i].id_parametro_medida,dados[i].nome,nivel,onde,idcombo);
389   - }
390   - }
391   - }
392   - },
393   - valoresCombo: function(id_parametro_medida,titulo,nivel,onde,idcombo){
394   - var temp = function(dados){
395   - var n = dados.length,
396   - ins = "",
397   - oc = "'i3GEO.cartograma.parametros.antesCombo();i3GEO.cartograma.parametros.combos(\""+id_parametro_medida+"\")'",
398   - filho = i3GEO.cartograma.parametros.retornaIdFilho(id_parametro_medida),
399   - i,novoel;
400   - if(filho == false){
401   - oc = "";
402   - }
403   - ins = "<p class=paragrafo >"+titulo+"</p>";
404   - ins += "<select id='combo"+idcombo+"' style='background:beige;width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange="+oc+" ><option value=''>---</option>";
405   - for(i=0;i<n;i++){
406   - ins += "<option value='"+dados[i]+"'>"+dados[i]+"</option>";
407   - }
408   - ins += "</select>";
409   - novoel = document.createElement("div");
410   - novoel.className = "paragrafo";
411   - novoel.innerHTML = ins;
412   - i3GEO.cartograma.aguarde(onde);
413   - onde.appendChild(novoel);
414   - };
415   - i3GEO.php.listaValoresParametroMedidaVariavel(id_parametro_medida,temp);
416   - },
417   - antesCombo: function(){
418   - if(!$i("i3geoCartoClasses_corpo")){
419   - i3GEO.cartograma.classes.inicia();
420   - }
421   - },
422   - //retorna o id do parametro que e filho de um outro parametro
423   - retornaIdFilho:function(pai){
424   - var dados = i3GEO.cartograma.parametros.dados,
425   - n = dados.length,
426   - i;
427   - for(i=0;i<n;i++){
428   - if(dados[i].id_pai == pai){
429   - return dados[i].id_parametro_medida;
430   - }
431   - }
432   - return false;
433   - },
434   - //retorna o id do parametro que e pai de um outro parametro
435   - retornaIdPai:function(filho){
436   - var dados = i3GEO.cartograma.parametros.dados,
437   - n = dados.length,
438   - i;
439   - for(i=0;i<n;i++){
440   - if(dados[i].id_parametro_medida == filho){
441   - return dados[i].id_pai;
442   - }
443   - }
444   - return false;
445   - }
446   - },
447   - classes:{
448   - inicia: function(iddiv){
449   - if(!$i("i3geoCartoComboMedidasVariavel")){
450   - alert("erro: i3geoCartoComboMedidasVariavel???");
451   - return;
452   - }
453   - if(!iddiv){
454   - iddiv = "i3geoCartoClasses_corpo";
455   - }
456   - if(i3GEO.cartograma.INTERFACE == "flutuante"){
457   - i3GEO.cartograma.classes.abreJanela();
458   - }
459   - $i(iddiv).innerHTML = i3GEO.cartograma.classes.html();
460   - i3GEO.cartograma.classes.comboTipoRep();
461   - i3GEO.cartograma.classes.comboTipoClassificacao();
462   - },
463   - abreJanela: function(){
464   - var cabecalho,minimiza,imagemxy,janela;
465   - if (!$i("i3geoCartoClasses")){
466   - cabecalho = function(){
467   - };
468   - minimiza = function(){
469   - i3GEO.janela.minimiza("i3geoCartoClasses");
470   - };
471   - janela = i3GEO.janela.cria(
472   - i3GEO.cartograma.LARGURA+"px",
473   - i3GEO.cartograma.ALTURA+"px",
474   - "",
475   - "",
476   - "",
477   - $trad("x63"),
478   - "i3geoCartoClasses",
479   - false,
480   - "hd",
481   - cabecalho,
482   - minimiza
483   - );
484   - janela = janela[0];
485   - YAHOO.i3GEO.janela.manager.register(janela);
486   - janela.render();
487   - }
488   - else{
489   - janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoClasses");
490   - }
491   - janela.show();
492   - imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO));
493   - janela.moveTo(imagemxy[0]+i3GEO.cartograma.LEFT+i3GEO.cartograma.LARGURA+10,i3GEO.cartograma.TOP);
494   - },
495   - html: function(){
496   - var ins = '<div id="i3geoCartoClassesContainer" style="margin-left:5px;">' +
497   - '<div class="paragrafo" id="i3geoCartoTipoRep" >' +
498   - '</div>' +
499   - '<div class="paragrafo" id="i3geoCartoTipoClassificacao" >' +
500   - '</div>' +
501   - '</div>';
502   - return ins;
503   - },
504   - comboTipoRep: function(){
505   - var onde = $i("i3geoCartoTipoRep"),
506   - ins,i,
507   - dados = [
508   - {"codigo":"polygon","nome":"pol&iacute;gonos"},
509   - {"codigo":"point","nome":"pontos"}
510   - ],
511   - n = dados.length;
512   - ins = '<p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoAdicionarCamada" onclick="i3GEO.cartograma.principal.maisInfo()" value="'+$trad("x64")+'"class="paragrafo" style="cursor:pointer;color:blue" /></p>' +
513   - '<br><p class="paragrafo" >'+$trad("x65")+'</p>' +
514   - "<select id='i3geoCartoComboTipoRep' style='box-shadow:0 1px 5px gray;width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange=''>";
515   - for(i=0;i<n;i++){
516   - ins += "<option value='"+dados[i].codigo+"'>"+dados[i].nome+"</option>";
517   - }
518   - ins += "</select>";
519   - if(onde){
520   - onde.innerHTML = ins;
521   - new YAHOO.widget.Button(
522   - "i3GEOcartoBotaoAdicionarCamada",
523   - {onclick:{fn: i3GEO.cartograma.adicionaCamada}}
524   - );
525   - $i("i3GEOcartoBotaoAdicionarCamada-button").style.width = i3GEO.cartograma.LARGURA - 25 + "px";
526   - }
527   - return ins;
528   - },
529   - comboTipoClassificacao: function(){
530   - var onde = $i("i3geoCartoTipoClassificacao"),
531   - combo = $i("i3geoCartoComboMedidasVariavel"),
532   - temp = function(dados){
533   - var n = dados.length,
534   - ins = '<p class="paragrafo" >'+$trad("x66")+'</p>',
535   - i;
536   - ins += "<select id='i3geoCartoComboTipoClassificacao' style='width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange='i3GEO.cartograma.classes.comboTipoClassificacaoOnchange(this)'><option value=''>---</option>";
537   - for(i=0;i<n;i++){
538   - ins += "<option title='"+dados[i].observacao+"' value='"+dados[i].id_classificacao+"'>"+dados[i].nome+"</option>";
539   - }
540   - ins += "</select>";
541   - //{"id_classificacao":"1","nome":"Pela media","id_medida_variavel":"1","observacao":""}
542   - if(onde){
543   - onde.innerHTML = ins;
544   - }
545   - return ins;
546   - };
547   - i3GEO.cartograma.aguarde(onde);
548   - i3GEO.php.listaClassificacaoMedida(combo.value,temp);
549   - },
550   - comboTipoClassificacaoOnchange: function(){
551   -
552   - }
553   - }
554   -
555   -};
556 0 \ No newline at end of file
classesjs/compactajs.php
  Diff comments   View file @fc7d47b
... ... @@ -118,7 +118,6 @@ packer(&quot;classe_interface.js&quot;,&quot;compactados/classe_interface_compacto.js&quot;,&quot;Normal&quot;
118 118 packer("classe_i3geo.js","compactados/classe_i3geo_compacto.js","Normal");
119 119 packer("dicionario_ajuda.js","compactados/dicionario_ajuda_compacto.js","Normal");
120 120 packer("classe_social.js","compactados/classe_social_compacto.js","Normal");
121   -packer("classe_cartograma.js","compactados/classe_cartograma_compacto.js","Normal");
122 121 //packer("../ferramentas/funcoes.js","../ferramentas/funcoes_compacto.js","Normal");
123 122 packer("../pacotes/yui290/build/container/container.js","../pacotes/yui290/build/container/container_compacto.js","Normal");
124 123 packer("../pacotes/yui290/build/container/container_core.js","../pacotes/yui290/build/container/container_core_compacto.js","Normal");
... ... @@ -187,7 +186,6 @@ $jsfiles = array(
187 186 "compactados/classe_gadgets_compacto.js",
188 187 "compactados/classe_social_compacto.js",
189 188 "compactados/classe_login_compacto.js",
190   -"compactados/classe_cartograma_compacto.js",
191 189 "../pacotes/eudock/js/euDock.2.0.js",
192 190 "../pacotes/eudock/js/euDock.Image.js"
193 191 );
... ...
classesjs/dicionario.js
  Diff comments   View file @fc7d47b
... ... @@ -1936,69 +1936,6 @@ it:&quot;&quot;
1936 1936 }],
1937 1937 "x58":[
1938 1938 {
1939   -pt:"Escolha uma vari&aacute;vel para o mapa",
1940   -en:"",
1941   -es:"",
1942   -it:""
1943   -}],
1944   -"x59":[
1945   -{
1946   -pt:"Escolha uma medida da vari&aacute;vel",
1947   -en:"",
1948   -es:"",
1949   -it:""
1950   -}],
1951   -"x60":[
1952   -{
1953   -pt:"Mais informa&ccedil;&otilde;es sobre a vari&aacute;vel&nbsp;",
1954   -en:"",
1955   -es:"",
1956   -it:""
1957   -}],
1958   -"x61":[
1959   -{
1960   -pt:"Escolha uma variavel primeiro",
1961   -en:"",
1962   -es:"",
1963   -it:""
1964   -}],
1965   -"x62":[
1966   -{
1967   -pt:"Relat&oacute;rio",
1968   -en:"",
1969   -es:"",
1970   -it:""
1971   -}],
1972   -"x63":[
1973   -{
1974   -pt:"Classes",
1975   -en:"",
1976   -es:"",
1977   -it:""
1978   -}],
1979   -"x64":[
1980   -{
1981   -pt:"Adicionar camada ao mapa",
1982   -en:"",
1983   -es:"",
1984   -it:""
1985   -}],
1986   -"x65":[
1987   -{
1988   -pt:"Como os dados ser&atilde;o representados",
1989   -en:"",
1990   -es:"",
1991   -it:""
1992   -}],
1993   -"x66":[
1994   -{
1995   -pt:"Escolha um tipo de classifica&ccedil;&atilde;o",
1996   -en:"",
1997   -es:"",
1998   -it:""
1999   -}],
2000   -"x67":[
2001   -{
2002 1939 pt:"",
2003 1940 en:"",
2004 1941 es:"",
... ...
classesjs/i3geonaocompacto.js
  Diff comments   View file @fc7d47b
... ... @@ -65,8 +65,7 @@
65 65 "../pacotes/richdraw/richdraw_tudo_compacto.js",
66 66 "classe_coordenadas.js",
67 67 "classe_gadgets.js",
68   - "classe_login.js",
69   - "classe_cartograma.js"
  68 + "classe_login.js"
70 69 );
71 70 for (i = 0; i < jsfiles.length; i++)
72 71 {
... ...
classesjs/teste.txt
View file @2ed2884
documentacao/diagramas/metaestat.erm
  Diff comments   View file @fc7d47b
... ... @@ -12,7 +12,7 @@
12 12 <category_index>0</category_index>
13 13 <zoom>1.0</zoom>
14 14 <x>-372</x>
15   - <y>275</y>
  15 + <y>179</y>
16 16 <default_color>
17 17 <r>255</r>
18 18 <g>128</g>
... ... @@ -78,7 +78,7 @@
78 78 </export_java_setting>
79 79 <export_testdata_setting>
80 80 <file_encoding>ISO-8859-1</file_encoding>
81   - <file_path>C:\ms4w\Apache\htdocs\i3geo\admin\sql</file_path>
  81 + <file_path>/var/www/i3geo/admin/sql</file_path>
82 82 <format>0</format>
83 83 </export_testdata_setting>
84 84 </export_setting>
... ... @@ -110,7 +110,7 @@
110 110 </connections>
111 111 <display>false</display>
112 112 <creation_date>2012-07-17 15:03:53</creation_date>
113   - <updated_date>2012-08-18 09:59:03</updated_date>
  113 + <updated_date>2012-09-03 12:54:45</updated_date>
114 114 <model_property>
115 115 <name>Project Name</name>
116 116 <value></value>
... ... @@ -1068,7 +1068,7 @@
1068 1068 </sequence>
1069 1069 </normal_column>
1070 1070 <normal_column>
1071   - <word_id>38</word_id>
  1071 + <word_id>37</word_id>
1072 1072 <id>1</id>
1073 1073 <description></description>
1074 1074 <unique_key_name></unique_key_name>
... ... @@ -1259,7 +1259,7 @@
1259 1259 </sequence>
1260 1260 </normal_column>
1261 1261 <normal_column>
1262   - <word_id>41</word_id>
  1262 + <word_id>36</word_id>
1263 1263 <id>6</id>
1264 1264 <description></description>
1265 1265 <unique_key_name></unique_key_name>
... ... @@ -1291,7 +1291,7 @@
1291 1291 </sequence>
1292 1292 </normal_column>
1293 1293 <normal_column>
1294   - <word_id>17</word_id>
  1294 + <word_id>18</word_id>
1295 1295 <id>7</id>
1296 1296 <description></description>
1297 1297 <unique_key_name></unique_key_name>
... ... @@ -1386,7 +1386,7 @@
1386 1386 </sequence>
1387 1387 </normal_column>
1388 1388 <normal_column>
1389   - <word_id>37</word_id>
  1389 + <word_id>41</word_id>
1390 1390 <id>9</id>
1391 1391 <description></description>
1392 1392 <unique_key_name></unique_key_name>
... ... @@ -1418,7 +1418,7 @@
1418 1418 </sequence>
1419 1419 </normal_column>
1420 1420 <normal_column>
1421   - <word_id>18</word_id>
  1421 + <word_id>16</word_id>
1422 1422 <id>10</id>
1423 1423 <description></description>
1424 1424 <unique_key_name></unique_key_name>
... ... @@ -1460,28 +1460,45 @@
1460 1460 </table>
1461 1461 <table>
1462 1462 <id>5</id>
1463   - <height>170</height>
1464   - <width>292</width>
  1463 + <height>128</height>
  1464 + <width>247</width>
1465 1465 <font_name>Ubuntu</font_name>
1466 1466 <font_size>9</font_size>
1467   - <x>8</x>
1468   - <y>499</y>
  1467 + <x>673</x>
  1468 + <y>-89</y>
1469 1469 <color>
1470   - <r>255</r>
1471   - <g>165</g>
1472   - <b>0</b>
  1470 + <r>230</r>
  1471 + <g>230</g>
  1472 + <b>250</b>
1473 1473 </color>
1474 1474 <connections>
  1475 + <relation>
  1476 + <id>0</id>
  1477 + <source>8</source>
  1478 + <target>5</target>
  1479 + <child_cardinality>1..n</child_cardinality>
  1480 + <parent_cardinality>1</parent_cardinality>
  1481 + <reference_for_pk>true</reference_for_pk>
  1482 + <name></name>
  1483 + <on_delete_action>RESTRICT</on_delete_action>
  1484 + <on_update_action>RESTRICT</on_update_action>
  1485 + <source_xp>-1</source_xp>
  1486 + <source_yp>-1</source_yp>
  1487 + <target_xp>-1</target_xp>
  1488 + <target_yp>-1</target_yp>
  1489 + <referenced_column>null</referenced_column>
  1490 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1491 + </relation>
1475 1492 </connections>
1476   - <physical_name>i3geoestat_conexao</physical_name>
1477   - <logical_name>i3geoestat_conexao</logical_name>
1478   - <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados</description>
  1493 + <physical_name>i3geoestat_classificacao</physical_name>
  1494 + <logical_name>i3geoestat_classificacao</logical_name>
  1495 + <description>Lista de classificacoes de uma medida de variável</description>
1479 1496 <constraint></constraint>
1480 1497 <primary_key_name></primary_key_name>
1481 1498 <option></option>
1482 1499 <columns>
1483 1500 <normal_column>
1484   - <word_id>2</word_id>
  1501 + <word_id>28</word_id>
1485 1502 <id>11</id>
1486 1503 <description></description>
1487 1504 <unique_key_name></unique_key_name>
... ... @@ -1513,7 +1530,7 @@
1513 1530 </sequence>
1514 1531 </normal_column>
1515 1532 <normal_column>
1516   - <word_id>1</word_id>
  1533 + <word_id>40</word_id>
1517 1534 <id>12</id>
1518 1535 <description></description>
1519 1536 <unique_key_name></unique_key_name>
... ... @@ -1545,17 +1562,18 @@
1545 1562 </sequence>
1546 1563 </normal_column>
1547 1564 <normal_column>
1548   - <word_id>24</word_id>
1549 1565 <id>13</id>
  1566 + <referenced_column>31</referenced_column>
  1567 + <relation>0</relation>
1550 1568 <description></description>
1551 1569 <unique_key_name></unique_key_name>
1552 1570 <logical_name></logical_name>
1553 1571 <physical_name></physical_name>
1554   - <type>text</type>
  1572 + <type>integer</type>
1555 1573 <constraint></constraint>
1556 1574 <default_value></default_value>
1557 1575 <auto_increment>false</auto_increment>
1558   - <foreign_key>false</foreign_key>
  1576 + <foreign_key>true</foreign_key>
1559 1577 <not_null>false</not_null>
1560 1578 <primary_key>false</primary_key>
1561 1579 <unique_key>false</unique_key>
... ... @@ -1577,7 +1595,7 @@
1577 1595 </sequence>
1578 1596 </normal_column>
1579 1597 <normal_column>
1580   - <word_id>51</word_id>
  1598 + <word_id>45</word_id>
1581 1599 <id>14</id>
1582 1600 <description></description>
1583 1601 <unique_key_name></unique_key_name>
... ... @@ -1608,70 +1626,6 @@
1608 1626 <decimal_size>0</decimal_size>
1609 1627 </sequence>
1610 1628 </normal_column>
1611   - <normal_column>
1612   - <word_id>61</word_id>
1613   - <id>15</id>
1614   - <description></description>
1615   - <unique_key_name></unique_key_name>
1616   - <logical_name></logical_name>
1617   - <physical_name></physical_name>
1618   - <type>text</type>
1619   - <constraint></constraint>
1620   - <default_value></default_value>
1621   - <auto_increment>false</auto_increment>
1622   - <foreign_key>false</foreign_key>
1623   - <not_null>false</not_null>
1624   - <primary_key>false</primary_key>
1625   - <unique_key>false</unique_key>
1626   - <character_set></character_set>
1627   - <collation></collation>
1628   - <sequence>
1629   - <name></name>
1630   - <schema></schema>
1631   - <increment></increment>
1632   - <min_value></min_value>
1633   - <max_value></max_value>
1634   - <start></start>
1635   - <cache></cache>
1636   - <cycle>false</cycle>
1637   - <order>false</order>
1638   - <description></description>
1639   - <data_type></data_type>
1640   - <decimal_size>0</decimal_size>
1641   - </sequence>
1642   - </normal_column>
1643   - <normal_column>
1644   - <word_id>52</word_id>
1645   - <id>16</id>
1646   - <description></description>
1647   - <unique_key_name></unique_key_name>
1648   - <logical_name></logical_name>
1649   - <physical_name></physical_name>
1650   - <type>text</type>
1651   - <constraint></constraint>
1652   - <default_value></default_value>
1653   - <auto_increment>false</auto_increment>
1654   - <foreign_key>false</foreign_key>
1655   - <not_null>false</not_null>
1656   - <primary_key>false</primary_key>
1657   - <unique_key>false</unique_key>
1658   - <character_set></character_set>
1659   - <collation></collation>
1660   - <sequence>
1661   - <name></name>
1662   - <schema></schema>
1663   - <increment></increment>
1664   - <min_value></min_value>
1665   - <max_value></max_value>
1666   - <start></start>
1667   - <cache></cache>
1668   - <cycle>false</cycle>
1669   - <order>false</order>
1670   - <description></description>
1671   - <data_type></data_type>
1672   - <decimal_size>0</decimal_size>
1673   - </sequence>
1674   - </normal_column>
1675 1629 </columns>
1676 1630 <indexes>
1677 1631 </indexes>
... ... @@ -1683,12 +1637,12 @@
1683 1637 </table>
1684 1638 <table>
1685 1639 <id>6</id>
1686   - <height>128</height>
1687   - <width>247</width>
  1640 + <height>317</height>
  1641 + <width>210</width>
1688 1642 <font_name>Ubuntu</font_name>
1689 1643 <font_size>9</font_size>
1690   - <x>673</x>
1691   - <y>-89</y>
  1644 + <x>1018</x>
  1645 + <y>-24</y>
1692 1646 <color>
1693 1647 <r>230</r>
1694 1648 <g>230</g>
... ... @@ -1696,8 +1650,8 @@
1696 1650 </color>
1697 1651 <connections>
1698 1652 <relation>
1699   - <id>0</id>
1700   - <source>9</source>
  1653 + <id>1</id>
  1654 + <source>5</source>
1701 1655 <target>6</target>
1702 1656 <child_cardinality>1..n</child_cardinality>
1703 1657 <parent_cardinality>1</parent_cardinality>
... ... @@ -1713,16 +1667,16 @@
1713 1667 <referenced_complex_unique_key>null</referenced_complex_unique_key>
1714 1668 </relation>
1715 1669 </connections>
1716   - <physical_name>i3geoestat_classificacao</physical_name>
1717   - <logical_name>i3geoestat_classificacao</logical_name>
1718   - <description>Lista de classificacoes de uma medida de variável</description>
  1670 + <physical_name>i3geoestat_classes</physical_name>
  1671 + <logical_name>i3geoestat_classes</logical_name>
  1672 + <description>Classes pertencentes a uma classificação</description>
1719 1673 <constraint></constraint>
1720 1674 <primary_key_name></primary_key_name>
1721 1675 <option></option>
1722 1676 <columns>
1723 1677 <normal_column>
1724   - <word_id>28</word_id>
1725   - <id>17</id>
  1678 + <word_id>27</word_id>
  1679 + <id>15</id>
1726 1680 <description></description>
1727 1681 <unique_key_name></unique_key_name>
1728 1682 <logical_name></logical_name>
... ... @@ -1753,8 +1707,8 @@
1753 1707 </sequence>
1754 1708 </normal_column>
1755 1709 <normal_column>
1756   - <word_id>39</word_id>
1757   - <id>18</id>
  1710 + <word_id>22</word_id>
  1711 + <id>16</id>
1758 1712 <description></description>
1759 1713 <unique_key_name></unique_key_name>
1760 1714 <logical_name></logical_name>
... ... @@ -1785,18 +1739,17 @@
1785 1739 </sequence>
1786 1740 </normal_column>
1787 1741 <normal_column>
1788   - <id>19</id>
1789   - <referenced_column>37</referenced_column>
1790   - <relation>0</relation>
  1742 + <word_id>60</word_id>
  1743 + <id>17</id>
1791 1744 <description></description>
1792 1745 <unique_key_name></unique_key_name>
1793 1746 <logical_name></logical_name>
1794 1747 <physical_name></physical_name>
1795   - <type>integer</type>
  1748 + <type>text</type>
1796 1749 <constraint></constraint>
1797 1750 <default_value></default_value>
1798 1751 <auto_increment>false</auto_increment>
1799   - <foreign_key>true</foreign_key>
  1752 + <foreign_key>false</foreign_key>
1800 1753 <not_null>false</not_null>
1801 1754 <primary_key>false</primary_key>
1802 1755 <unique_key>false</unique_key>
... ... @@ -1818,8 +1771,8 @@
1818 1771 </sequence>
1819 1772 </normal_column>
1820 1773 <normal_column>
1821   - <word_id>45</word_id>
1822   - <id>20</id>
  1774 + <word_id>63</word_id>
  1775 + <id>18</id>
1823 1776 <description></description>
1824 1777 <unique_key_name></unique_key_name>
1825 1778 <logical_name></logical_name>
... ... @@ -1849,69 +1802,21 @@
1849 1802 <decimal_size>0</decimal_size>
1850 1803 </sequence>
1851 1804 </normal_column>
1852   - </columns>
1853   - <indexes>
1854   - </indexes>
1855   - <complex_unique_key_list>
1856   - </complex_unique_key_list>
1857   - <table_properties>
1858   - <schema></schema>
1859   - </table_properties>
1860   - </table>
1861   - <table>
1862   - <id>7</id>
1863   - <height>317</height>
1864   - <width>210</width>
1865   - <font_name>Ubuntu</font_name>
1866   - <font_size>9</font_size>
1867   - <x>1018</x>
1868   - <y>-24</y>
1869   - <color>
1870   - <r>230</r>
1871   - <g>230</g>
1872   - <b>250</b>
1873   - </color>
1874   - <connections>
1875   - <relation>
1876   - <id>1</id>
1877   - <source>6</source>
1878   - <target>7</target>
1879   - <child_cardinality>1..n</child_cardinality>
1880   - <parent_cardinality>1</parent_cardinality>
1881   - <reference_for_pk>true</reference_for_pk>
1882   - <name></name>
1883   - <on_delete_action>RESTRICT</on_delete_action>
1884   - <on_update_action>RESTRICT</on_update_action>
1885   - <source_xp>-1</source_xp>
1886   - <source_yp>-1</source_yp>
1887   - <target_xp>-1</target_xp>
1888   - <target_yp>-1</target_yp>
1889   - <referenced_column>null</referenced_column>
1890   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
1891   - </relation>
1892   - </connections>
1893   - <physical_name>i3geoestat_classes</physical_name>
1894   - <logical_name>i3geoestat_classes</logical_name>
1895   - <description>Classes pertencentes a uma classificação</description>
1896   - <constraint></constraint>
1897   - <primary_key_name></primary_key_name>
1898   - <option></option>
1899   - <columns>
1900 1805 <normal_column>
1901   - <word_id>27</word_id>
1902   - <id>21</id>
  1806 + <word_id>62</word_id>
  1807 + <id>19</id>
1903 1808 <description></description>
1904 1809 <unique_key_name></unique_key_name>
1905 1810 <logical_name></logical_name>
1906 1811 <physical_name></physical_name>
1907   - <type>integer</type>
  1812 + <type>text</type>
1908 1813 <constraint></constraint>
1909 1814 <default_value></default_value>
1910   - <auto_increment>true</auto_increment>
  1815 + <auto_increment>false</auto_increment>
1911 1816 <foreign_key>false</foreign_key>
1912   - <not_null>true</not_null>
1913   - <primary_key>true</primary_key>
1914   - <unique_key>true</unique_key>
  1817 + <not_null>false</not_null>
  1818 + <primary_key>false</primary_key>
  1819 + <unique_key>false</unique_key>
1915 1820 <character_set></character_set>
1916 1821 <collation></collation>
1917 1822 <sequence>
... ... @@ -1930,8 +1835,8 @@
1930 1835 </sequence>
1931 1836 </normal_column>
1932 1837 <normal_column>
1933   - <word_id>22</word_id>
1934   - <id>22</id>
  1838 + <word_id>0</word_id>
  1839 + <id>20</id>
1935 1840 <description></description>
1936 1841 <unique_key_name></unique_key_name>
1937 1842 <logical_name></logical_name>
... ... @@ -1962,17 +1867,18 @@
1962 1867 </sequence>
1963 1868 </normal_column>
1964 1869 <normal_column>
1965   - <word_id>60</word_id>
1966   - <id>23</id>
  1870 + <id>21</id>
  1871 + <referenced_column>11</referenced_column>
  1872 + <relation>1</relation>
1967 1873 <description></description>
1968 1874 <unique_key_name></unique_key_name>
1969 1875 <logical_name></logical_name>
1970 1876 <physical_name></physical_name>
1971   - <type>text</type>
  1877 + <type>integer</type>
1972 1878 <constraint></constraint>
1973 1879 <default_value></default_value>
1974 1880 <auto_increment>false</auto_increment>
1975   - <foreign_key>false</foreign_key>
  1881 + <foreign_key>true</foreign_key>
1976 1882 <not_null>false</not_null>
1977 1883 <primary_key>false</primary_key>
1978 1884 <unique_key>false</unique_key>
... ... @@ -1994,8 +1900,8 @@
1994 1900 </sequence>
1995 1901 </normal_column>
1996 1902 <normal_column>
1997   - <word_id>63</word_id>
1998   - <id>24</id>
  1903 + <word_id>58</word_id>
  1904 + <id>22</id>
1999 1905 <description></description>
2000 1906 <unique_key_name></unique_key_name>
2001 1907 <logical_name></logical_name>
... ... @@ -2026,8 +1932,8 @@
2026 1932 </sequence>
2027 1933 </normal_column>
2028 1934 <normal_column>
2029   - <word_id>62</word_id>
2030   - <id>25</id>
  1935 + <word_id>54</word_id>
  1936 + <id>23</id>
2031 1937 <description></description>
2032 1938 <unique_key_name></unique_key_name>
2033 1939 <logical_name></logical_name>
... ... @@ -2058,8 +1964,8 @@
2058 1964 </sequence>
2059 1965 </normal_column>
2060 1966 <normal_column>
2061   - <word_id>0</word_id>
2062   - <id>26</id>
  1967 + <word_id>48</word_id>
  1968 + <id>24</id>
2063 1969 <description></description>
2064 1970 <unique_key_name></unique_key_name>
2065 1971 <logical_name></logical_name>
... ... @@ -2090,18 +1996,17 @@
2090 1996 </sequence>
2091 1997 </normal_column>
2092 1998 <normal_column>
2093   - <id>27</id>
2094   - <referenced_column>17</referenced_column>
2095   - <relation>1</relation>
  1999 + <word_id>47</word_id>
  2000 + <id>25</id>
2096 2001 <description></description>
2097 2002 <unique_key_name></unique_key_name>
2098 2003 <logical_name></logical_name>
2099 2004 <physical_name></physical_name>
2100   - <type>integer</type>
  2005 + <type>text</type>
2101 2006 <constraint></constraint>
2102 2007 <default_value></default_value>
2103 2008 <auto_increment>false</auto_increment>
2104   - <foreign_key>true</foreign_key>
  2009 + <foreign_key>false</foreign_key>
2105 2010 <not_null>false</not_null>
2106 2011 <primary_key>false</primary_key>
2107 2012 <unique_key>false</unique_key>
... ... @@ -2123,136 +2028,8 @@
2123 2028 </sequence>
2124 2029 </normal_column>
2125 2030 <normal_column>
2126   - <word_id>58</word_id>
2127   - <id>28</id>
2128   - <description></description>
2129   - <unique_key_name></unique_key_name>
2130   - <logical_name></logical_name>
2131   - <physical_name></physical_name>
2132   - <type>text</type>
2133   - <constraint></constraint>
2134   - <default_value></default_value>
2135   - <auto_increment>false</auto_increment>
2136   - <foreign_key>false</foreign_key>
2137   - <not_null>false</not_null>
2138   - <primary_key>false</primary_key>
2139   - <unique_key>false</unique_key>
2140   - <character_set></character_set>
2141   - <collation></collation>
2142   - <sequence>
2143   - <name></name>
2144   - <schema></schema>
2145   - <increment></increment>
2146   - <min_value></min_value>
2147   - <max_value></max_value>
2148   - <start></start>
2149   - <cache></cache>
2150   - <cycle>false</cycle>
2151   - <order>false</order>
2152   - <description></description>
2153   - <data_type></data_type>
2154   - <decimal_size>0</decimal_size>
2155   - </sequence>
2156   - </normal_column>
2157   - <normal_column>
2158   - <word_id>54</word_id>
2159   - <id>29</id>
2160   - <description></description>
2161   - <unique_key_name></unique_key_name>
2162   - <logical_name></logical_name>
2163   - <physical_name></physical_name>
2164   - <type>text</type>
2165   - <constraint></constraint>
2166   - <default_value></default_value>
2167   - <auto_increment>false</auto_increment>
2168   - <foreign_key>false</foreign_key>
2169   - <not_null>false</not_null>
2170   - <primary_key>false</primary_key>
2171   - <unique_key>false</unique_key>
2172   - <character_set></character_set>
2173   - <collation></collation>
2174   - <sequence>
2175   - <name></name>
2176   - <schema></schema>
2177   - <increment></increment>
2178   - <min_value></min_value>
2179   - <max_value></max_value>
2180   - <start></start>
2181   - <cache></cache>
2182   - <cycle>false</cycle>
2183   - <order>false</order>
2184   - <description></description>
2185   - <data_type></data_type>
2186   - <decimal_size>0</decimal_size>
2187   - </sequence>
2188   - </normal_column>
2189   - <normal_column>
2190   - <word_id>48</word_id>
2191   - <id>30</id>
2192   - <description></description>
2193   - <unique_key_name></unique_key_name>
2194   - <logical_name></logical_name>
2195   - <physical_name></physical_name>
2196   - <type>text</type>
2197   - <constraint></constraint>
2198   - <default_value></default_value>
2199   - <auto_increment>false</auto_increment>
2200   - <foreign_key>false</foreign_key>
2201   - <not_null>false</not_null>
2202   - <primary_key>false</primary_key>
2203   - <unique_key>false</unique_key>
2204   - <character_set></character_set>
2205   - <collation></collation>
2206   - <sequence>
2207   - <name></name>
2208   - <schema></schema>
2209   - <increment></increment>
2210   - <min_value></min_value>
2211   - <max_value></max_value>
2212   - <start></start>
2213   - <cache></cache>
2214   - <cycle>false</cycle>
2215   - <order>false</order>
2216   - <description></description>
2217   - <data_type></data_type>
2218   - <decimal_size>0</decimal_size>
2219   - </sequence>
2220   - </normal_column>
2221   - <normal_column>
2222   - <word_id>47</word_id>
2223   - <id>31</id>
2224   - <description></description>
2225   - <unique_key_name></unique_key_name>
2226   - <logical_name></logical_name>
2227   - <physical_name></physical_name>
2228   - <type>text</type>
2229   - <constraint></constraint>
2230   - <default_value></default_value>
2231   - <auto_increment>false</auto_increment>
2232   - <foreign_key>false</foreign_key>
2233   - <not_null>false</not_null>
2234   - <primary_key>false</primary_key>
2235   - <unique_key>false</unique_key>
2236   - <character_set></character_set>
2237   - <collation></collation>
2238   - <sequence>
2239   - <name></name>
2240   - <schema></schema>
2241   - <increment></increment>
2242   - <min_value></min_value>
2243   - <max_value></max_value>
2244   - <start></start>
2245   - <cache></cache>
2246   - <cycle>false</cycle>
2247   - <order>false</order>
2248   - <description></description>
2249   - <data_type></data_type>
2250   - <decimal_size>0</decimal_size>
2251   - </sequence>
2252   - </normal_column>
2253   - <normal_column>
2254   - <word_id>44</word_id>
2255   - <id>32</id>
  2031 + <word_id>44</word_id>
  2032 + <id>26</id>
2256 2033 <description></description>
2257 2034 <unique_key_name></unique_key_name>
2258 2035 <logical_name></logical_name>
... ... @@ -2284,7 +2061,7 @@
2284 2061 </normal_column>
2285 2062 <normal_column>
2286 2063 <word_id>46</word_id>
2287   - <id>33</id>
  2064 + <id>27</id>
2288 2065 <description></description>
2289 2066 <unique_key_name></unique_key_name>
2290 2067 <logical_name></logical_name>
... ... @@ -2324,7 +2101,7 @@
2324 2101 </table_properties>
2325 2102 </table>
2326 2103 <table>
2327   - <id>8</id>
  2104 + <id>7</id>
2328 2105 <height>107</height>
2329 2106 <width>228</width>
2330 2107 <font_name>Ubuntu</font_name>
... ... @@ -2347,7 +2124,7 @@
2347 2124 <columns>
2348 2125 <normal_column>
2349 2126 <word_id>29</word_id>
2350   - <id>34</id>
  2127 + <id>28</id>
2351 2128 <description></description>
2352 2129 <unique_key_name></unique_key_name>
2353 2130 <logical_name></logical_name>
... ... @@ -2379,7 +2156,7 @@
2379 2156 </normal_column>
2380 2157 <normal_column>
2381 2158 <word_id>59</word_id>
2382   - <id>35</id>
  2159 + <id>29</id>
2383 2160 <description></description>
2384 2161 <unique_key_name></unique_key_name>
2385 2162 <logical_name></logical_name>
... ... @@ -2410,8 +2187,8 @@
2410 2187 </sequence>
2411 2188 </normal_column>
2412 2189 <normal_column>
2413   - <word_id>34</word_id>
2414   - <id>36</id>
  2190 + <word_id>35</word_id>
  2191 + <id>30</id>
2415 2192 <description></description>
2416 2193 <unique_key_name></unique_key_name>
2417 2194 <logical_name></logical_name>
... ... @@ -2451,7 +2228,7 @@
2451 2228 </table_properties>
2452 2229 </table>
2453 2230 <table>
2454   - <id>9</id>
  2231 + <id>8</id>
2455 2232 <height>339</height>
2456 2233 <width>292</width>
2457 2234 <font_name>Ubuntu</font_name>
... ... @@ -2466,8 +2243,8 @@
2466 2243 <connections>
2467 2244 <relation>
2468 2245 <id>2</id>
2469   - <source>13</source>
2470   - <target>9</target>
  2246 + <source>4</source>
  2247 + <target>8</target>
2471 2248 <child_cardinality>1..n</child_cardinality>
2472 2249 <parent_cardinality>1</parent_cardinality>
2473 2250 <reference_for_pk>true</reference_for_pk>
... ... @@ -2484,7 +2261,7 @@
2484 2261 <relation>
2485 2262 <id>3</id>
2486 2263 <source>3</source>
2487   - <target>9</target>
  2264 + <target>8</target>
2488 2265 <child_cardinality>1..n</child_cardinality>
2489 2266 <parent_cardinality>1</parent_cardinality>
2490 2267 <reference_for_pk>true</reference_for_pk>
... ... @@ -2500,8 +2277,8 @@
2500 2277 </relation>
2501 2278 <relation>
2502 2279 <id>4</id>
2503   - <source>4</source>
2504   - <target>9</target>
  2280 + <source>14</source>
  2281 + <target>8</target>
2505 2282 <child_cardinality>1..n</child_cardinality>
2506 2283 <parent_cardinality>1</parent_cardinality>
2507 2284 <reference_for_pk>true</reference_for_pk>
... ... @@ -2517,8 +2294,8 @@
2517 2294 </relation>
2518 2295 <relation>
2519 2296 <id>5</id>
2520   - <source>5</source>
2521   - <target>9</target>
  2297 + <source>12</source>
  2298 + <target>8</target>
2522 2299 <child_cardinality>1..n</child_cardinality>
2523 2300 <parent_cardinality>1</parent_cardinality>
2524 2301 <reference_for_pk>true</reference_for_pk>
... ... @@ -2535,7 +2312,7 @@
2535 2312 <relation>
2536 2313 <id>6</id>
2537 2314 <source>2</source>
2538   - <target>9</target>
  2315 + <target>8</target>
2539 2316 <child_cardinality>1..n</child_cardinality>
2540 2317 <parent_cardinality>1</parent_cardinality>
2541 2318 <reference_for_pk>true</reference_for_pk>
... ... @@ -2559,7 +2336,7 @@
2559 2336 <columns>
2560 2337 <normal_column>
2561 2338 <word_id>31</word_id>
2562   - <id>37</id>
  2339 + <id>31</id>
2563 2340 <description></description>
2564 2341 <unique_key_name></unique_key_name>
2565 2342 <logical_name></logical_name>
... ... @@ -2590,7 +2367,7 @@
2590 2367 </sequence>
2591 2368 </normal_column>
2592 2369 <normal_column>
2593   - <id>38</id>
  2370 + <id>32</id>
2594 2371 <referenced_column>0</referenced_column>
2595 2372 <relation>6</relation>
2596 2373 <description></description>
... ... @@ -2623,7 +2400,7 @@
2623 2400 </sequence>
2624 2401 </normal_column>
2625 2402 <normal_column>
2626   - <id>39</id>
  2403 + <id>33</id>
2627 2404 <referenced_column>5</referenced_column>
2628 2405 <relation>3</relation>
2629 2406 <description></description>
... ... @@ -2656,9 +2433,9 @@
2656 2433 </sequence>
2657 2434 </normal_column>
2658 2435 <normal_column>
2659   - <id>40</id>
  2436 + <id>34</id>
2660 2437 <referenced_column>8</referenced_column>
2661   - <relation>4</relation>
  2438 + <relation>2</relation>
2662 2439 <description></description>
2663 2440 <unique_key_name></unique_key_name>
2664 2441 <logical_name></logical_name>
... ... @@ -2689,9 +2466,9 @@
2689 2466 </sequence>
2690 2467 </normal_column>
2691 2468 <normal_column>
2692   - <id>41</id>
2693   - <referenced_column>61</referenced_column>
2694   - <relation>2</relation>
  2469 + <id>35</id>
  2470 + <referenced_column>55</referenced_column>
  2471 + <relation>5</relation>
2695 2472 <description></description>
2696 2473 <unique_key_name></unique_key_name>
2697 2474 <logical_name></logical_name>
... ... @@ -2722,9 +2499,9 @@
2722 2499 </sequence>
2723 2500 </normal_column>
2724 2501 <normal_column>
2725   - <id>42</id>
2726   - <referenced_column>11</referenced_column>
2727   - <relation>5</relation>
  2502 + <id>36</id>
  2503 + <referenced_column>71</referenced_column>
  2504 + <relation>4</relation>
2728 2505 <description></description>
2729 2506 <unique_key_name></unique_key_name>
2730 2507 <logical_name></logical_name>
... ... @@ -2756,7 +2533,7 @@
2756 2533 </normal_column>
2757 2534 <normal_column>
2758 2535 <word_id>20</word_id>
2759   - <id>43</id>
  2536 + <id>37</id>
2760 2537 <description></description>
2761 2538 <unique_key_name></unique_key_name>
2762 2539 <logical_name></logical_name>
... ... @@ -2788,7 +2565,7 @@
2788 2565 </normal_column>
2789 2566 <normal_column>
2790 2567 <word_id>56</word_id>
2791   - <id>44</id>
  2568 + <id>38</id>
2792 2569 <description></description>
2793 2570 <unique_key_name></unique_key_name>
2794 2571 <logical_name></logical_name>
... ... @@ -2820,7 +2597,7 @@
2820 2597 </normal_column>
2821 2598 <normal_column>
2822 2599 <word_id>14</word_id>
2823   - <id>45</id>
  2600 + <id>39</id>
2824 2601 <description></description>
2825 2602 <unique_key_name></unique_key_name>
2826 2603 <logical_name></logical_name>
... ... @@ -2852,7 +2629,7 @@
2852 2629 </normal_column>
2853 2630 <normal_column>
2854 2631 <word_id>11</word_id>
2855   - <id>46</id>
  2632 + <id>40</id>
2856 2633 <description></description>
2857 2634 <unique_key_name></unique_key_name>
2858 2635 <logical_name></logical_name>
... ... @@ -2884,7 +2661,7 @@
2884 2661 </normal_column>
2885 2662 <normal_column>
2886 2663 <word_id>23</word_id>
2887   - <id>47</id>
  2664 + <id>41</id>
2888 2665 <description></description>
2889 2666 <unique_key_name></unique_key_name>
2890 2667 <logical_name></logical_name>
... ... @@ -2916,7 +2693,7 @@
2916 2693 </normal_column>
2917 2694 <normal_column>
2918 2695 <word_id>42</word_id>
2919   - <id>48</id>
  2696 + <id>42</id>
2920 2697 <description></description>
2921 2698 <unique_key_name></unique_key_name>
2922 2699 <logical_name></logical_name>
... ... @@ -2956,7 +2733,7 @@
2956 2733 </table_properties>
2957 2734 </table>
2958 2735 <table>
2959   - <id>10</id>
  2736 + <id>9</id>
2960 2737 <height>128</height>
2961 2738 <width>269</width>
2962 2739 <font_name>Ubuntu</font_name>
... ... @@ -2971,8 +2748,8 @@
2971 2748 <connections>
2972 2749 <relation>
2973 2750 <id>7</id>
2974   - <source>9</source>
2975   - <target>10</target>
  2751 + <source>8</source>
  2752 + <target>9</target>
2976 2753 <child_cardinality>1..n</child_cardinality>
2977 2754 <parent_cardinality>1</parent_cardinality>
2978 2755 <reference_for_pk>true</reference_for_pk>
... ... @@ -2995,8 +2772,8 @@
2995 2772 <option></option>
2996 2773 <columns>
2997 2774 <normal_column>
2998   - <word_id>35</word_id>
2999   - <id>49</id>
  2775 + <word_id>34</word_id>
  2776 + <id>43</id>
3000 2777 <description></description>
3001 2778 <unique_key_name></unique_key_name>
3002 2779 <logical_name></logical_name>
... ... @@ -3027,8 +2804,8 @@
3027 2804 </sequence>
3028 2805 </normal_column>
3029 2806 <normal_column>
3030   - <id>50</id>
3031   - <referenced_column>37</referenced_column>
  2807 + <id>44</id>
  2808 + <referenced_column>31</referenced_column>
3032 2809 <relation>7</relation>
3033 2810 <description></description>
3034 2811 <unique_key_name></unique_key_name>
... ... @@ -3060,8 +2837,8 @@
3060 2837 </sequence>
3061 2838 </normal_column>
3062 2839 <normal_column>
3063   - <word_id>40</word_id>
3064   - <id>51</id>
  2840 + <word_id>39</word_id>
  2841 + <id>45</id>
3065 2842 <description></description>
3066 2843 <unique_key_name></unique_key_name>
3067 2844 <logical_name></logical_name>
... ... @@ -3093,7 +2870,7 @@
3093 2870 </normal_column>
3094 2871 <normal_column>
3095 2872 <word_id>30</word_id>
3096   - <id>52</id>
  2873 + <id>46</id>
3097 2874 <description></description>
3098 2875 <unique_key_name></unique_key_name>
3099 2876 <logical_name></logical_name>
... ... @@ -3133,7 +2910,7 @@
3133 2910 </table_properties>
3134 2911 </table>
3135 2912 <table>
3136   - <id>11</id>
  2913 + <id>10</id>
3137 2914 <height>86</height>
3138 2915 <width>269</width>
3139 2916 <font_name>Ubuntu</font_name>
... ... @@ -3149,7 +2926,7 @@
3149 2926 <relation>
3150 2927 <id>8</id>
3151 2928 <source>8</source>
3152   - <target>11</target>
  2929 + <target>10</target>
3153 2930 <child_cardinality>1..n</child_cardinality>
3154 2931 <parent_cardinality>1</parent_cardinality>
3155 2932 <reference_for_pk>true</reference_for_pk>
... ... @@ -3165,8 +2942,8 @@
3165 2942 </relation>
3166 2943 <relation>
3167 2944 <id>9</id>
3168   - <source>9</source>
3169   - <target>11</target>
  2945 + <source>7</source>
  2946 + <target>10</target>
3170 2947 <child_cardinality>1..n</child_cardinality>
3171 2948 <parent_cardinality>1</parent_cardinality>
3172 2949 <reference_for_pk>true</reference_for_pk>
... ... @@ -3189,9 +2966,9 @@
3189 2966 <option></option>
3190 2967 <columns>
3191 2968 <normal_column>
3192   - <id>53</id>
3193   - <referenced_column>37</referenced_column>
3194   - <relation>9</relation>
  2969 + <id>47</id>
  2970 + <referenced_column>31</referenced_column>
  2971 + <relation>8</relation>
3195 2972 <description></description>
3196 2973 <unique_key_name></unique_key_name>
3197 2974 <logical_name></logical_name>
... ... @@ -3222,9 +2999,9 @@
3222 2999 </sequence>
3223 3000 </normal_column>
3224 3001 <normal_column>
3225   - <id>54</id>
3226   - <referenced_column>34</referenced_column>
3227   - <relation>8</relation>
  3002 + <id>48</id>
  3003 + <referenced_column>28</referenced_column>
  3004 + <relation>9</relation>
3228 3005 <description></description>
3229 3006 <unique_key_name></unique_key_name>
3230 3007 <logical_name></logical_name>
... ... @@ -3264,7 +3041,7 @@
3264 3041 </table_properties>
3265 3042 </table>
3266 3043 <table>
3267   - <id>12</id>
  3044 + <id>11</id>
3268 3045 <height>170</height>
3269 3046 <width>292</width>
3270 3047 <font_name>Ubuntu</font_name>
... ... @@ -3279,8 +3056,8 @@
3279 3056 <connections>
3280 3057 <relation>
3281 3058 <id>10</id>
3282   - <source>9</source>
3283   - <target>12</target>
  3059 + <source>8</source>
  3060 + <target>11</target>
3284 3061 <child_cardinality>1..n</child_cardinality>
3285 3062 <parent_cardinality>1</parent_cardinality>
3286 3063 <reference_for_pk>true</reference_for_pk>
... ... @@ -3304,7 +3081,7 @@
3304 3081 <columns>
3305 3082 <normal_column>
3306 3083 <word_id>33</word_id>
3307   - <id>55</id>
  3084 + <id>49</id>
3308 3085 <description></description>
3309 3086 <unique_key_name></unique_key_name>
3310 3087 <logical_name></logical_name>
... ... @@ -3336,7 +3113,7 @@
3336 3113 </normal_column>
3337 3114 <normal_column>
3338 3115 <word_id>8</word_id>
3339   - <id>56</id>
  3116 + <id>50</id>
3340 3117 <description></description>
3341 3118 <unique_key_name></unique_key_name>
3342 3119 <logical_name></logical_name>
... ... @@ -3367,8 +3144,8 @@
3367 3144 </sequence>
3368 3145 </normal_column>
3369 3146 <normal_column>
3370   - <word_id>36</word_id>
3371   - <id>57</id>
  3147 + <word_id>38</word_id>
  3148 + <id>51</id>
3372 3149 <description></description>
3373 3150 <unique_key_name></unique_key_name>
3374 3151 <logical_name></logical_name>
... ... @@ -3399,8 +3176,8 @@
3399 3176 </sequence>
3400 3177 </normal_column>
3401 3178 <normal_column>
3402   - <word_id>16</word_id>
3403   - <id>58</id>
  3179 + <word_id>17</word_id>
  3180 + <id>52</id>
3404 3181 <description></description>
3405 3182 <unique_key_name></unique_key_name>
3406 3183 <logical_name></logical_name>
... ... @@ -3432,7 +3209,7 @@
3432 3209 </normal_column>
3433 3210 <normal_column>
3434 3211 <word_id>32</word_id>
3435   - <id>59</id>
  3212 + <id>53</id>
3436 3213 <description></description>
3437 3214 <unique_key_name></unique_key_name>
3438 3215 <logical_name></logical_name>
... ... @@ -3463,8 +3240,8 @@
3463 3240 </sequence>
3464 3241 </normal_column>
3465 3242 <normal_column>
3466   - <id>60</id>
3467   - <referenced_column>37</referenced_column>
  3243 + <id>54</id>
  3244 + <referenced_column>31</referenced_column>
3468 3245 <relation>10</relation>
3469 3246 <description></description>
3470 3247 <unique_key_name></unique_key_name>
... ... @@ -3505,7 +3282,7 @@
3505 3282 </table_properties>
3506 3283 </table>
3507 3284 <table>
3508   - <id>13</id>
  3285 + <id>12</id>
3509 3286 <height>275</height>
3510 3287 <width>292</width>
3511 3288 <font_name>Ubuntu</font_name>
... ... @@ -3520,8 +3297,8 @@
3520 3297 <connections>
3521 3298 <relation>
3522 3299 <id>11</id>
3523   - <source>5</source>
3524   - <target>13</target>
  3300 + <source>14</source>
  3301 + <target>12</target>
3525 3302 <child_cardinality>1..n</child_cardinality>
3526 3303 <parent_cardinality>1</parent_cardinality>
3527 3304 <reference_for_pk>true</reference_for_pk>
... ... @@ -3545,7 +3322,7 @@
3545 3322 <columns>
3546 3323 <normal_column>
3547 3324 <word_id>4</word_id>
3548   - <id>61</id>
  3325 + <id>55</id>
3549 3326 <description></description>
3550 3327 <unique_key_name></unique_key_name>
3551 3328 <logical_name></logical_name>
... ... @@ -3577,7 +3354,7 @@
3577 3354 </normal_column>
3578 3355 <normal_column>
3579 3356 <word_id>43</word_id>
3580   - <id>62</id>
  3357 + <id>56</id>
3581 3358 <description></description>
3582 3359 <unique_key_name></unique_key_name>
3583 3360 <logical_name></logical_name>
... ... @@ -3609,7 +3386,7 @@
3609 3386 </normal_column>
3610 3387 <normal_column>
3611 3388 <word_id>19</word_id>
3612   - <id>63</id>
  3389 + <id>57</id>
3613 3390 <description></description>
3614 3391 <unique_key_name></unique_key_name>
3615 3392 <logical_name></logical_name>
... ... @@ -3640,8 +3417,8 @@
3640 3417 </sequence>
3641 3418 </normal_column>
3642 3419 <normal_column>
3643   - <id>64</id>
3644   - <referenced_column>11</referenced_column>
  3420 + <id>58</id>
  3421 + <referenced_column>71</referenced_column>
3645 3422 <relation>11</relation>
3646 3423 <description></description>
3647 3424 <unique_key_name></unique_key_name>
... ... @@ -3674,7 +3451,7 @@
3674 3451 </normal_column>
3675 3452 <normal_column>
3676 3453 <word_id>21</word_id>
3677   - <id>65</id>
  3454 + <id>59</id>
3678 3455 <description></description>
3679 3456 <unique_key_name></unique_key_name>
3680 3457 <logical_name></logical_name>
... ... @@ -3706,7 +3483,7 @@
3706 3483 </normal_column>
3707 3484 <normal_column>
3708 3485 <word_id>57</word_id>
3709   - <id>66</id>
  3486 + <id>60</id>
3710 3487 <description></description>
3711 3488 <unique_key_name></unique_key_name>
3712 3489 <logical_name></logical_name>
... ... @@ -3738,7 +3515,7 @@
3738 3515 </normal_column>
3739 3516 <normal_column>
3740 3517 <word_id>10</word_id>
3741   - <id>67</id>
  3518 + <id>61</id>
3742 3519 <description></description>
3743 3520 <unique_key_name></unique_key_name>
3744 3521 <logical_name></logical_name>
... ... @@ -3770,7 +3547,7 @@
3770 3547 </normal_column>
3771 3548 <normal_column>
3772 3549 <word_id>15</word_id>
3773   - <id>68</id>
  3550 + <id>62</id>
3774 3551 <description></description>
3775 3552 <unique_key_name></unique_key_name>
3776 3553 <logical_name></logical_name>
... ... @@ -3802,7 +3579,7 @@
3802 3579 </normal_column>
3803 3580 <normal_column>
3804 3581 <word_id>25</word_id>
3805   - <id>69</id>
  3582 + <id>63</id>
3806 3583 <description></description>
3807 3584 <unique_key_name></unique_key_name>
3808 3585 <logical_name></logical_name>
... ... @@ -3834,7 +3611,7 @@
3834 3611 </normal_column>
3835 3612 <normal_column>
3836 3613 <word_id>13</word_id>
3837   - <id>70</id>
  3614 + <id>64</id>
3838 3615 <description></description>
3839 3616 <unique_key_name></unique_key_name>
3840 3617 <logical_name></logical_name>
... ... @@ -3866,7 +3643,7 @@
3866 3643 </normal_column>
3867 3644 <normal_column>
3868 3645 <word_id>55</word_id>
3869   - <id>71</id>
  3646 + <id>65</id>
3870 3647 <description></description>
3871 3648 <unique_key_name></unique_key_name>
3872 3649 <logical_name></logical_name>
... ... @@ -3898,7 +3675,7 @@
3898 3675 </normal_column>
3899 3676 <normal_column>
3900 3677 <word_id>9</word_id>
3901   - <id>72</id>
  3678 + <id>66</id>
3902 3679 <description></description>
3903 3680 <unique_key_name></unique_key_name>
3904 3681 <logical_name></logical_name>
... ... @@ -3938,7 +3715,7 @@
3938 3715 </table_properties>
3939 3716 </table>
3940 3717 <table>
3941   - <id>14</id>
  3718 + <id>13</id>
3942 3719 <height>128</height>
3943 3720 <width>270</width>
3944 3721 <font_name>Ubuntu</font_name>
... ... @@ -3953,8 +3730,8 @@
3953 3730 <connections>
3954 3731 <relation>
3955 3732 <id>12</id>
3956   - <source>13</source>
3957   - <target>14</target>
  3733 + <source>12</source>
  3734 + <target>13</target>
3958 3735 <child_cardinality>1..n</child_cardinality>
3959 3736 <parent_cardinality>1</parent_cardinality>
3960 3737 <reference_for_pk>true</reference_for_pk>
... ... @@ -3978,7 +3755,7 @@
3978 3755 <columns>
3979 3756 <normal_column>
3980 3757 <word_id>26</word_id>
3981   - <id>73</id>
  3758 + <id>67</id>
3982 3759 <description></description>
3983 3760 <unique_key_name></unique_key_name>
3984 3761 <logical_name></logical_name>
... ... @@ -4009,8 +3786,8 @@
4009 3786 </sequence>
4010 3787 </normal_column>
4011 3788 <normal_column>
4012   - <id>74</id>
4013   - <referenced_column>61</referenced_column>
  3789 + <id>68</id>
  3790 + <referenced_column>55</referenced_column>
4014 3791 <relation>12</relation>
4015 3792 <description></description>
4016 3793 <unique_key_name></unique_key_name>
... ... @@ -4043,7 +3820,7 @@
4043 3820 </normal_column>
4044 3821 <normal_column>
4045 3822 <word_id>5</word_id>
4046   - <id>75</id>
  3823 + <id>69</id>
4047 3824 <description></description>
4048 3825 <unique_key_name></unique_key_name>
4049 3826 <logical_name></logical_name>
... ... @@ -4075,6 +3852,229 @@
4075 3852 </normal_column>
4076 3853 <normal_column>
4077 3854 <word_id>12</word_id>
  3855 + <id>70</id>
  3856 + <description></description>
  3857 + <unique_key_name></unique_key_name>
  3858 + <logical_name></logical_name>
  3859 + <physical_name></physical_name>
  3860 + <type>text</type>
  3861 + <constraint></constraint>
  3862 + <default_value></default_value>
  3863 + <auto_increment>false</auto_increment>
  3864 + <foreign_key>false</foreign_key>
  3865 + <not_null>false</not_null>
  3866 + <primary_key>false</primary_key>
  3867 + <unique_key>false</unique_key>
  3868 + <character_set></character_set>
  3869 + <collation></collation>
  3870 + <sequence>
  3871 + <name></name>
  3872 + <schema></schema>
  3873 + <increment></increment>
  3874 + <min_value></min_value>
  3875 + <max_value></max_value>
  3876 + <start></start>
  3877 + <cache></cache>
  3878 + <cycle>false</cycle>
  3879 + <order>false</order>
  3880 + <description></description>
  3881 + <data_type></data_type>
  3882 + <decimal_size>0</decimal_size>
  3883 + </sequence>
  3884 + </normal_column>
  3885 + </columns>
  3886 + <indexes>
  3887 + </indexes>
  3888 + <complex_unique_key_list>
  3889 + </complex_unique_key_list>
  3890 + <table_properties>
  3891 + <schema></schema>
  3892 + </table_properties>
  3893 + </table>
  3894 + <table>
  3895 + <id>14</id>
  3896 + <height>170</height>
  3897 + <width>292</width>
  3898 + <font_name>Ubuntu</font_name>
  3899 + <font_size>9</font_size>
  3900 + <x>8</x>
  3901 + <y>499</y>
  3902 + <color>
  3903 + <r>255</r>
  3904 + <g>165</g>
  3905 + <b>0</b>
  3906 + </color>
  3907 + <connections>
  3908 + </connections>
  3909 + <physical_name>i3geoestat_conexao</physical_name>
  3910 + <logical_name>i3geoestat_conexao</logical_name>
  3911 + <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>
  3912 + <constraint></constraint>
  3913 + <primary_key_name></primary_key_name>
  3914 + <option></option>
  3915 + <columns>
  3916 + <normal_column>
  3917 + <word_id>2</word_id>
  3918 + <id>71</id>
  3919 + <description></description>
  3920 + <unique_key_name></unique_key_name>
  3921 + <logical_name></logical_name>
  3922 + <physical_name></physical_name>
  3923 + <type>integer</type>
  3924 + <constraint></constraint>
  3925 + <default_value></default_value>
  3926 + <auto_increment>true</auto_increment>
  3927 + <foreign_key>false</foreign_key>
  3928 + <not_null>true</not_null>
  3929 + <primary_key>true</primary_key>
  3930 + <unique_key>true</unique_key>
  3931 + <character_set></character_set>
  3932 + <collation></collation>
  3933 + <sequence>
  3934 + <name></name>
  3935 + <schema></schema>
  3936 + <increment></increment>
  3937 + <min_value></min_value>
  3938 + <max_value></max_value>
  3939 + <start></start>
  3940 + <cache></cache>
  3941 + <cycle>false</cycle>
  3942 + <order>false</order>
  3943 + <description></description>
  3944 + <data_type></data_type>
  3945 + <decimal_size>0</decimal_size>
  3946 + </sequence>
  3947 + </normal_column>
  3948 + <normal_column>
  3949 + <word_id>1</word_id>
  3950 + <id>72</id>
  3951 + <description></description>
  3952 + <unique_key_name></unique_key_name>
  3953 + <logical_name></logical_name>
  3954 + <physical_name></physical_name>
  3955 + <type>text</type>
  3956 + <constraint></constraint>
  3957 + <default_value></default_value>
  3958 + <auto_increment>false</auto_increment>
  3959 + <foreign_key>false</foreign_key>
  3960 + <not_null>false</not_null>
  3961 + <primary_key>false</primary_key>
  3962 + <unique_key>false</unique_key>
  3963 + <character_set></character_set>
  3964 + <collation></collation>
  3965 + <sequence>
  3966 + <name></name>
  3967 + <schema></schema>
  3968 + <increment></increment>
  3969 + <min_value></min_value>
  3970 + <max_value></max_value>
  3971 + <start></start>
  3972 + <cache></cache>
  3973 + <cycle>false</cycle>
  3974 + <order>false</order>
  3975 + <description></description>
  3976 + <data_type></data_type>
  3977 + <decimal_size>0</decimal_size>
  3978 + </sequence>
  3979 + </normal_column>
  3980 + <normal_column>
  3981 + <word_id>24</word_id>
  3982 + <id>73</id>
  3983 + <description></description>
  3984 + <unique_key_name></unique_key_name>
  3985 + <logical_name></logical_name>
  3986 + <physical_name></physical_name>
  3987 + <type>text</type>
  3988 + <constraint></constraint>
  3989 + <default_value></default_value>
  3990 + <auto_increment>false</auto_increment>
  3991 + <foreign_key>false</foreign_key>
  3992 + <not_null>false</not_null>
  3993 + <primary_key>false</primary_key>
  3994 + <unique_key>false</unique_key>
  3995 + <character_set></character_set>
  3996 + <collation></collation>
  3997 + <sequence>
  3998 + <name></name>
  3999 + <schema></schema>
  4000 + <increment></increment>
  4001 + <min_value></min_value>
  4002 + <max_value></max_value>
  4003 + <start></start>
  4004 + <cache></cache>
  4005 + <cycle>false</cycle>
  4006 + <order>false</order>
  4007 + <description></description>
  4008 + <data_type></data_type>
  4009 + <decimal_size>0</decimal_size>
  4010 + </sequence>
  4011 + </normal_column>
  4012 + <normal_column>
  4013 + <word_id>51</word_id>
  4014 + <id>74</id>
  4015 + <description></description>
  4016 + <unique_key_name></unique_key_name>
  4017 + <logical_name></logical_name>
  4018 + <physical_name></physical_name>
  4019 + <type>text</type>
  4020 + <constraint></constraint>
  4021 + <default_value></default_value>
  4022 + <auto_increment>false</auto_increment>
  4023 + <foreign_key>false</foreign_key>
  4024 + <not_null>false</not_null>
  4025 + <primary_key>false</primary_key>
  4026 + <unique_key>false</unique_key>
  4027 + <character_set></character_set>
  4028 + <collation></collation>
  4029 + <sequence>
  4030 + <name></name>
  4031 + <schema></schema>
  4032 + <increment></increment>
  4033 + <min_value></min_value>
  4034 + <max_value></max_value>
  4035 + <start></start>
  4036 + <cache></cache>
  4037 + <cycle>false</cycle>
  4038 + <order>false</order>
  4039 + <description></description>
  4040 + <data_type></data_type>
  4041 + <decimal_size>0</decimal_size>
  4042 + </sequence>
  4043 + </normal_column>
  4044 + <normal_column>
  4045 + <word_id>61</word_id>
  4046 + <id>75</id>
  4047 + <description></description>
  4048 + <unique_key_name></unique_key_name>
  4049 + <logical_name></logical_name>
  4050 + <physical_name></physical_name>
  4051 + <type>text</type>
  4052 + <constraint></constraint>
  4053 + <default_value></default_value>
  4054 + <auto_increment>false</auto_increment>
  4055 + <foreign_key>false</foreign_key>
  4056 + <not_null>false</not_null>
  4057 + <primary_key>false</primary_key>
  4058 + <unique_key>false</unique_key>
  4059 + <character_set></character_set>
  4060 + <collation></collation>
  4061 + <sequence>
  4062 + <name></name>
  4063 + <schema></schema>
  4064 + <increment></increment>
  4065 + <min_value></min_value>
  4066 + <max_value></max_value>
  4067 + <start></start>
  4068 + <cache></cache>
  4069 + <cycle>false</cycle>
  4070 + <order>false</order>
  4071 + <description></description>
  4072 + <data_type></data_type>
  4073 + <decimal_size>0</decimal_size>
  4074 + </sequence>
  4075 + </normal_column>
  4076 + <normal_column>
  4077 + <word_id>52</word_id>
4078 4078 <id>76</id>
4079 4079 <description></description>
4080 4080 <unique_key_name></unique_key_name>
... ... @@ -4122,40 +4122,66 @@
4122 4122 <name>metaestat_basededados</name>
4123 4123 <export_order>0</export_order>
4124 4124 <table_test_data>
4125   - <table_id>5</table_id>
  4125 + <table_id>14</table_id>
4126 4126 <direct_test_data>
4127 4127 <data>
4128 4128 <column_data>
4129   - <column_id>11</column_id>
  4129 + <column_id>71</column_id>
4130 4130 <value>1</value>
4131 4131 </column_data>
4132 4132 <column_data>
4133   - <column_id>12</column_id>
  4133 + <column_id>72</column_id>
4134 4134 <value>dbspo</value>
4135 4135 </column_data>
4136 4136 <column_data>
4137   - <column_id>13</column_id>
  4137 + <column_id>73</column_id>
4138 4138 <value>localhost</value>
4139 4139 </column_data>
4140 4140 <column_data>
4141   - <column_id>14</column_id>
  4141 + <column_id>74</column_id>
4142 4142 <value>5432</value>
4143 4143 </column_data>
4144 4144 <column_data>
4145   - <column_id>15</column_id>
  4145 + <column_id>75</column_id>
4146 4146 <value>postgres</value>
4147 4147 </column_data>
4148 4148 <column_data>
4149   - <column_id>16</column_id>
  4149 + <column_id>76</column_id>
4150 4150 <value>postgres</value>
4151 4151 </column_data>
4152 4152 </data>
  4153 + <data>
  4154 + <column_data>
  4155 + <column_id>71</column_id>
  4156 + <value>0</value>
  4157 + </column_data>
  4158 + <column_data>
  4159 + <column_id>72</column_id>
  4160 + <value>default</value>
  4161 + </column_data>
  4162 + <column_data>
  4163 + <column_id>73</column_id>
  4164 + <value></value>
  4165 + </column_data>
  4166 + <column_data>
  4167 + <column_id>74</column_id>
  4168 + <value></value>
  4169 + </column_data>
  4170 + <column_data>
  4171 + <column_id>75</column_id>
  4172 + <value></value>
  4173 + </column_data>
  4174 + <column_data>
  4175 + <column_id>76</column_id>
  4176 + <value></value>
  4177 + </column_data>
  4178 + </data>
4153 4179 </direct_test_data>
4154 4180 <repeat_test_data>
4155 4181 <test_data_num>0</test_data_num>
4156 4182 <data_def_list>
4157 4183 <data_def>
4158   - <column_id>11</column_id>
  4184 + <column_id>71</column_id>
4159 4185 <type>Format</type>
4160 4186 <repeat_num>1</repeat_num>
4161 4187 <template>%</template>
... ... @@ -4170,7 +4196,7 @@
4170 4196 </modified_values>
4171 4197 </data_def>
4172 4198 <data_def>
4173   - <column_id>12</column_id>
  4199 + <column_id>72</column_id>
4174 4200 <type>Format</type>
4175 4201 <repeat_num>1</repeat_num>
4176 4202 <template>database%</template>
... ... @@ -4185,7 +4211,7 @@
4185 4211 </modified_values>
4186 4212 </data_def>
4187 4213 <data_def>
4188   - <column_id>13</column_id>
  4214 + <column_id>73</column_id>
4189 4215 <type>Format</type>
4190 4216 <repeat_num>1</repeat_num>
4191 4217 <template>host%</template>
... ... @@ -4200,7 +4226,7 @@
4200 4226 </modified_values>
4201 4227 </data_def>
4202 4228 <data_def>
4203   - <column_id>14</column_id>
  4229 + <column_id>74</column_id>
4204 4230 <type>Format</type>
4205 4231 <repeat_num>1</repeat_num>
4206 4232 <template>porta%</template>
... ... @@ -4215,7 +4241,7 @@
4215 4241 </modified_values>
4216 4242 </data_def>
4217 4243 <data_def>
4218   - <column_id>15</column_id>
  4244 + <column_id>75</column_id>
4219 4245 <type>Format</type>
4220 4246 <repeat_num>1</repeat_num>
4221 4247 <template>usuario%</template>
... ... @@ -4230,7 +4256,7 @@
4230 4256 </modified_values>
4231 4257 </data_def>
4232 4258 <data_def>
4233   - <column_id>16</column_id>
  4259 + <column_id>76</column_id>
4234 4260 <type>Format</type>
4235 4261 <repeat_num>1</repeat_num>
4236 4262 <template>senha%</template>
... ... @@ -4331,105 +4357,105 @@
4331 4357 </repeat_test_data>
4332 4358 </table_test_data>
4333 4359 <table_test_data>
4334   - <table_id>13</table_id>
  4360 + <table_id>12</table_id>
4335 4361 <direct_test_data>
4336 4362 <data>
4337 4363 <column_data>
4338   - <column_id>61</column_id>
  4364 + <column_id>55</column_id>
4339 4365 <value>1</value>
4340 4366 </column_data>
4341 4367 <column_data>
4342   - <column_id>62</column_id>
  4368 + <column_id>56</column_id>
4343 4369 <value>Município</value>
4344 4370 </column_data>
4345 4371 <column_data>
4346   - <column_id>63</column_id>
  4372 + <column_id>57</column_id>
4347 4373 <value>Limites municipais</value>
4348 4374 </column_data>
4349 4375 <column_data>
4350   - <column_id>64</column_id>
  4376 + <column_id>58</column_id>
4351 4377 <value>1</value>
4352 4378 </column_data>
4353 4379 <column_data>
4354   - <column_id>65</column_id>
  4380 + <column_id>59</column_id>
4355 4381 <value>public</value>
4356 4382 </column_data>
4357 4383 <column_data>
4358   - <column_id>66</column_id>
  4384 + <column_id>60</column_id>
4359 4385 <value>tb_ibge</value>
4360 4386 </column_data>
4361 4387 <column_data>
4362   - <column_id>67</column_id>
  4388 + <column_id>61</column_id>
4363 4389 <value>the_geom</value>
4364 4390 </column_data>
4365 4391 <column_data>
4366   - <column_id>68</column_id>
  4392 + <column_id>62</column_id>
4367 4393 <value></value>
4368 4394 </column_data>
4369 4395 <column_data>
4370   - <column_id>69</column_id>
  4396 + <column_id>63</column_id>
4371 4397 <value>ibge</value>
4372 4398 </column_data>
4373 4399 <column_data>
4374   - <column_id>70</column_id>
  4400 + <column_id>64</column_id>
4375 4401 <value>no_cidade</value>
4376 4402 </column_data>
4377 4403 <column_data>
4378   - <column_id>71</column_id>
  4404 + <column_id>65</column_id>
4379 4405 <value>4326</value>
4380 4406 </column_data>
4381 4407 <column_data>
4382   - <column_id>72</column_id>
  4408 + <column_id>66</column_id>
4383 4409 <value>the_geom2</value>
4384 4410 </column_data>
4385 4411 </data>
4386 4412 <data>
4387 4413 <column_data>
4388   - <column_id>61</column_id>
  4414 + <column_id>55</column_id>
4389 4415 <value>3</value>
4390 4416 </column_data>
4391 4417 <column_data>
4392   - <column_id>62</column_id>
  4418 + <column_id>56</column_id>
4393 4419 <value>Estados</value>
4394 4420 </column_data>
4395 4421 <column_data>
4396   - <column_id>63</column_id>
  4422 + <column_id>57</column_id>
4397 4423 <value>Limites estaduais</value>
4398 4424 </column_data>
4399 4425 <column_data>
4400   - <column_id>64</column_id>
  4426 + <column_id>58</column_id>
4401 4427 <value>1</value>
4402 4428 </column_data>
4403 4429 <column_data>
4404   - <column_id>65</column_id>
  4430 + <column_id>59</column_id>
4405 4431 <value>public</value>
4406 4432 </column_data>
4407 4433 <column_data>
4408   - <column_id>66</column_id>
  4434 + <column_id>60</column_id>
4409 4435 <value>tb_ibge_estados</value>
4410 4436 </column_data>
4411 4437 <column_data>
4412   - <column_id>67</column_id>
  4438 + <column_id>61</column_id>
4413 4439 <value>the_geom</value>
4414 4440 </column_data>
4415 4441 <column_data>
4416   - <column_id>68</column_id>
  4442 + <column_id>62</column_id>
4417 4443 <value></value>
4418 4444 </column_data>
4419 4445 <column_data>
4420   - <column_id>69</column_id>
  4446 + <column_id>63</column_id>
4421 4447 <value>co_ibge_uf</value>
4422 4448 </column_data>
4423 4449 <column_data>
4424   - <column_id>70</column_id>
  4450 + <column_id>64</column_id>
4425 4451 <value>no_uf</value>
4426 4452 </column_data>
4427 4453 <column_data>
4428   - <column_id>71</column_id>
  4454 + <column_id>65</column_id>
4429 4455 <value>4326</value>
4430 4456 </column_data>
4431 4457 <column_data>
4432   - <column_id>72</column_id>
  4458 + <column_id>66</column_id>
4433 4459 <value>the_geom</value>
4434 4460 </column_data>
4435 4461 </data>
... ... @@ -4438,7 +4464,7 @@
4438 4464 <test_data_num>0</test_data_num>
4439 4465 <data_def_list>
4440 4466 <data_def>
4441   - <column_id>61</column_id>
  4467 + <column_id>55</column_id>
4442 4468 <type>Format</type>
4443 4469 <repeat_num>1</repeat_num>
4444 4470 <template>%</template>
... ... @@ -4453,7 +4479,7 @@
4453 4479 </modified_values>
4454 4480 </data_def>
4455 4481 <data_def>
4456   - <column_id>62</column_id>
  4482 + <column_id>56</column_id>
4457 4483 <type>Format</type>
4458 4484 <repeat_num>1</repeat_num>
4459 4485 <template>nome_tipo_regiao%</template>
... ... @@ -4468,7 +4494,7 @@
4468 4494 </modified_values>
4469 4495 </data_def>
4470 4496 <data_def>
4471   - <column_id>63</column_id>
  4497 + <column_id>57</column_id>
4472 4498 <type>Format</type>
4473 4499 <repeat_num>1</repeat_num>
4474 4500 <template>descricao_tipo_regiao%</template>
... ... @@ -4483,7 +4509,7 @@
4483 4509 </modified_values>
4484 4510 </data_def>
4485 4511 <data_def>
4486   - <column_id>64</column_id>
  4512 + <column_id>58</column_id>
4487 4513 <type>Foreign Key</type>
4488 4514 <repeat_num>1</repeat_num>
4489 4515 <template>%</template>
... ... @@ -4498,7 +4524,7 @@
4498 4524 </modified_values>
4499 4525 </data_def>
4500 4526 <data_def>
4501   - <column_id>65</column_id>
  4527 + <column_id>59</column_id>
4502 4528 <type>Format</type>
4503 4529 <repeat_num>1</repeat_num>
4504 4530 <template>esquemadb%</template>
... ... @@ -4513,7 +4539,7 @@
4513 4539 </modified_values>
4514 4540 </data_def>
4515 4541 <data_def>
4516   - <column_id>66</column_id>
  4542 + <column_id>60</column_id>
4517 4543 <type>Format</type>
4518 4544 <repeat_num>1</repeat_num>
4519 4545 <template>tabela%</template>
... ... @@ -4528,7 +4554,7 @@
4528 4554 </modified_values>
4529 4555 </data_def>
4530 4556 <data_def>
4531   - <column_id>67</column_id>
  4557 + <column_id>61</column_id>
4532 4558 <type>Format</type>
4533 4559 <repeat_num>1</repeat_num>
4534 4560 <template>colunageo%</template>
... ... @@ -4543,7 +4569,7 @@
4543 4569 </modified_values>
4544 4570 </data_def>
4545 4571 <data_def>
4546   - <column_id>68</column_id>
  4572 + <column_id>62</column_id>
4547 4573 <type>Format</type>
4548 4574 <repeat_num>1</repeat_num>
4549 4575 <template>data%</template>
... ... @@ -4558,7 +4584,7 @@
4558 4584 </modified_values>
4559 4585 </data_def>
4560 4586 <data_def>
4561   - <column_id>69</column_id>
  4587 + <column_id>63</column_id>
4562 4588 <type>Format</type>
4563 4589 <repeat_num>1</repeat_num>
4564 4590 <template>%</template>
... ... @@ -4573,7 +4599,7 @@
4573 4599 </modified_values>
4574 4600 </data_def>
4575 4601 <data_def>
4576   - <column_id>70</column_id>
  4602 + <column_id>64</column_id>
4577 4603 <type>Format</type>
4578 4604 <repeat_num>1</repeat_num>
4579 4605 <template>colunanomeregiao%</template>
... ... @@ -4588,7 +4614,7 @@
4588 4614 </modified_values>
4589 4615 </data_def>
4590 4616 <data_def>
4591   - <column_id>71</column_id>
  4617 + <column_id>65</column_id>
4592 4618 <type>Format</type>
4593 4619 <repeat_num>1</repeat_num>
4594 4620 <template>srid%</template>
... ... @@ -4603,7 +4629,7 @@
4603 4629 </modified_values>
4604 4630 </data_def>
4605 4631 <data_def>
4606   - <column_id>72</column_id>
  4632 + <column_id>66</column_id>
4607 4633 <type>Format</type>
4608 4634 <repeat_num>1</repeat_num>
4609 4635 <template>colunacentroide%</template>
... ... @@ -4728,55 +4754,55 @@
4728 4754 </repeat_test_data>
4729 4755 </table_test_data>
4730 4756 <table_test_data>
4731   - <table_id>9</table_id>
  4757 + <table_id>8</table_id>
4732 4758 <direct_test_data>
4733 4759 <data>
4734 4760 <column_data>
4735   - <column_id>37</column_id>
  4761 + <column_id>31</column_id>
4736 4762 <value>1</value>
4737 4763 </column_data>
4738 4764 <column_data>
4739   - <column_id>38</column_id>
  4765 + <column_id>32</column_id>
4740 4766 <value>1</value>
4741 4767 </column_data>
4742 4768 <column_data>
4743   - <column_id>39</column_id>
  4769 + <column_id>33</column_id>
4744 4770 <value>2</value>
4745 4771 </column_data>
4746 4772 <column_data>
4747   - <column_id>40</column_id>
  4773 + <column_id>34</column_id>
4748 4774 <value>1</value>
4749 4775 </column_data>
4750 4776 <column_data>
4751   - <column_id>41</column_id>
  4777 + <column_id>35</column_id>
4752 4778 <value>1</value>
4753 4779 </column_data>
4754 4780 <column_data>
4755   - <column_id>42</column_id>
  4781 + <column_id>36</column_id>
4756 4782 <value>1</value>
4757 4783 </column_data>
4758 4784 <column_data>
4759   - <column_id>43</column_id>
  4785 + <column_id>37</column_id>
4760 4786 <value>dbacoes_saude</value>
4761 4787 </column_data>
4762 4788 <column_data>
4763   - <column_id>44</column_id>
  4789 + <column_id>38</column_id>
4764 4790 <value>tb_farmacia_pop</value>
4765 4791 </column_data>
4766 4792 <column_data>
4767   - <column_id>45</column_id>
  4793 + <column_id>39</column_id>
4768 4794 <value>nu_farm_funcionando</value>
4769 4795 </column_data>
4770 4796 <column_data>
4771   - <column_id>46</column_id>
  4797 + <column_id>40</column_id>
4772 4798 <value>co_ibge</value>
4773 4799 </column_data>
4774 4800 <column_data>
4775   - <column_id>47</column_id>
  4801 + <column_id>41</column_id>
4776 4802 <value></value>
4777 4803 </column_data>
4778 4804 <column_data>
4779   - <column_id>48</column_id>
  4805 + <column_id>42</column_id>
4780 4806 <value>Número de farmácias em funcionamento por mês e ano</value>
4781 4807 </column_data>
4782 4808 </data>
... ... @@ -4785,7 +4811,7 @@
4785 4811 <test_data_num>0</test_data_num>
4786 4812 <data_def_list>
4787 4813 <data_def>
4788   - <column_id>37</column_id>
  4814 + <column_id>31</column_id>
4789 4815 <type>Format</type>
4790 4816 <repeat_num>1</repeat_num>
4791 4817 <template>%</template>
... ... @@ -4800,7 +4826,7 @@
4800 4826 </modified_values>
4801 4827 </data_def>
4802 4828 <data_def>
4803   - <column_id>38</column_id>
  4829 + <column_id>32</column_id>
4804 4830 <type>Foreign Key</type>
4805 4831 <repeat_num>1</repeat_num>
4806 4832 <template>%</template>
... ... @@ -4815,7 +4841,7 @@
4815 4841 </modified_values>
4816 4842 </data_def>
4817 4843 <data_def>
4818   - <column_id>39</column_id>
  4844 + <column_id>33</column_id>
4819 4845 <type>Foreign Key</type>
4820 4846 <repeat_num>1</repeat_num>
4821 4847 <template>%</template>
... ... @@ -4830,7 +4856,7 @@
4830 4856 </modified_values>
4831 4857 </data_def>
4832 4858 <data_def>
4833   - <column_id>40</column_id>
  4859 + <column_id>34</column_id>
4834 4860 <type>Foreign Key</type>
4835 4861 <repeat_num>1</repeat_num>
4836 4862 <template>%</template>
... ... @@ -4845,7 +4871,7 @@
4845 4871 </modified_values>
4846 4872 </data_def>
4847 4873 <data_def>
4848   - <column_id>41</column_id>
  4874 + <column_id>35</column_id>
4849 4875 <type>Foreign Key</type>
4850 4876 <repeat_num>1</repeat_num>
4851 4877 <template>%</template>
... ... @@ -4860,7 +4886,7 @@
4860 4886 </modified_values>
4861 4887 </data_def>
4862 4888 <data_def>
4863   - <column_id>42</column_id>
  4889 + <column_id>36</column_id>
4864 4890 <type>Foreign Key</type>
4865 4891 <repeat_num>1</repeat_num>
4866 4892 <template>%</template>
... ... @@ -4875,7 +4901,7 @@
4875 4901 </modified_values>
4876 4902 </data_def>
4877 4903 <data_def>
4878   - <column_id>43</column_id>
  4904 + <column_id>37</column_id>
4879 4905 <type>Format</type>
4880 4906 <repeat_num>1</repeat_num>
4881 4907 <template>esquemadb%</template>
... ... @@ -4890,7 +4916,7 @@
4890 4916 </modified_values>
4891 4917 </data_def>
4892 4918 <data_def>
4893   - <column_id>44</column_id>
  4919 + <column_id>38</column_id>
4894 4920 <type>Format</type>
4895 4921 <repeat_num>1</repeat_num>
4896 4922 <template>tabela%</template>
... ... @@ -4905,7 +4931,7 @@
4905 4931 </modified_values>
4906 4932 </data_def>
4907 4933 <data_def>
4908   - <column_id>45</column_id>
  4934 + <column_id>39</column_id>
4909 4935 <type>Format</type>
4910 4936 <repeat_num>1</repeat_num>
4911 4937 <template>colunavalor%</template>
... ... @@ -4920,7 +4946,7 @@
4920 4946 </modified_values>
4921 4947 </data_def>
4922 4948 <data_def>
4923   - <column_id>46</column_id>
  4949 + <column_id>40</column_id>
4924 4950 <type>Format</type>
4925 4951 <repeat_num>1</repeat_num>
4926 4952 <template>colunaidgeo_%</template>
... ... @@ -4935,7 +4961,7 @@
4935 4961 </modified_values>
4936 4962 </data_def>
4937 4963 <data_def>
4938   - <column_id>47</column_id>
  4964 + <column_id>41</column_id>
4939 4965 <type>Format</type>
4940 4966 <repeat_num>1</repeat_num>
4941 4967 <template>filtro%</template>
... ... @@ -4950,7 +4976,7 @@
4950 4976 </modified_values>
4951 4977 </data_def>
4952 4978 <data_def>
4953   - <column_id>48</column_id>
  4979 + <column_id>42</column_id>
4954 4980 <type>Format</type>
4955 4981 <repeat_num>1</repeat_num>
4956 4982 <template>nomemedida_%</template>
... ... @@ -4968,57 +4994,57 @@
4968 4994 </repeat_test_data>
4969 4995 </table_test_data>
4970 4996 <table_test_data>
4971   - <table_id>12</table_id>
  4997 + <table_id>11</table_id>
4972 4998 <direct_test_data>
4973 4999 <data>
4974 5000 <column_data>
4975   - <column_id>55</column_id>
  5001 + <column_id>49</column_id>
4976 5002 <value>1</value>
4977 5003 </column_data>
4978 5004 <column_data>
4979   - <column_id>56</column_id>
  5005 + <column_id>50</column_id>
4980 5006 <value>mes_farm_pop</value>
4981 5007 </column_data>
4982 5008 <column_data>
4983   - <column_id>57</column_id>
  5009 + <column_id>51</column_id>
4984 5010 <value>mês</value>
4985 5011 </column_data>
4986 5012 <column_data>
4987   - <column_id>58</column_id>
  5013 + <column_id>52</column_id>
4988 5014 <value></value>
4989 5015 </column_data>
4990 5016 <column_data>
4991   - <column_id>59</column_id>
  5017 + <column_id>53</column_id>
4992 5018 <value>2</value>
4993 5019 </column_data>
4994 5020 <column_data>
4995   - <column_id>60</column_id>
  5021 + <column_id>54</column_id>
4996 5022 <value>1</value>
4997 5023 </column_data>
4998 5024 </data>
4999 5025 <data>
5000 5026 <column_data>
5001   - <column_id>55</column_id>
  5027 + <column_id>49</column_id>
5002 5028 <value>2</value>
5003 5029 </column_data>
5004 5030 <column_data>
5005   - <column_id>56</column_id>
  5031 + <column_id>50</column_id>
5006 5032 <value>ano_farm</value>
5007 5033 </column_data>
5008 5034 <column_data>
5009   - <column_id>57</column_id>
  5035 + <column_id>51</column_id>
5010 5036 <value>ano</value>
5011 5037 </column_data>
5012 5038 <column_data>
5013   - <column_id>58</column_id>
  5039 + <column_id>52</column_id>
5014 5040 <value></value>
5015 5041 </column_data>
5016 5042 <column_data>
5017   - <column_id>59</column_id>
  5043 + <column_id>53</column_id>
5018 5044 <value>0</value>
5019 5045 </column_data>
5020 5046 <column_data>
5021   - <column_id>60</column_id>
  5047 + <column_id>54</column_id>
5022 5048 <value>1</value>
5023 5049 </column_data>
5024 5050 </data>
... ... @@ -5027,7 +5053,7 @@
5027 5053 <test_data_num>0</test_data_num>
5028 5054 <data_def_list>
5029 5055 <data_def>
5030   - <column_id>55</column_id>
  5056 + <column_id>49</column_id>
5031 5057 <type>Format</type>
5032 5058 <repeat_num>1</repeat_num>
5033 5059 <template>%</template>
... ... @@ -5042,7 +5068,7 @@
5042 5068 </modified_values>
5043 5069 </data_def>
5044 5070 <data_def>
5045   - <column_id>56</column_id>
  5071 + <column_id>50</column_id>
5046 5072 <type>Format</type>
5047 5073 <repeat_num>1</repeat_num>
5048 5074 <template>coluna%</template>
... ... @@ -5057,7 +5083,7 @@
5057 5083 </modified_values>
5058 5084 </data_def>
5059 5085 <data_def>
5060   - <column_id>57</column_id>
  5086 + <column_id>51</column_id>
5061 5087 <type>Format</type>
5062 5088 <repeat_num>1</repeat_num>
5063 5089 <template>nomedimensao%</template>
... ... @@ -5072,7 +5098,7 @@
5072 5098 </modified_values>
5073 5099 </data_def>
5074 5100 <data_def>
5075   - <column_id>58</column_id>
  5101 + <column_id>52</column_id>
5076 5102 <type>Format</type>
5077 5103 <repeat_num>1</repeat_num>
5078 5104 <template>descricao%</template>
... ... @@ -5087,7 +5113,7 @@
5087 5113 </modified_values>
5088 5114 </data_def>
5089 5115 <data_def>
5090   - <column_id>59</column_id>
  5116 + <column_id>53</column_id>
5091 5117 <type>Format</type>
5092 5118 <repeat_num>1</repeat_num>
5093 5119 <template>%</template>
... ... @@ -5102,7 +5128,7 @@
5102 5128 </modified_values>
5103 5129 </data_def>
5104 5130 <data_def>
5105   - <column_id>60</column_id>
  5131 + <column_id>54</column_id>
5106 5132 <type>Foreign Key</type>
5107 5133 <repeat_num>1</repeat_num>
5108 5134 <template>%</template>
... ... @@ -5189,23 +5215,23 @@
5189 5215 </repeat_test_data>
5190 5216 </table_test_data>
5191 5217 <table_test_data>
5192   - <table_id>6</table_id>
  5218 + <table_id>5</table_id>
5193 5219 <direct_test_data>
5194 5220 <data>
5195 5221 <column_data>
5196   - <column_id>17</column_id>
  5222 + <column_id>11</column_id>
5197 5223 <value>1</value>
5198 5224 </column_data>
5199 5225 <column_data>
5200   - <column_id>18</column_id>
  5226 + <column_id>12</column_id>
5201 5227 <value>Pela média</value>
5202 5228 </column_data>
5203 5229 <column_data>
5204   - <column_id>19</column_id>
  5230 + <column_id>13</column_id>
5205 5231 <value>1</value>
5206 5232 </column_data>
5207 5233 <column_data>
5208   - <column_id>20</column_id>
  5234 + <column_id>14</column_id>
5209 5235 <value></value>
5210 5236 </column_data>
5211 5237 </data>
... ... @@ -5214,7 +5240,7 @@
5214 5240 <test_data_num>0</test_data_num>
5215 5241 <data_def_list>
5216 5242 <data_def>
5217   - <column_id>17</column_id>
  5243 + <column_id>11</column_id>
5218 5244 <type>Format</type>
5219 5245 <repeat_num>1</repeat_num>
5220 5246 <template>%</template>
... ... @@ -5229,7 +5255,7 @@
5229 5255 </modified_values>
5230 5256 </data_def>
5231 5257 <data_def>
5232   - <column_id>18</column_id>
  5258 + <column_id>12</column_id>
5233 5259 <type>Format</type>
5234 5260 <repeat_num>1</repeat_num>
5235 5261 <template>nome%</template>
... ... @@ -5244,7 +5270,7 @@
5244 5270 </modified_values>
5245 5271 </data_def>
5246 5272 <data_def>
5247   - <column_id>19</column_id>
  5273 + <column_id>13</column_id>
5248 5274 <type>Foreign Key</type>
5249 5275 <repeat_num>1</repeat_num>
5250 5276 <template>%</template>
... ... @@ -5259,7 +5285,7 @@
5259 5285 </modified_values>
5260 5286 </data_def>
5261 5287 <data_def>
5262   - <column_id>20</column_id>
  5288 + <column_id>14</column_id>
5263 5289 <type>Format</type>
5264 5290 <repeat_num>1</repeat_num>
5265 5291 <template>observacao%</template>
... ... @@ -5277,167 +5303,167 @@
5277 5303 </repeat_test_data>
5278 5304 </table_test_data>
5279 5305 <table_test_data>
5280   - <table_id>7</table_id>
  5306 + <table_id>6</table_id>
5281 5307 <direct_test_data>
5282 5308 <data>
5283 5309 <column_data>
5284   - <column_id>21</column_id>
  5310 + <column_id>15</column_id>
5285 5311 <value>1</value>
5286 5312 </column_data>
5287 5313 <column_data>
5288   - <column_id>22</column_id>
  5314 + <column_id>16</column_id>
5289 5315 <value>([nu_farm_funcionando] &lt; 1)</value>
5290 5316 </column_data>
5291 5317 <column_data>
5292   - <column_id>23</column_id>
  5318 + <column_id>17</column_id>
5293 5319 <value>Nenhuma</value>
5294 5320 </column_data>
5295 5321 <column_data>
5296   - <column_id>24</column_id>
  5322 + <column_id>18</column_id>
5297 5323 <value>255</value>
5298 5324 </column_data>
5299 5325 <column_data>
5300   - <column_id>25</column_id>
  5326 + <column_id>19</column_id>
5301 5327 <value>0</value>
5302 5328 </column_data>
5303 5329 <column_data>
5304   - <column_id>26</column_id>
  5330 + <column_id>20</column_id>
5305 5331 <value>0</value>
5306 5332 </column_data>
5307 5333 <column_data>
5308   - <column_id>27</column_id>
  5334 + <column_id>21</column_id>
5309 5335 <value>1</value>
5310 5336 </column_data>
5311 5337 <column_data>
5312   - <column_id>28</column_id>
  5338 + <column_id>22</column_id>
5313 5339 <value></value>
5314 5340 </column_data>
5315 5341 <column_data>
5316   - <column_id>29</column_id>
  5342 + <column_id>23</column_id>
5317 5343 <value></value>
5318 5344 </column_data>
5319 5345 <column_data>
5320   - <column_id>30</column_id>
  5346 + <column_id>24</column_id>
5321 5347 <value>0</value>
5322 5348 </column_data>
5323 5349 <column_data>
5324   - <column_id>31</column_id>
  5350 + <column_id>25</column_id>
5325 5351 <value>0</value>
5326 5352 </column_data>
5327 5353 <column_data>
5328   - <column_id>32</column_id>
  5354 + <column_id>26</column_id>
5329 5355 <value>0</value>
5330 5356 </column_data>
5331 5357 <column_data>
5332   - <column_id>33</column_id>
  5358 + <column_id>27</column_id>
5333 5359 <value></value>
5334 5360 </column_data>
5335 5361 </data>
5336 5362 <data>
5337 5363 <column_data>
5338   - <column_id>21</column_id>
  5364 + <column_id>15</column_id>
5339 5365 <value>2</value>
5340 5366 </column_data>
5341 5367 <column_data>
5342   - <column_id>22</column_id>
  5368 + <column_id>16</column_id>
5343 5369 <value>([nu_farm_funcionando] = 1)</value>
5344 5370 </column_data>
5345 5371 <column_data>
5346   - <column_id>23</column_id>
  5372 + <column_id>17</column_id>
5347 5373 <value>Uma</value>
5348 5374 </column_data>
5349 5375 <column_data>
5350   - <column_id>24</column_id>
  5376 + <column_id>18</column_id>
5351 5377 <value>0</value>
5352 5378 </column_data>
5353 5379 <column_data>
5354   - <column_id>25</column_id>
  5380 + <column_id>19</column_id>
5355 5381 <value>255</value>
5356 5382 </column_data>
5357 5383 <column_data>
5358   - <column_id>26</column_id>
  5384 + <column_id>20</column_id>
5359 5385 <value>0</value>
5360 5386 </column_data>
5361 5387 <column_data>
5362   - <column_id>27</column_id>
  5388 + <column_id>21</column_id>
5363 5389 <value>1</value>
5364 5390 </column_data>
5365 5391 <column_data>
5366   - <column_id>28</column_id>
  5392 + <column_id>22</column_id>
5367 5393 <value></value>
5368 5394 </column_data>
5369 5395 <column_data>
5370   - <column_id>29</column_id>
  5396 + <column_id>23</column_id>
5371 5397 <value></value>
5372 5398 </column_data>
5373 5399 <column_data>
5374   - <column_id>30</column_id>
  5400 + <column_id>24</column_id>
5375 5401 <value></value>
5376 5402 </column_data>
5377 5403 <column_data>
5378   - <column_id>31</column_id>
  5404 + <column_id>25</column_id>
5379 5405 <value></value>
5380 5406 </column_data>
5381 5407 <column_data>
5382   - <column_id>32</column_id>
  5408 + <column_id>26</column_id>
5383 5409 <value></value>
5384 5410 </column_data>
5385 5411 <column_data>
5386   - <column_id>33</column_id>
  5412 + <column_id>27</column_id>
5387 5413 <value></value>
5388 5414 </column_data>
5389 5415 </data>
5390 5416 <data>
5391 5417 <column_data>
5392   - <column_id>21</column_id>
  5418 + <column_id>15</column_id>
5393 5419 <value>3</value>
5394 5420 </column_data>
5395 5421 <column_data>
5396   - <column_id>22</column_id>
  5422 + <column_id>16</column_id>
5397 5423 <value>([nu_farm_funcionando] &gt; 1)</value>
5398 5424 </column_data>
5399 5425 <column_data>
5400   - <column_id>23</column_id>
  5426 + <column_id>17</column_id>
5401 5427 <value>Mais de uma</value>
5402 5428 </column_data>
5403 5429 <column_data>
5404   - <column_id>24</column_id>
  5430 + <column_id>18</column_id>
5405 5431 <value>0</value>
5406 5432 </column_data>
5407 5433 <column_data>
5408   - <column_id>25</column_id>
  5434 + <column_id>19</column_id>
5409 5435 <value>0</value>
5410 5436 </column_data>
5411 5437 <column_data>
5412   - <column_id>26</column_id>
  5438 + <column_id>20</column_id>
5413 5439 <value>255</value>
5414 5440 </column_data>
5415 5441 <column_data>
5416   - <column_id>27</column_id>
  5442 + <column_id>21</column_id>
5417 5443 <value>1</value>
5418 5444 </column_data>
5419 5445 <column_data>
5420   - <column_id>28</column_id>
  5446 + <column_id>22</column_id>
5421 5447 <value></value>
5422 5448 </column_data>
5423 5449 <column_data>
5424   - <column_id>29</column_id>
  5450 + <column_id>23</column_id>
5425 5451 <value></value>
5426 5452 </column_data>
5427 5453 <column_data>
5428   - <column_id>30</column_id>
  5454 + <column_id>24</column_id>
5429 5455 <value></value>
5430 5456 </column_data>
5431 5457 <column_data>
5432   - <column_id>31</column_id>
  5458 + <column_id>25</column_id>
5433 5459 <value></value>
5434 5460 </column_data>
5435 5461 <column_data>
5436   - <column_id>32</column_id>
  5462 + <column_id>26</column_id>
5437 5463 <value></value>
5438 5464 </column_data>
5439 5465 <column_data>
5440   - <column_id>33</column_id>
  5466 + <column_id>27</column_id>
5441 5467 <value></value>
5442 5468 </column_data>
5443 5469 </data>
... ... @@ -5446,7 +5472,7 @@
5446 5472 <test_data_num>0</test_data_num>
5447 5473 <data_def_list>
5448 5474 <data_def>
5449   - <column_id>21</column_id>
  5475 + <column_id>15</column_id>
5450 5476 <type>Format</type>
5451 5477 <repeat_num>1</repeat_num>
5452 5478 <template>%</template>
... ... @@ -5461,7 +5487,7 @@
5461 5487 </modified_values>
5462 5488 </data_def>
5463 5489 <data_def>
5464   - <column_id>22</column_id>
  5490 + <column_id>16</column_id>
5465 5491 <type>Format</type>
5466 5492 <repeat_num>1</repeat_num>
5467 5493 <template>expressao%</template>
... ... @@ -5476,7 +5502,7 @@
5476 5502 </modified_values>
5477 5503 </data_def>
5478 5504 <data_def>
5479   - <column_id>23</column_id>
  5505 + <column_id>17</column_id>
5480 5506 <type>Format</type>
5481 5507 <repeat_num>1</repeat_num>
5482 5508 <template>titulo%</template>
... ... @@ -5491,7 +5517,7 @@
5491 5517 </modified_values>
5492 5518 </data_def>
5493 5519 <data_def>
5494   - <column_id>24</column_id>
  5520 + <column_id>18</column_id>
5495 5521 <type>Format</type>
5496 5522 <repeat_num>1</repeat_num>
5497 5523 <template>vermelho%</template>
... ... @@ -5506,7 +5532,7 @@
5506 5532 </modified_values>
5507 5533 </data_def>
5508 5534 <data_def>
5509   - <column_id>25</column_id>
  5535 + <column_id>19</column_id>
5510 5536 <type>Format</type>
5511 5537 <repeat_num>1</repeat_num>
5512 5538 <template>verde%</template>
... ... @@ -5521,7 +5547,7 @@
5521 5547 </modified_values>
5522 5548 </data_def>
5523 5549 <data_def>
5524   - <column_id>26</column_id>
  5550 + <column_id>20</column_id>
5525 5551 <type>Format</type>
5526 5552 <repeat_num>1</repeat_num>
5527 5553 <template>azul%</template>
... ... @@ -5536,7 +5562,7 @@
5536 5562 </modified_values>
5537 5563 </data_def>
5538 5564 <data_def>
5539   - <column_id>27</column_id>
  5565 + <column_id>21</column_id>
5540 5566 <type>Foreign Key</type>
5541 5567 <repeat_num>1</repeat_num>
5542 5568 <template>%</template>
... ... @@ -5551,7 +5577,7 @@
5551 5577 </modified_values>
5552 5578 </data_def>
5553 5579 <data_def>
5554   - <column_id>28</column_id>
  5580 + <column_id>22</column_id>
5555 5581 <type>Format</type>
5556 5582 <repeat_num>1</repeat_num>
5557 5583 <template>tamanho%</template>
... ... @@ -5566,7 +5592,7 @@
5566 5592 </modified_values>
5567 5593 </data_def>
5568 5594 <data_def>
5569   - <column_id>29</column_id>
  5595 + <column_id>23</column_id>
5570 5596 <type>Format</type>
5571 5597 <repeat_num>1</repeat_num>
5572 5598 <template>simbolo%</template>
... ... @@ -5581,7 +5607,7 @@
5581 5607 </modified_values>
5582 5608 </data_def>
5583 5609 <data_def>
5584   - <column_id>30</column_id>
  5610 + <column_id>24</column_id>
5585 5611 <type>Format</type>
5586 5612 <repeat_num>1</repeat_num>
5587 5613 <template>overmelho%</template>
... ... @@ -5596,7 +5622,7 @@
5596 5622 </modified_values>
5597 5623 </data_def>
5598 5624 <data_def>
5599   - <column_id>31</column_id>
  5625 + <column_id>25</column_id>
5600 5626 <type>Format</type>
5601 5627 <repeat_num>1</repeat_num>
5602 5628 <template>overde%</template>
... ... @@ -5611,7 +5637,7 @@
5611 5637 </modified_values>
5612 5638 </data_def>
5613 5639 <data_def>
5614   - <column_id>32</column_id>
  5640 + <column_id>26</column_id>
5615 5641 <type>Format</type>
5616 5642 <repeat_num>1</repeat_num>
5617 5643 <template>oazul%</template>
... ... @@ -5626,7 +5652,7 @@
5626 5652 </modified_values>
5627 5653 </data_def>
5628 5654 <data_def>
5629   - <column_id>33</column_id>
  5655 + <column_id>27</column_id>
5630 5656 <type>Format</type>
5631 5657 <repeat_num>1</repeat_num>
5632 5658 <template>otamanho%</template>
... ... @@ -5644,23 +5670,23 @@
5644 5670 </repeat_test_data>
5645 5671 </table_test_data>
5646 5672 <table_test_data>
5647   - <table_id>10</table_id>
  5673 + <table_id>9</table_id>
5648 5674 <direct_test_data>
5649 5675 <data>
5650 5676 <column_data>
5651   - <column_id>49</column_id>
  5677 + <column_id>43</column_id>
5652 5678 <value>http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095</value>
5653 5679 </column_data>
5654 5680 <column_data>
5655   - <column_id>50</column_id>
  5681 + <column_id>44</column_id>
5656 5682 <value>1</value>
5657 5683 </column_data>
5658 5684 <column_data>
5659   - <column_id>51</column_id>
  5685 + <column_id>45</column_id>
5660 5686 <value>Site das Fármacias Populares</value>
5661 5687 </column_data>
5662 5688 <column_data>
5663   - <column_id>52</column_id>
  5689 + <column_id>46</column_id>
5664 5690 <value>1</value>
5665 5691 </column_data>
5666 5692 </data>
... ... @@ -5669,7 +5695,7 @@
5669 5695 <test_data_num>0</test_data_num>
5670 5696 <data_def_list>
5671 5697 <data_def>
5672   - <column_id>49</column_id>
  5698 + <column_id>43</column_id>
5673 5699 <type>Format</type>
5674 5700 <repeat_num>1</repeat_num>
5675 5701 <template>link%</template>
... ... @@ -5684,7 +5710,7 @@
5684 5710 </modified_values>
5685 5711 </data_def>
5686 5712 <data_def>
5687   - <column_id>50</column_id>
  5713 + <column_id>44</column_id>
5688 5714 <type>Foreign Key</type>
5689 5715 <repeat_num>1</repeat_num>
5690 5716 <template>%</template>
... ... @@ -5699,7 +5725,7 @@
5699 5725 </modified_values>
5700 5726 </data_def>
5701 5727 <data_def>
5702   - <column_id>51</column_id>
  5728 + <column_id>45</column_id>
5703 5729 <type>Format</type>
5704 5730 <repeat_num>1</repeat_num>
5705 5731 <template>nome%</template>
... ... @@ -5714,7 +5740,7 @@
5714 5740 </modified_values>
5715 5741 </data_def>
5716 5742 <data_def>
5717   - <column_id>52</column_id>
  5743 + <column_id>46</column_id>
5718 5744 <type>Format</type>
5719 5745 <repeat_num>1</repeat_num>
5720 5746 <template>%</template>
... ... @@ -5732,15 +5758,15 @@
5732 5758 </repeat_test_data>
5733 5759 </table_test_data>
5734 5760 <table_test_data>
5735   - <table_id>11</table_id>
  5761 + <table_id>10</table_id>
5736 5762 <direct_test_data>
5737 5763 <data>
5738 5764 <column_data>
5739   - <column_id>53</column_id>
  5765 + <column_id>47</column_id>
5740 5766 <value>1</value>
5741 5767 </column_data>
5742 5768 <column_data>
5743   - <column_id>54</column_id>
  5769 + <column_id>48</column_id>
5744 5770 <value>1</value>
5745 5771 </column_data>
5746 5772 </data>
... ... @@ -5749,7 +5775,7 @@
5749 5775 <test_data_num>0</test_data_num>
5750 5776 <data_def_list>
5751 5777 <data_def>
5752   - <column_id>53</column_id>
  5778 + <column_id>47</column_id>
5753 5779 <type>Foreign Key</type>
5754 5780 <repeat_num>1</repeat_num>
5755 5781 <template>%</template>
... ... @@ -5764,7 +5790,7 @@
5764 5790 </modified_values>
5765 5791 </data_def>
5766 5792 <data_def>
5767   - <column_id>54</column_id>
  5793 + <column_id>48</column_id>
5768 5794 <type>Foreign Key</type>
5769 5795 <repeat_num>1</repeat_num>
5770 5796 <template>%</template>
... ... @@ -5782,19 +5808,19 @@
5782 5808 </repeat_test_data>
5783 5809 </table_test_data>
5784 5810 <table_test_data>
5785   - <table_id>8</table_id>
  5811 + <table_id>7</table_id>
5786 5812 <direct_test_data>
5787 5813 <data>
5788 5814 <column_data>
5789   - <column_id>34</column_id>
  5815 + <column_id>28</column_id>
5790 5816 <value>1</value>
5791 5817 </column_data>
5792 5818 <column_data>
5793   - <column_id>35</column_id>
  5819 + <column_id>29</column_id>
5794 5820 <value>Ministério da Saúde</value>
5795 5821 </column_data>
5796 5822 <column_data>
5797   - <column_id>36</column_id>
  5823 + <column_id>30</column_id>
5798 5824 <value>http://saude.gov.br</value>
5799 5825 </column_data>
5800 5826 </data>
... ... @@ -5803,7 +5829,7 @@
5803 5829 <test_data_num>0</test_data_num>
5804 5830 <data_def_list>
5805 5831 <data_def>
5806   - <column_id>34</column_id>
  5832 + <column_id>28</column_id>
5807 5833 <type>Format</type>
5808 5834 <repeat_num>1</repeat_num>
5809 5835 <template>%</template>
... ... @@ -5818,7 +5844,7 @@
5818 5844 </modified_values>
5819 5845 </data_def>
5820 5846 <data_def>
5821   - <column_id>35</column_id>
  5847 + <column_id>29</column_id>
5822 5848 <type>Format</type>
5823 5849 <repeat_num>1</repeat_num>
5824 5850 <template>titulo%</template>
... ... @@ -5833,7 +5859,7 @@
5833 5859 </modified_values>
5834 5860 </data_def>
5835 5861 <data_def>
5836   - <column_id>36</column_id>
  5862 + <column_id>30</column_id>
5837 5863 <type>Format</type>
5838 5864 <repeat_num>1</repeat_num>
5839 5865 <template>link%</template>
... ...
ferramentas/metaestat/dicionario.js 0 → 100644
  Diff comments   View file @fc7d47b
... ... @@ -0,0 +1,80 @@
  1 +//+$trad(1,i3GEOF.metaestat.dicionario)+
  2 +i3GEOF.metaestat.dicionario = {
  3 +"1":[
  4 +{
  5 +pt:"Escolha uma vari&aacute;vel para o mapa",
  6 +en:"",
  7 +es:"",
  8 +it:""
  9 +}],
  10 +"2":[
  11 +{
  12 +pt:"Escolha uma medida da vari&aacute;vel",
  13 +en:"",
  14 +es:"",
  15 +it:""
  16 +}],
  17 +"3":[
  18 +{
  19 +pt:"Mais informa&ccedil;&otilde;es sobre a vari&aacute;vel&nbsp;",
  20 +en:"",
  21 +es:"",
  22 +it:""
  23 +}],
  24 +"4":[
  25 +{
  26 +pt:"Escolha uma variavel primeiro",
  27 +en:"",
  28 +es:"",
  29 +it:""
  30 +}],
  31 +"5":[
  32 +{
  33 +pt:"Relat&oacute;rio",
  34 +en:"",
  35 +es:"",
  36 +it:""
  37 +}],
  38 +"6":[
  39 +{
  40 +pt:"Classes",
  41 +en:"",
  42 +es:"",
  43 +it:""
  44 +}],
  45 +"7":[
  46 +{
  47 +pt:"Adicionar camada ao mapa",
  48 +en:"",
  49 +es:"",
  50 +it:""
  51 +}],
  52 +"8":[
  53 +{
  54 +pt:"Como os dados ser&atilde;o representados",
  55 +en:"",
  56 +es:"",
  57 +it:""
  58 +}],
  59 +"9":[
  60 +{
  61 +pt:"Escolha um tipo de classifica&ccedil;&atilde;o",
  62 +en:"",
  63 +es:"",
  64 +it:""
  65 +}],
  66 +"10":[
  67 +{
  68 +pt:"Criar camada",
  69 +en:"",
  70 +es:"",
  71 +it:""
  72 +}],
  73 +"11":[
  74 +{
  75 +pt:"An&aacute;lise",
  76 +en:"",
  77 +es:"",
  78 +it:""
  79 +}]
  80 +};
0 81 \ No newline at end of file
... ...
ferramentas/metaestat/index.js 0 → 100644
  Diff comments   View file @fc7d47b
... ... @@ -0,0 +1,629 @@
  1 +/*
  2 +Title: Cartogramas estat&iacute;sticos
  3 +
  4 +Arquivo:
  5 +
  6 +i3geo/ferramentas/metaestat/index.js
  7 +
  8 +Licenca:
  9 +
  10 +GPL2
  11 +
  12 +i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
  13 +
  14 +Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil
  15 +Desenvolvedor: Edmar Moretti edmar.moretti@mma.gov.br
  16 +
  17 +Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo
  18 +e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a P&uacute;blica Geral
  19 +GNU conforme publicada pela Free Software Foundation;
  20 +
  21 +Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til,
  22 +por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a garantia impl&iacute;cita
  23 +de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA.
  24 +Consulte a Licen&ccedil;a P&uacute;blica Geral do GNU para mais detalhes.
  25 +Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do
  26 +GNU junto com este programa; se n&atilde;o, escreva para a
  27 +Free Software Foundation, Inc., no endere&ccedil;o
  28 +59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
  29 +*/
  30 +if(typeof(i3GEOF) === 'undefined'){
  31 + var i3GEOF = {};
  32 +}
  33 +/*
  34 +Classe: i3GEOF.metaestat
  35 +
  36 +Gerencia os componentes do m&oacute;dulo de gera&ccedil;&atilde;o de cartogramas estat&iacute;sticos
  37 +*/
  38 +i3GEOF.metaestat = {
  39 + INTERFACE: "flutuante",
  40 + TOP: 50,
  41 + LEFT: 100,
  42 + LARGURA: 260,
  43 + ALTURA: 300,
  44 + //lista das camadas que foram adicionadas ao mapa
  45 + CAMADAS: [],
  46 + inicia: function(iddiv){
  47 + i3GEOF.metaestat.iniciaDicionario();
  48 + },
  49 + iniciaDicionario: function(){
  50 + if(typeof(i3GEOF.metaestat.dicionario) === 'undefined'){
  51 + i3GEO.util.scriptTag(
  52 + i3GEO.configura.locaplic+"/ferramentas/metaestat/dicionario.js",
  53 + "i3GEOF.metaestat.principal.inicia()",
  54 + "i3GEOF.metaestat.dicionario_script"
  55 + );
  56 + }
  57 + else{
  58 + i3GEOF.metaestat.principal.inicia();
  59 + }
  60 + },
  61 + desligaCamadas: function(){
  62 + if(i3GEOF.metaestat.CAMADAS.length > 0){
  63 + i3GEO.arvoreDeCamadas.ligaDesligaTemas(i3GEOF.metaestat.CAMADAS.join(","),false);
  64 + }
  65 + },
  66 + adicionaCamada: function(){
  67 + //function mapfileMedidaVariavel($id_medida_variavel,$filtro="",$todasascolunas = 0,$tipolayer="polygon",$titulolayer="",$id_classificacao="",$agruparpor=""){
  68 + var v = i3GEOF.metaestat.verificaParametros(),
  69 + temp = function(retorno){
  70 + if(i3GEO.arvoreDeCamadas.pegaTema(retorno.layer) == ""){
  71 + i3GEOF.metaestat.desligaCamadas();
  72 + i3GEO.php.adtema(i3GEO.atualiza,retorno.mapfile);
  73 + i3GEOF.metaestat.CAMADAS.push(retorno.layer);
  74 + }
  75 + };
  76 + if(v != true){
  77 + alert("erro: "+v);
  78 + }
  79 + i3GEO.php.mapfileMedidaVariavel(
  80 + temp,
  81 + $i("i3geoCartoComboMedidasVariavel").value,
  82 + i3GEOF.metaestat.defineFiltro(),
  83 + 0,
  84 + $i("i3geoCartoComboTipoRep").value,
  85 + i3GEOF.metaestat.defineTitulo(),
  86 + $i("i3geoCartoComboTipoClassificacao").value,
  87 + i3GEOF.metaestat.defineAgruparPor()
  88 + );
  89 + },
  90 + defineTitulo: function(){
  91 + //se nao tiver parametros, filtro e vazio
  92 + if(i3GEOF.metaestat.parametros.dados.length == 0){
  93 + return "";
  94 + }
  95 + //se tiver parametro e todos estiverem vazios, aborta
  96 + var i,n,c,titulo,
  97 + t=[],
  98 + dados = i3GEOF.metaestat.parametros.dados;
  99 + titulo = $i("i3geoCartoComboVariavel").options[$i("i3geoCartoComboVariavel").selectedIndex].label +" - "+
  100 + $i("i3geoCartoComboMedidasVariavel").options[$i("i3geoCartoComboMedidasVariavel").selectedIndex].label +" - "+
  101 + $i("i3geoCartoComboTipoRep").options[$i("i3geoCartoComboTipoRep").selectedIndex].label +" - "+
  102 + $i("i3geoCartoComboTipoClassificacao").options[$i("i3geoCartoComboTipoClassificacao").selectedIndex].label;
  103 + n = dados.length;
  104 + for(i=0;i<n;i++){
  105 + c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai);
  106 + if(c && c.value != ""){
  107 + t.push(dados[i].nome+" = "+c.value);
  108 + }
  109 + }
  110 + if(t.length > 0){
  111 + return titulo+" - "+t.join(", ");
  112 + }
  113 + else{
  114 + return titulo;
  115 + }
  116 + },
  117 + defineFiltro: function(){
  118 + //se nao tiver parametros, filtro e vazio
  119 + if(i3GEOF.metaestat.parametros.dados.length == 0){
  120 + return "";
  121 + }
  122 + //se tiver parametro e todos estiverem vazios, aborta
  123 + var i,n,c,
  124 + t=[],
  125 + dados = i3GEOF.metaestat.parametros.dados;
  126 + n = dados.length;
  127 + for(i=0;i<n;i++){
  128 + c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai);
  129 + if(c && c.value != ""){
  130 + t.push(dados[i].coluna+"="+c.value);
  131 + }
  132 + }
  133 + if(t.length > 0){
  134 + return t.join(" and ");
  135 + }
  136 + else{
  137 + return "";
  138 + }
  139 + },
  140 + defineAgruparPor: function(){
  141 + //se nao tiver parametros, filtro e vazio
  142 + if(i3GEOF.metaestat.parametros.dados.length == 0){
  143 + return "";
  144 + }
  145 + //se tiver parametro e todos estiverem vazios, aborta
  146 + var i,n,c,
  147 + t=[],
  148 + dados = i3GEOF.metaestat.parametros.dados;
  149 + n = dados.length;
  150 + for(i=0;i<n;i++){
  151 + c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai);
  152 + if(c && c.value != ""){
  153 + t.push(dados[i].coluna);
  154 + }
  155 + }
  156 + if(t.length > 0){
  157 + return t.join(",");
  158 + }
  159 + else{
  160 + return "";
  161 + }
  162 + },
  163 + verificaParametros: function(){
  164 + var ok = true,
  165 + combos = ["i3geoCartoComboVariavel","i3geoCartoComboMedidasVariavel","i3geoCartoComboTipoRep","i3geoCartoComboTipoClassificacao"],
  166 + n = combos.length,
  167 + i,temp;
  168 + for(i=0;i<n;i++){
  169 + temp = $i(combos[i]);
  170 + if(!temp){
  171 + return combos[i];
  172 + }
  173 + if(temp.value == ""){
  174 + return combos[i];
  175 + }
  176 + }
  177 + return ok;
  178 + },
  179 + aguarde: function(obj){
  180 + if(!obj){
  181 + return "<img style='display:block;z-index:2' src=\'"+i3GEO.configura.locaplic+"/imagens/aguarde.gif\' />";
  182 + }
  183 + var i = $i(obj.id+"_imagem");
  184 + if(!i){
  185 + obj.innerHTML = "<img id='"+obj.id+"_imagem' style='display:block;z-index:2' src=\'"+i3GEO.configura.locaplic+"/imagens/aguarde.gif\' />";
  186 + }
  187 + else{
  188 + if(i.style.display == "block"){
  189 + i.style.display = "none";
  190 + }
  191 + else{
  192 + i.style.display = "block";
  193 + }
  194 + }
  195 + },
  196 + principal: {
  197 + inicia: function(iddiv){
  198 + if(!iddiv){
  199 + iddiv = "i3geoCartoParametros_corpo";
  200 + }
  201 + if(i3GEOF.metaestat.INTERFACE == "flutuante"){
  202 + i3GEOF.metaestat.principal.abreJanela();
  203 + }
  204 + $i(iddiv).innerHTML = i3GEOF.metaestat.principal.html();
  205 + i3GEOF.metaestat.principal.comboVariaveis();
  206 + },
  207 + abreJanela: function(){
  208 + var cabecalho,minimiza,imagemxy,janela;
  209 + if (!$i("i3geoCartoParametros")){
  210 + cabecalho = function(){
  211 + };
  212 + minimiza = function(){
  213 + i3GEO.janela.minimiza("i3geoCartoParametros");
  214 + };
  215 + janela = i3GEO.janela.cria(
  216 + i3GEOF.metaestat.LARGURA+"px",
  217 + i3GEOF.metaestat.ALTURA+"px",
  218 + "",
  219 + "",
  220 + "",
  221 + $trad("x57"),
  222 + "i3geoCartoParametros",
  223 + false,
  224 + "hd",
  225 + cabecalho,
  226 + minimiza
  227 + );
  228 + janela = janela[0];
  229 + YAHOO.i3GEO.janela.manager.register(janela);
  230 + janela.render();
  231 + }
  232 + else{
  233 + janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoParametros");
  234 + }
  235 + janela.show();
  236 + imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO));
  237 + janela.moveTo(imagemxy[0]+i3GEOF.metaestat.LEFT,i3GEOF.metaestat.TOP);
  238 + },
  239 + html: function(){
  240 + var ins = '<div id="i3geoCartoVariaveisContainer" style="margin-left:5px;">' +
  241 + '<div class="paragrafo" id="i3geoCartoVariaveis" >' +
  242 + '</div>' +
  243 + '<div class="paragrafo" id="i3geoCartoMedidasVariavel" >' +
  244 + '</div>' +
  245 + '<div class="paragrafo" id="i3geoCartoParametrosMedidasVariavel" >' +
  246 + '</div>' +
  247 + '</div>';
  248 + return ins;
  249 + },
  250 + maisInfo: function(){
  251 + var temp = "",
  252 + v = $i("i3geoCartoComboVariavel");
  253 + if(!v || v.value === ""){
  254 + alert($trad(4,i3GEOF.metaestat.dicionario));
  255 + }
  256 + else{
  257 + var cabecalho,minimiza,janela;
  258 + if (!$i("i3geoCartoMaisInfo")){
  259 + cabecalho = function(){
  260 + };
  261 + minimiza = function(){
  262 + i3GEO.janela.minimiza("i3geoCartoMaisInfo");
  263 + };
  264 + janela = i3GEO.janela.cria(
  265 + "400px",
  266 + "300px",
  267 + "",
  268 + "",
  269 + "",
  270 + $trad(5,i3GEOF.metaestat.dicionario),
  271 + "i3geoCartoMaisInfo",
  272 + false,
  273 + "hd",
  274 + cabecalho,
  275 + minimiza
  276 + );
  277 + janela = janela[0];
  278 + YAHOO.i3GEO.janela.manager.register(janela);
  279 + janela.render();
  280 + //YAHOO.util.Event.addListener(janela.close, "click", i3GEOF.metaestat.fechaJanelaParametros);
  281 + }
  282 + else{
  283 + janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoMaisInfo");
  284 + }
  285 + janela.setBody(i3GEOF.metaestat.aguarde());
  286 + temp = function(retorno){
  287 + janela.setBody(retorno);
  288 + janela.show();
  289 + //imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO));
  290 + //janela.moveTo(imagemxy[0]+i3GEOF.metaestat.LEFT,imagemxy[1]+i3GEOF.metaestat.TOP);
  291 + };
  292 + i3GEO.php.relatorioVariavel(v.value,temp);
  293 + }
  294 + },
  295 + comboVariaveis: function(){
  296 + var onde = $i("i3geoCartoVariaveis"),
  297 + temp = function(dados){
  298 + var n = dados.length,
  299 + ins = '',
  300 + i;
  301 + //botao para obter mais info
  302 + ins = '<p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoInfo" value="'+$trad(3,i3GEOF.metaestat.dicionario)+'"class="paragrafo" style="width:200px;cursor:pointer;color:blue" /></p>' +
  303 + '<br><p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoClasses" value="'+$trad(10,i3GEOF.metaestat.dicionario)+'"class="paragrafo" style="width:200px;cursor:pointer;color:blue" />' +
  304 + '<input type="button" id="i3GEOcartoBotaoAnalise" value="'+$trad(11,i3GEOF.metaestat.dicionario)+'"class="paragrafo" style="width:200px;cursor:pointer;color:blue" /></p>' +
  305 + '<br><p class="paragrafo" >'+$trad(1,i3GEOF.metaestat.dicionario)+'</p>' +
  306 + "<select id='i3geoCartoComboVariavel' style='box-shadow:0 1px 5px gray;width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange='i3GEOF.metaestat.principal.comboVariaveisOnchange(this)'><option value=''>---</option>";
  307 + for(i=0;i<n;i++){
  308 + ins += "<option title='"+dados[i].descricao+"' value='"+dados[i].codigo_variavel+"'>"+dados[i].nome+"</option>";
  309 + }
  310 + ins += "</select>";
  311 + if(onde){
  312 + onde.innerHTML = ins;
  313 + new YAHOO.widget.Button(
  314 + "i3GEOcartoBotaoInfo",
  315 + {onclick:{fn: i3GEOF.metaestat.principal.maisInfo}}
  316 + );
  317 + $i("i3GEOcartoBotaoInfo-button").style.width = i3GEOF.metaestat.LARGURA - 25 + "px";
  318 + new YAHOO.widget.Button(
  319 + "i3GEOcartoBotaoClasses",
  320 + {onclick:{fn: i3GEOF.metaestat.classes.inicia}}
  321 + );
  322 + $i("i3GEOcartoBotaoClasses-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px";
  323 + new YAHOO.widget.Button(
  324 + "i3GEOcartoBotaoAnalise",
  325 + {onclick:{fn: i3GEOF.metaestat.analise.inicia}}
  326 + );
  327 + $i("i3GEOcartoBotaoAnalise-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px";
  328 + }
  329 + return ins;
  330 + };
  331 + i3GEOF.metaestat.aguarde(onde);
  332 + i3GEO.php.listaVariavel(temp);
  333 + },
  334 + comboVariaveisOnchange: function(combo){
  335 + if(combo.value != ""){
  336 + i3GEOF.metaestat.principal.comboMedidasVariavel(combo.value);
  337 + }
  338 + else{
  339 + $i("i3geoCartoMedidasVariavel").innerHTML = "";
  340 + $i("i3geoCartoParametrosMedidasVariavel").innerHTML = "";
  341 + }
  342 + },
  343 + comboMedidasVariavel: function(codigo_variavel){
  344 + var onde = $i("i3geoCartoMedidasVariavel"),
  345 + temp = function(dados){
  346 + var n = dados.length,
  347 + ins = '<p class="paragrafo" >'+$trad(2,i3GEOF.metaestat.dicionario)+'</p>',
  348 + i;
  349 + ins += "<select id='i3geoCartoComboMedidasVariavel' style='width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange='i3GEOF.metaestat.principal.comboMedidaVariavelOnchange(this)'><option value=''>---</option>";
  350 + for(i=0;i<n;i++){
  351 + ins += "<option value='"+dados[i].id_medida_variavel+"'>"+dados[i].nomemedida+"</option>";
  352 + }
  353 + ins += "</select>";
  354 + if(onde){
  355 + onde.innerHTML = ins;
  356 + }
  357 + return ins;
  358 + };
  359 + i3GEOF.metaestat.aguarde(onde);
  360 + i3GEO.php.listaMedidaVariavel(codigo_variavel,temp);
  361 + },
  362 + comboMedidaVariavelOnchange: function(combo){
  363 + i3GEOF.metaestat.classes.inicia();
  364 + if(combo.value != ""){
  365 + i3GEOF.metaestat.parametros.lista(combo.value);
  366 + }
  367 + else{
  368 + $i("i3geoCartoParametrosMedidasVariavel").innerHTML = "";
  369 + }
  370 + }
  371 + },
  372 + parametros: {
  373 + //guarda a lista de parametros
  374 + dados: [],
  375 + //obtem a lista com os parametros da medida
  376 + //cria os combos para os parametros que sao pai de todos
  377 + lista: function(id_medida_variavel){
  378 + i3GEOF.metaestat.aguarde($i("i3geoCartoParametrosMedidasVariavel"));
  379 + var temp = function(dados){
  380 + i3GEOF.metaestat.parametros.dados = dados;
  381 + i3GEOF.metaestat.parametros.combos("0");
  382 + i3GEOF.metaestat.aguarde($i("i3geoCartoParametrosMedidasVariavel"));
  383 + };
  384 + i3GEO.php.listaParametrosMedidaVariavel(id_medida_variavel,temp);
  385 + },
  386 + //cria um combo para escolher os valores de um parametro
  387 + combos: function(nivel){
  388 + var dados = i3GEOF.metaestat.parametros.dados,
  389 + n = dados.length,
  390 + onde = $i("i3geoCartoParametrosMedidasVariavel"),
  391 + idpar,idcombo,i,novoel,teste;
  392 + //cria o combo para o parametro cujo id_pai for do nivel escolhido
  393 + for(i=0;i<n;i++){
  394 + if(dados[i].id_pai == nivel){
  395 + idpar = "parametro_"+dados[i].id_parametro_medida;
  396 + idcombo = "parametro_"+dados[i].id_parametro_medida+"_"+nivel;
  397 + teste = i3GEOF.metaestat.parametros.retornaIdPai(dados[i].id_parametro_medida);
  398 + if(teste != false){
  399 + idpar = "parametro_"+teste;
  400 + }
  401 + if(!$i(idpar)){
  402 + novoel = document.createElement("div");
  403 + novoel.id = idpar;
  404 + novoel.className = "paragrafo";
  405 + onde.appendChild(novoel);
  406 + onde = novoel;
  407 + }
  408 + onde = $i(idpar);
  409 + if(!$i(idcombo)){
  410 + i3GEOF.metaestat.aguarde(onde);
  411 + novoel = document.createElement("div");
  412 + novoel.id = idcombo;
  413 + novoel.className = "paragrafo";
  414 + onde.appendChild(novoel);
  415 + i3GEOF.metaestat.parametros.valoresCombo(dados[i].id_parametro_medida,dados[i].nome,nivel,onde,idcombo);
  416 + }
  417 + }
  418 + }
  419 + },
  420 + valoresCombo: function(id_parametro_medida,titulo,nivel,onde,idcombo){
  421 + var temp = function(dados){
  422 + var n = dados.length,
  423 + ins = "",
  424 + oc = "'i3GEOF.metaestat.parametros.antesCombo();i3GEOF.metaestat.parametros.combos(\""+id_parametro_medida+"\")'",
  425 + filho = i3GEOF.metaestat.parametros.retornaIdFilho(id_parametro_medida),
  426 + i,novoel;
  427 + if(filho == false){
  428 + oc = "";
  429 + }
  430 + ins = "<p class=paragrafo >"+titulo+"</p>";
  431 + ins += "<select id='combo"+idcombo+"' style='background:beige;width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange="+oc+" ><option value=''>---</option>";
  432 + for(i=0;i<n;i++){
  433 + ins += "<option value='"+dados[i]+"'>"+dados[i]+"</option>";
  434 + }
  435 + ins += "</select>";
  436 + novoel = document.createElement("div");
  437 + novoel.className = "paragrafo";
  438 + novoel.innerHTML = ins;
  439 + i3GEOF.metaestat.aguarde(onde);
  440 + onde.appendChild(novoel);
  441 + };
  442 + i3GEO.php.listaValoresParametroMedidaVariavel(id_parametro_medida,temp);
  443 + },
  444 + antesCombo: function(){
  445 + if(!$i("i3geoCartoClasses_corpo")){
  446 + i3GEOF.metaestat.classes.inicia();
  447 + }
  448 + },
  449 + //retorna o id do parametro que e filho de um outro parametro
  450 + retornaIdFilho:function(pai){
  451 + var dados = i3GEOF.metaestat.parametros.dados,
  452 + n = dados.length,
  453 + i;
  454 + for(i=0;i<n;i++){
  455 + if(dados[i].id_pai == pai){
  456 + return dados[i].id_parametro_medida;
  457 + }
  458 + }
  459 + return false;
  460 + },
  461 + //retorna o id do parametro que e pai de um outro parametro
  462 + retornaIdPai:function(filho){
  463 + var dados = i3GEOF.metaestat.parametros.dados,
  464 + n = dados.length,
  465 + i;
  466 + for(i=0;i<n;i++){
  467 + if(dados[i].id_parametro_medida == filho){
  468 + return dados[i].id_pai;
  469 + }
  470 + }
  471 + return false;
  472 + }
  473 + },
  474 + classes:{
  475 + inicia: function(iddiv){
  476 + if(!$i("i3geoCartoComboMedidasVariavel")){
  477 + alert("erro: i3geoCartoComboMedidasVariavel???");
  478 + return;
  479 + }
  480 + if(!iddiv){
  481 + iddiv = "i3geoCartoClasses_corpo";
  482 + }
  483 + if(i3GEOF.metaestat.INTERFACE == "flutuante"){
  484 + i3GEOF.metaestat.classes.abreJanela();
  485 + }
  486 + $i(iddiv).innerHTML = i3GEOF.metaestat.classes.html();
  487 + i3GEOF.metaestat.classes.comboTipoRep();
  488 + i3GEOF.metaestat.classes.comboTipoClassificacao();
  489 + },
  490 + abreJanela: function(){
  491 + var cabecalho,minimiza,imagemxy,janela;
  492 + if (!$i("i3geoCartoClasses")){
  493 + cabecalho = function(){
  494 + };
  495 + minimiza = function(){
  496 + i3GEO.janela.minimiza("i3geoCartoClasses");
  497 + };
  498 + janela = i3GEO.janela.cria(
  499 + i3GEOF.metaestat.LARGURA+"px",
  500 + i3GEOF.metaestat.ALTURA+"px",
  501 + "",
  502 + "",
  503 + "",
  504 + $trad(6,i3GEOF.metaestat.dicionario),
  505 + "i3geoCartoClasses",
  506 + false,
  507 + "hd",
  508 + cabecalho,
  509 + minimiza
  510 + );
  511 + janela = janela[0];
  512 + YAHOO.i3GEO.janela.manager.register(janela);
  513 + janela.render();
  514 + }
  515 + else{
  516 + janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoClasses");
  517 + }
  518 + janela.show();
  519 + imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO));
  520 + janela.moveTo(imagemxy[0]+i3GEOF.metaestat.LEFT+i3GEOF.metaestat.LARGURA+10,i3GEOF.metaestat.TOP);
  521 + },
  522 + html: function(){
  523 + var ins = '<div id="i3geoCartoClassesContainer" style="margin-left:5px;">' +
  524 + '<div class="paragrafo" id="i3geoCartoTipoRep" >' +
  525 + '</div>' +
  526 + '<div class="paragrafo" id="i3geoCartoTipoClassificacao" >' +
  527 + '</div>' +
  528 + '</div>';
  529 + return ins;
  530 + },
  531 + comboTipoRep: function(){
  532 + var onde = $i("i3geoCartoTipoRep"),
  533 + ins,i,
  534 + dados = [
  535 + {"codigo":"polygon","nome":"pol&iacute;gonos"},
  536 + {"codigo":"point","nome":"pontos"}
  537 + ],
  538 + n = dados.length;
  539 + ins = '<p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoAdicionarCamada" onclick="i3GEOF.metaestat.principal.maisInfo()" value="'+$trad(7,i3GEOF.metaestat.dicionario)+'"class="paragrafo" style="cursor:pointer;color:blue" /></p>' +
  540 + '<br><p class="paragrafo" >'+$trad(8,i3GEOF.metaestat.dicionario)+'</p>' +
  541 + "<select id='i3geoCartoComboTipoRep' style='box-shadow:0 1px 5px gray;width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange=''>";
  542 + for(i=0;i<n;i++){
  543 + ins += "<option value='"+dados[i].codigo+"'>"+dados[i].nome+"</option>";
  544 + }
  545 + ins += "</select>";
  546 + if(onde){
  547 + onde.innerHTML = ins;
  548 + new YAHOO.widget.Button(
  549 + "i3GEOcartoBotaoAdicionarCamada",
  550 + {onclick:{fn: i3GEOF.metaestat.adicionaCamada}}
  551 + );
  552 + $i("i3GEOcartoBotaoAdicionarCamada-button").style.width = i3GEOF.metaestat.LARGURA - 25 + "px";
  553 + }
  554 + return ins;
  555 + },
  556 + comboTipoClassificacao: function(){
  557 + var onde = $i("i3geoCartoTipoClassificacao"),
  558 + combo = $i("i3geoCartoComboMedidasVariavel"),
  559 + temp = function(dados){
  560 + var n = dados.length,
  561 + ins = '<p class="paragrafo" >'+$trad(9,i3GEOF.metaestat.dicionario)+'</p>',
  562 + i;
  563 + ins += "<select id='i3geoCartoComboTipoClassificacao' style='width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange='i3GEOF.metaestat.classes.comboTipoClassificacaoOnchange(this)'><option value=''>---</option>";
  564 + for(i=0;i<n;i++){
  565 + ins += "<option title='"+dados[i].observacao+"' value='"+dados[i].id_classificacao+"'>"+dados[i].nome+"</option>";
  566 + }
  567 + ins += "</select>";
  568 + //{"id_classificacao":"1","nome":"Pela media","id_medida_variavel":"1","observacao":""}
  569 + if(onde){
  570 + onde.innerHTML = ins;
  571 + }
  572 + return ins;
  573 + };
  574 + i3GEOF.metaestat.aguarde(onde);
  575 + i3GEO.php.listaClassificacaoMedida(combo.value,temp);
  576 + },
  577 + comboTipoClassificacaoOnchange: function(){
  578 +
  579 + }
  580 + },
  581 + analise: {
  582 + inicia: function(iddiv){
  583 + if(!iddiv){
  584 + iddiv = "i3geoCartoAnalise_corpo";
  585 + }
  586 + if(i3GEOF.metaestat.INTERFACE == "flutuante"){
  587 + i3GEOF.metaestat.analise.abreJanela();
  588 + }
  589 + $i(iddiv).innerHTML = i3GEOF.metaestat.analise.html();
  590 + },
  591 + abreJanela: function(){
  592 + var cabecalho,minimiza,imagemxy,janela;
  593 + if (!$i("i3geoCartoAnalise")){
  594 + cabecalho = function(){
  595 + };
  596 + minimiza = function(){
  597 + i3GEO.janela.minimiza("i3geoCartoAnalise");
  598 + };
  599 + janela = i3GEO.janela.cria(
  600 + i3GEOF.metaestat.LARGURA+"px",
  601 + i3GEOF.metaestat.ALTURA+"px",
  602 + "",
  603 + "",
  604 + "",
  605 + $trad(11,i3GEOF.metaestat.dicionario),
  606 + "i3geoCartoAnalise",
  607 + false,
  608 + "hd",
  609 + cabecalho,
  610 + minimiza
  611 + );
  612 + janela = janela[0];
  613 + YAHOO.i3GEO.janela.manager.register(janela);
  614 + janela.render();
  615 + }
  616 + else{
  617 + janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoAnalise");
  618 + }
  619 + janela.show();
  620 + imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO));
  621 + janela.moveTo(imagemxy[0]+(i3GEOF.metaestat.LEFT*2)+i3GEOF.metaestat.LARGURA+10,i3GEOF.metaestat.TOP);
  622 + },
  623 + html: function(){
  624 + var ins = '<div id="i3geoCartoAnaliseContainer" style="margin-left:5px;">' +
  625 + '</div>';
  626 + return ins;
  627 + }
  628 + }
  629 +};
0 630 \ No newline at end of file
... ...
interface/carto_ol.htm
  Diff comments   View file @fc7d47b
... ... @@ -126,6 +126,7 @@
126 126 </div>
127 127 </div>
128 128 <script src="../classesjs/i3geonaocompacto.js"></script>
  129 +<script src="../ferramentas/metaestat/index.js"></script>
129 130 <script src="../pacotes/openlayers/OpenLayers211.js.php"></script>
130 131  
131 132 <script>
... ... @@ -204,12 +205,12 @@ i3GEO.finaliza = function(){
204 205 i3GEO.arvoreDeTemas.OPCOESADICIONAIS.navegacaoDir = true;
205 206 i3GEO.inicia();
206 207 //parametros especificos dos cartogramas
207   -i3GEO.cartograma.INTERFACE = "flutuante";
208   -i3GEO.cartograma.TOP = 50;
209   -i3GEO.cartograma.LEFT = 100;
210   -i3GEO.cartograma.LARGURA = 260;
211   -i3GEO.cartograma.ALTURA = 300;
212   -i3GEO.cartograma.inicia();
  208 +i3GEOF.metaestat.INTERFACE = "flutuante";
  209 +i3GEOF.metaestat.TOP = 50;
  210 +i3GEOF.metaestat.LEFT = 100;
  211 +i3GEOF.metaestat.LARGURA = 260;
  212 +i3GEOF.metaestat.ALTURA = 300;
  213 +i3GEOF.metaestat.inicia();
213 214 </script>
214 215 </body>
215 216 </html>
... ...