Download as
Browse Code »

Commit a21dbcef7f37b741ac9269472c34b76a615741a1

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

Inclusão de opções de geração de kml no sistema de metadados estatísticos

Showing 14 changed files with 1849 additions and 852 deletions   Show diff stats
@@ -27,16 +27,7 @@ @@ -27,16 +27,7 @@
27 </natures> 27 </natures>
28 <filteredResources> 28 <filteredResources>
29 <filter> 29 <filter>
30 - <id>1342548175463</id>  
31 - <name></name>  
32 - <type>26</type>  
33 - <matcher>  
34 - <id>org.eclipse.ui.ide.multiFilter</id>  
35 - <arguments>1.0-name-matches-false-false-pacotes</arguments>  
36 - </matcher>  
37 - </filter>  
38 - <filter>  
39 - <id>1342548175466</id> 30 + <id>1344291026531</id>
40 <name></name> 31 <name></name>
41 <type>14</type> 32 <type>14</type>
42 <matcher> 33 <matcher>
@@ -45,7 +36,7 @@ @@ -45,7 +36,7 @@
45 </matcher> 36 </matcher>
46 </filter> 37 </filter>
47 <filter> 38 <filter>
48 - <id>1342548175468</id> 39 + <id>1344291026539</id>
49 <name></name> 40 <name></name>
50 <type>26</type> 41 <type>26</type>
51 <matcher> 42 <matcher>
@@ -54,7 +45,7 @@ @@ -54,7 +45,7 @@
54 </matcher> 45 </matcher>
55 </filter> 46 </filter>
56 <filter> 47 <filter>
57 - <id>1342548175470</id> 48 + <id>1344291026546</id>
58 <name></name> 49 <name></name>
59 <type>30</type> 50 <type>30</type>
60 <matcher> 51 <matcher>
@@ -63,7 +54,7 @@ @@ -63,7 +54,7 @@
63 </matcher> 54 </matcher>
64 </filter> 55 </filter>
65 <filter> 56 <filter>
66 - <id>1342548175494</id> 57 + <id>1344291026548</id>
67 <name></name> 58 <name></name>
68 <type>22</type> 59 <type>22</type>
69 <matcher> 60 <matcher>
admin/admin.db
View file @a21dbce
No preview for this file type
admin/js/estat_tipo_regiao.js
  Diff comments   View file @a21dbce
@@ -30,7 +30,8 @@ function montaTabela(dados){ @@ -30,7 +30,8 @@ function montaTabela(dados){
30 {label:"Descri&ccedil;&atilde;o",resizeable:true,key:"descricao_tipo_regiao", formatter:formatTexto}, 30 {label:"Descri&ccedil;&atilde;o",resizeable:true,key:"descricao_tipo_regiao", formatter:formatTexto},
31 {label:"Esquema",key:"esquemadb",formatter:formatTexto}, 31 {label:"Esquema",key:"esquemadb",formatter:formatTexto},
32 {label:"Tabela",key:"tabela",formatter:formatTexto}, 32 {label:"Tabela",key:"tabela",formatter:formatTexto},
33 - {label:"Coluna",key:"colunageo",formatter:formatTexto}, 33 + {label:"Coluna geo",key:"colunageo",formatter:formatTexto},
  34 + {label:"Centr&oacute;ide",key:"colunacentroide",formatter:formatTexto},
34 {label:"Data",key:"data",formatter:formatTexto}, 35 {label:"Data",key:"data",formatter:formatTexto},
35 {label:"C&oacute;digo",key:"identificador",formatter:formatTexto}, 36 {label:"C&oacute;digo",key:"identificador",formatter:formatTexto},
36 {label:"Coluna com os nomes de cada regi&atilde;o",key:"colunanomeregiao",formatter:formatTexto}, 37 {label:"Coluna com os nomes de cada regi&atilde;o",key:"colunanomeregiao",formatter:formatTexto},
@@ -41,7 +42,7 @@ function montaTabela(dados){ @@ -41,7 +42,7 @@ function montaTabela(dados){
41 42
42 myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSARRAY; 43 myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSARRAY;
43 myDataSource.responseSchema = { 44 myDataSource.responseSchema = {
44 - fields: ["codigo_tipo_regiao","nome_tipo_regiao","descricao_tipo_regiao","esquemadb","tabela","colunageo","data","identificador","colunanomeregiao","srid"] 45 + fields: ["codigo_tipo_regiao","nome_tipo_regiao","descricao_tipo_regiao","esquemadb","tabela","colunageo","colunacentroide","data","identificador","colunanomeregiao","srid"]
45 }; 46 };
46 myDataTable.subscribe( 47 myDataTable.subscribe(
47 'cellClickEvent', 48 'cellClickEvent',
@@ -119,7 +120,8 @@ function montaDiv(i){ @@ -119,7 +120,8 @@ function montaDiv(i){
119 {titulo:"Descri&ccedil;&atilde;o:",id:"Edescricao_tipo_regiao",size:"50",value:i.descricao_tipo_regiao,tipo:"text",div:""}, 120 {titulo:"Descri&ccedil;&atilde;o:",id:"Edescricao_tipo_regiao",size:"50",value:i.descricao_tipo_regiao,tipo:"text",div:""},
120 {titulo:"Esquema no banco de dados:",id:"Eesquemadb",size:"50",value:i.esquemadb,tipo:"text",div:""}, 121 {titulo:"Esquema no banco de dados:",id:"Eesquemadb",size:"50",value:i.esquemadb,tipo:"text",div:""},
121 {titulo:"Tabela:",id:"Etabela",size:"50",value:i.tabela,tipo:"text",div:""}, 122 {titulo:"Tabela:",id:"Etabela",size:"50",value:i.tabela,tipo:"text",div:""},
122 - {titulo:"Coluna com a geometria:",id:"Ecolunageo",size:"50",value:i.colunageo,tipo:"text",div:""}, 123 + {titulo:"Coluna com a geometria principal (normalmente poligonal):",id:"Ecolunageo",size:"50",value:i.colunageo,tipo:"text",div:""},
  124 + {titulo:"Coluna com pontos (pode ser a mesmo que a anterior):",id:"Ecolunacentroide",size:"50",value:i.colunacentroide,tipo:"text",div:""},
123 {titulo:"Data a qual se referem os dados:",id:"Edata",size:"50",value:i.data,tipo:"text",div:""}, 125 {titulo:"Data a qual se referem os dados:",id:"Edata",size:"50",value:i.data,tipo:"text",div:""},
124 {titulo:"Coluna com o c&oacute;digo de cada registro:",id:"Eidentificador",size:"50",value:i.identificador,tipo:"text",div:""}, 126 {titulo:"Coluna com o c&oacute;digo de cada registro:",id:"Eidentificador",size:"50",value:i.identificador,tipo:"text",div:""},
125 {titulo:"Coluna com o nome da regi&atilde;o:",id:"Ecolunanomeregiao",size:"50",value:i.colunanomeregiao,tipo:"text",div:""}, 127 {titulo:"Coluna com o nome da regi&atilde;o:",id:"Ecolunanomeregiao",size:"50",value:i.colunanomeregiao,tipo:"text",div:""},
@@ -133,7 +135,7 @@ function montaDiv(i){ @@ -133,7 +135,7 @@ function montaDiv(i){
133 } 135 }
134 136
135 function gravaDados(id,recordid){ 137 function gravaDados(id,recordid){
136 - var campos = new Array("nome_tipo_regiao","descricao_tipo_regiao","esquemadb","tabela","colunageo","data","identificador","colunanomeregiao","srid"), 138 + var campos = new Array("nome_tipo_regiao","descricao_tipo_regiao","esquemadb","tabela","colunageo","colunacentroide","data","identificador","colunanomeregiao","srid"),
137 par = "", 139 par = "",
138 i = 0, 140 i = 0,
139 sUrl,callback; 141 sUrl,callback;
admin/js/estat_variavel.js
  Diff comments   View file @a21dbce
@@ -300,7 +300,7 @@ function adicionaNosClassificacao(no,dados,redesenha){ @@ -300,7 +300,7 @@ function adicionaNosClassificacao(no,dados,redesenha){
300 conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('classificacaoMedida','"+dados[i].id_classificacao+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />"; 300 conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('classificacaoMedida','"+dados[i].id_classificacao+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />";
301 conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:2px\" onclick=\"editar('classificacaoMedida','"+dados[i].id_classificacao+"')\" title=editar src=\"../imagens/06.png\" /><b>"; 301 conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:2px\" onclick=\"editar('classificacaoMedida','"+dados[i].id_classificacao+"')\" title=editar src=\"../imagens/06.png\" /><b>";
302 if(dados[i].nomedimensao != "") 302 if(dados[i].nomedimensao != "")
303 - {conteudo += "&nbsp;<span><b>"+dados[i].nome+"</b><span style=color:gray > id: "+dados[i].id_classificacao+"</span></span>";} 303 + {conteudo += "&nbsp;<span><b>"+dados[i].nome+"</b><span style=color:gray > Obs.: "+dados[i].nome+" id: "+dados[i].id_classificacao+"</span></span>";}
304 else 304 else
305 {conteudo += "&nbsp;<span style=color:red >Edite para definir a nova classifica&ccedil;&atilde;o!!!</span>";} 305 {conteudo += "&nbsp;<span style=color:red >Edite para definir a nova classifica&ccedil;&atilde;o!!!</span>";}
306 d = {html:conteudo,id_classificacao:dados[i].id_classificacao,tipo:"classificacao"}; 306 d = {html:conteudo,id_classificacao:dados[i].id_classificacao,tipo:"classificacao"};
@@ -442,7 +442,8 @@ function montaDivClassificacaoMedida(i){ @@ -442,7 +442,8 @@ function montaDivClassificacaoMedida(i){
442 var ins = "", 442 var ins = "",
443 param = { 443 param = {
444 "linhas":[ 444 "linhas":[
445 - {titulo:"Nome:",id:"Enome",size:"50",value:i.nome,tipo:"text",div:""} 445 + {titulo:"Nome:",id:"Enome",size:"50",value:i.nome,tipo:"text",div:""},
  446 + {titulo:"Observa&ccedil;&atilde;o:",id:"Eobservacao",size:"50",value:i.observacao,tipo:"text",div:""}
446 ] 447 ]
447 }; 448 };
448 ins += core_geraLinhas(param); 449 ins += core_geraLinhas(param);
@@ -455,9 +456,15 @@ function montaDivClasseClassificacao(i){ @@ -455,9 +456,15 @@ function montaDivClasseClassificacao(i){
455 "linhas":[ 456 "linhas":[
456 {titulo:"T&iacute;tulo:",id:"Etitulo",size:"50",value:i.titulo,tipo:"text",div:""}, 457 {titulo:"T&iacute;tulo:",id:"Etitulo",size:"50",value:i.titulo,tipo:"text",div:""},
457 {titulo:"Express&atilde;o (no estilo Mapserver)<br> exemplo (([nu_farm_funcionando] > 0) and ([nu_farm_funcionando] < 5)):",id:"Eexpressao",size:"50",value:i.expressao,tipo:"text",div:""}, 458 {titulo:"Express&atilde;o (no estilo Mapserver)<br> exemplo (([nu_farm_funcionando] > 0) and ([nu_farm_funcionando] < 5)):",id:"Eexpressao",size:"50",value:i.expressao,tipo:"text",div:""},
  459 + {titulo:"S&iacute;mbolo:",id:"Esimbolo",size:"10",value:i.simbolo,tipo:"text",div:""},
  460 + {titulo:"Tamanho do s&iacute;mbolo:",id:"Etamanho",size:"10",value:i.tamanho,tipo:"text",div:""},
458 {titulo:"Vermelho:",id:"Evermelho",size:"10",value:i.vermelho,tipo:"text",div:""}, 461 {titulo:"Vermelho:",id:"Evermelho",size:"10",value:i.vermelho,tipo:"text",div:""},
459 {titulo:"Verde:",id:"Everde",size:"10",value:i.verde,tipo:"text",div:""}, 462 {titulo:"Verde:",id:"Everde",size:"10",value:i.verde,tipo:"text",div:""},
460 - {titulo:"Azul:",id:"Eazul",size:"10",value:i.azul,tipo:"text",div:""} 463 + {titulo:"Azul:",id:"Eazul",size:"10",value:i.azul,tipo:"text",div:""},
  464 + {titulo:"Contorno - tamanho do s&iacute;mbolo:",id:"Eotamanho",size:"10",value:i.otamanho,tipo:"text",div:""},
  465 + {titulo:"Contorno - Vermelho:",id:"Eovermelho",size:"10",value:i.overmelho,tipo:"text",div:""},
  466 + {titulo:"Contorno - Verde:",id:"Eoverde",size:"10",value:i.overde,tipo:"text",div:""},
  467 + {titulo:"Contorno - Azul:",id:"Eoazul",size:"10",value:i.oazul,tipo:"text",div:""}
461 ] 468 ]
462 }; 469 };
463 ins += core_geraLinhas(param); 470 ins += core_geraLinhas(param);
@@ -645,7 +652,9 @@ function sql(tipo,id) { @@ -645,7 +652,9 @@ function sql(tipo,id) {
645 ins += ' <input type=button id="sumarioestat" value="Sum&aacute;rio" />'; 652 ins += ' <input type=button id="sumarioestat" value="Sum&aacute;rio" />';
646 ins += ' <input type=button id="graficoestat" value="Gr&aacute;fico" />'; 653 ins += ' <input type=button id="graficoestat" value="Gr&aacute;fico" />';
647 ins += ' <input type=button id="mapfileestat" value="Mapfile" />'; 654 ins += ' <input type=button id="mapfileestat" value="Mapfile" />';
648 - ins += ' <input type=button id="i3geoestat" value="i3Geo" />'; 655 + ins += ' <input type=button id="i3geoestat" value="i3Geo" /><br><br>';
  656 + ins += ' <input type=button id="kmzestat" value="Kmz (vetorial)" />';
  657 + ins += ' <input type=button id="kmlestat" value="Kml (wms)" />';
649 658
650 $i("editor_bd").innerHTML = ins; 659 $i("editor_bd").innerHTML = ins;
651 new YAHOO.widget.Button("sqljson"); 660 new YAHOO.widget.Button("sqljson");
@@ -668,6 +677,22 @@ function sql(tipo,id) { @@ -668,6 +677,22 @@ function sql(tipo,id) {
668 } 677 }
669 window.open('../php/metaestat.php?funcao=mapfileMedidaVariavel&formato=json&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value); 678 window.open('../php/metaestat.php?funcao=mapfileMedidaVariavel&formato=json&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value);
670 }; 679 };
  680 + new YAHOO.widget.Button("kmzestat");
  681 + $i("kmzestat-button").onclick = function(){
  682 + var colunas = 0;
  683 + if($i("incluirtodascolunas").checked === true){
  684 + colunas = 1;
  685 + }
  686 + window.open('../php/metaestat.php?funcao=kmlmedidavariavel&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value+"&formato=kmz");
  687 + };
  688 + new YAHOO.widget.Button("kmlestat");
  689 + $i("kmlestat-button").onclick = function(){
  690 + var colunas = 0;
  691 + if($i("incluirtodascolunas").checked === true){
  692 + colunas = 1;
  693 + }
  694 + window.open('../php/metaestat.php?funcao=kmlmedidavariavel&id_medida_variavel='+id+"&filtro="+$i("filtrosql").value+"&todasascolunas="+colunas+"&tipolayer="+$i("tipolayer").value+"&id_classificacao="+$i("classificacao").value+"&agruparpor="+$i("agruparsql").value+"&formato=kml");
  695 + };
671 new YAHOO.widget.Button("i3geoestat"); 696 new YAHOO.widget.Button("i3geoestat");
672 $i("i3geoestat-button").onclick = function(){ 697 $i("i3geoestat-button").onclick = function(){
673 var sUrl,callback = { 698 var sUrl,callback = {
@@ -847,12 +872,12 @@ function gravaDados(tipo,id){ @@ -847,12 +872,12 @@ function gravaDados(tipo,id){
847 prog = "../php/metaestat.php?funcao=alteraDimensaoMedida"; 872 prog = "../php/metaestat.php?funcao=alteraDimensaoMedida";
848 } 873 }
849 if(tipo == "classificacaoMedida"){ 874 if(tipo == "classificacaoMedida"){
850 - campos = new Array("nome"); 875 + campos = new Array("nome","observacao");
851 par = "&id_classificacao="+id; 876 par = "&id_classificacao="+id;
852 prog = "../php/metaestat.php?funcao=alteraClassificacaoMedida"; 877 prog = "../php/metaestat.php?funcao=alteraClassificacaoMedida";
853 } 878 }
854 if(tipo == "classeClassificacao"){ 879 if(tipo == "classeClassificacao"){
855 - campos = new Array("titulo","expressao","azul","verde","vermelho"); 880 + campos = new Array("titulo","expressao","azul","verde","vermelho","tamanho","simbolo","otamanho","overde","oazul","overmelho");
856 par = "&id_classe="+id; 881 par = "&id_classe="+id;
857 prog = "../php/metaestat.php?funcao=alteraClasseClassificacao"; 882 prog = "../php/metaestat.php?funcao=alteraClasseClassificacao";
858 } 883 }
@@ -889,7 +914,7 @@ function gravaDados(tipo,id){ @@ -889,7 +914,7 @@ function gravaDados(tipo,id){
889 } 914 }
890 if(tipo == "classificacaoMedida"){ 915 if(tipo == "classificacaoMedida"){
891 no = tree.getNodeByProperty("id_classificacao",id); 916 no = tree.getNodeByProperty("id_classificacao",id);
892 - no.getContentEl().getElementsByTagName("span")[0].innerHTML = "<b>"+document.getElementById("Enome").value+"</b><span style=color:gray > id: "+id+"</span>"; 917 + no.getContentEl().getElementsByTagName("span")[0].innerHTML = "<b>"+document.getElementById("Enome").value+"</b><span style=color:gray > Obs.: "+document.getElementById("Eobservacao").value+" id: "+id+"</span>";
893 no.getContentEl().getElementsByTagName("span")[0].style.color = ""; 918 no.getContentEl().getElementsByTagName("span")[0].style.color = "";
894 no.html = no.getContentEl().innerHTML; 919 no.html = no.getContentEl().innerHTML;
895 } 920 }
admin/php/classe_metaestat.php
  Diff comments   View file @a21dbce
@@ -52,6 +52,7 @@ class Metaestat{ @@ -52,6 +52,7 @@ class Metaestat{
52 //vem do include 52 //vem do include
53 $this->dir_tmp = $dir_tmp; 53 $this->dir_tmp = $dir_tmp;
54 $this->locaplic = $locaplic; 54 $this->locaplic = $locaplic;
  55 + $this->base = $base;
55 if(!isset($convUTF)){ 56 if(!isset($convUTF)){
56 $convUTF = true; 57 $convUTF = true;
57 } 58 }
@@ -202,20 +203,27 @@ class Metaestat{ @@ -202,20 +203,27 @@ class Metaestat{
202 203
203 $todasascolunas - opcional 204 $todasascolunas - opcional
204 */ 205 */
205 - function sqlMedidaVariavel($id_medida_variavel,$todasascolunas,$agruparpor=""){ 206 + function sqlMedidaVariavel($id_medida_variavel,$todasascolunas,$agruparpor="",$tipolayer="polygon"){
206 $filtro = false; 207 $filtro = false;
207 $dados = $this->listaMedidaVariavel("",$id_medida_variavel); 208 $dados = $this->listaMedidaVariavel("",$id_medida_variavel);
208 $dadosgeo = $this->listaTipoRegiao($dados["codigo_tipo_regiao"]); 209 $dadosgeo = $this->listaTipoRegiao($dados["codigo_tipo_regiao"]);
  210 + if($tipolayer != "point"){
  211 + $colunageo = $dadosgeo["colunageo"];
  212 + }
  213 + else{
  214 + $colunageo = $dadosgeo["colunacentroide"];
  215 + }
  216 +
209 if($todasascolunas == 0){ 217 if($todasascolunas == 0){
210 $sql = " SELECT d.".$dados["colunavalor"].",d.".$dados["colunaidgeo"]; 218 $sql = " SELECT d.".$dados["colunavalor"].",d.".$dados["colunaidgeo"];
211 if(!empty($agruparpor)){ 219 if(!empty($agruparpor)){
212 $sql .= ",d.".$agruparpor; 220 $sql .= ",d.".$agruparpor;
213 } 221 }
214 - $sqlgeo = $sql.",g.".$dadosgeo["colunageo"]; 222 + $sqlgeo = $sql.",g.".$colunageo;
215 } 223 }
216 else{ 224 else{
217 $sql = " SELECT d.* "; 225 $sql = " SELECT d.* ";
218 - $sqlgeo = $sql.",g.".$dadosgeo["colunageo"]; 226 + $sqlgeo = $sql.",g.".$colunageo;
219 } 227 }
220 if(empty($agruparpor)){ 228 if(empty($agruparpor)){
221 $sql .= " FROM ".$dados["esquemadb"].".".$dados["tabela"]." as d "; 229 $sql .= " FROM ".$dados["esquemadb"].".".$dados["tabela"]." as d ";
@@ -239,7 +247,7 @@ class Metaestat{ @@ -239,7 +247,7 @@ class Metaestat{
239 $sqlgeo .= " WHERE ".$j; 247 $sqlgeo .= " WHERE ".$j;
240 } 248 }
241 //atencao: cuidado ao alterar essa string pois ') as foo' pode ser usado para replace em outras funcoes 249 //atencao: cuidado ao alterar essa string pois ') as foo' pode ser usado para replace em outras funcoes
242 - $sqlgeo = $dadosgeo["colunageo"]." from ($sqlgeo) as foo using unique ".$dados["colunaidgeo"]." using srid=".$dadosgeo["srid"]; 250 + $sqlgeo = $colunageo." from ($sqlgeo) as foo using unique ".$dados["colunaidgeo"]." using srid=".$dadosgeo["srid"];
243 $colunas = $this->colunasTabela($dados["codigo_estat_conexao"],$dados["esquemadb"],$dados["tabela"]); 251 $colunas = $this->colunasTabela($dados["codigo_estat_conexao"],$dados["esquemadb"],$dados["tabela"]);
244 return array("sql"=>$sql,"sqlmapserver"=>$sqlgeo,"filtro"=>$filtro,"colunas"=>$colunas); 252 return array("sql"=>$sql,"sqlmapserver"=>$sqlgeo,"filtro"=>$filtro,"colunas"=>$colunas);
245 } 253 }
@@ -255,7 +263,7 @@ class Metaestat{ @@ -255,7 +263,7 @@ class Metaestat{
255 $conexao = $this->listaConexao($meta["codigo_estat_conexao"],true); 263 $conexao = $this->listaConexao($meta["codigo_estat_conexao"],true);
256 $conexao = "user=".$conexao["usuario"]." password=".$conexao["senha"]." dbname=".$conexao["bancodedados"]." host=".$conexao["host"]." port=".$conexao["porta"].""; 264 $conexao = "user=".$conexao["usuario"]." password=".$conexao["senha"]." dbname=".$conexao["bancodedados"]." host=".$conexao["host"]." port=".$conexao["porta"]."";
257 //echo $conexao;exit; 265 //echo $conexao;exit;
258 - $sql = $this->sqlMedidaVariavel($id_medida_variavel,$todasascolunas,$agruparpor); 266 + $sql = $this->sqlMedidaVariavel($id_medida_variavel,$todasascolunas,$agruparpor,$tipolayer);
259 $sqlf = $sql["sqlmapserver"]; 267 $sqlf = $sql["sqlmapserver"];
260 if(!empty($filtro)){ 268 if(!empty($filtro)){
261 $sqlf = str_replace(") as foo"," AND ".$filtro." ) as foo",$sqlf); 269 $sqlf = str_replace(") as foo"," AND ".$filtro." ) as foo",$sqlf);
@@ -290,11 +298,24 @@ class Metaestat{ @@ -290,11 +298,24 @@ class Metaestat{
290 } 298 }
291 else{ 299 else{
292 foreach($classes as $classe){ 300 foreach($classes as $classe){
  301 + //var_dump($classe);exit;
293 $dados[] = ' CLASS'; 302 $dados[] = ' CLASS';
294 $dados[] = ' NAME "'.mb_convert_encoding($classe["titulo"],"ISO-8859-1",mb_detect_encoding($titulolayer)).'"'; 303 $dados[] = ' NAME "'.mb_convert_encoding($classe["titulo"],"ISO-8859-1",mb_detect_encoding($titulolayer)).'"';
295 $dados[] = ' EXPRESSION '.$classe["expressao"]; 304 $dados[] = ' EXPRESSION '.$classe["expressao"];
296 $dados[] = ' STYLE'; 305 $dados[] = ' STYLE';
297 $dados[] = ' COLOR '.$classe["vermelho"].' '.$classe["verde"].' '.$classe["azul"]; 306 $dados[] = ' COLOR '.$classe["vermelho"].' '.$classe["verde"].' '.$classe["azul"];
  307 + if(!empty($classe["tamanho"])){
  308 + $dados[] = ' SIZE '.$classe["tamanho"];
  309 + }
  310 + if(!empty($classe["simbolo"])){
  311 + $dados[] = ' SYMBOL '.$classe["simbolo"];
  312 + }
  313 + if(!empty($classe["otamanho"])){
  314 + $dados[] = ' OUTLINEWIDTH '.$classe["otamanho"];
  315 + }
  316 + if(!empty($classe["overmelho"]) || $classe["overmelho"] == "0"){
  317 + $dados[] = ' OUTLINECOLOR '.$classe["overmelho"].' '.$classe["overde"].' '.$classe["oazul"];
  318 + }
298 $dados[] = ' END'; 319 $dados[] = ' END';
299 $dados[] = ' END'; 320 $dados[] = ' END';
300 } 321 }
@@ -307,6 +328,50 @@ class Metaestat{ @@ -307,6 +328,50 @@ class Metaestat{
307 } 328 }
308 return array("mapfile"=>$arq,"layer"=>$rand,"titulolayer"=>$titulolayer); 329 return array("mapfile"=>$arq,"layer"=>$rand,"titulolayer"=>$titulolayer);
309 } 330 }
  331 + function mapfileCompleto($mapfile){
  332 + $f = $this->base;
  333 + if($f == ""){
  334 + include_once($this->locaplic."/classesphp/funcoes_gerais.php");
  335 + $versao = versao();
  336 + $versao = $versao["principal"];
  337 + $f = "";
  338 + if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){
  339 + $f = $locaplic."/aplicmap/geral1windowsv".$versao.".map";
  340 + }
  341 + else{
  342 + if($f == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){
  343 + $f = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map";
  344 + }
  345 + if($f == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
  346 + $f = "/var/www/html/i3geo/aplicmap/geral1fedorav".$versao.".map";
  347 + }
  348 + if($f == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
  349 + $f = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map";
  350 + }
  351 + if($f == "") {
  352 + $f = $this->locaplic."/aplicmap/geral1v".$versao.".map";
  353 + }
  354 + }
  355 + }
  356 + $mapa = ms_newMapObj($f);
  357 + $n = $mapa->numlayers;
  358 + for($i=0;$i<$n;$i++){
  359 + $l = $mapa->getlayer($i);
  360 + $l->set("status",MS_DELETE);
  361 + }
  362 + $mapatemp = ms_newMapObj($mapfile);
  363 + $l = $mapatemp->getlayer(0);
  364 +
  365 + $l->set("status",MS_DEFAULT);
  366 + $novonome = str_replace(".map","completo.map",$mapfile);
  367 + //necessario para o kml
  368 + $mapa->setmetadata("ows_enable_request","*");
  369 + $listaepsg = "EPSG:4618 EPSG:4291 EPSG:4326 EPSG:22521 EPSG:22522 EPSG:22523 EPSG:22524 EPSG:22525 EPSG:29101 EPSG:29119 EPSG:29120 EPSG:29121 EPSG:29122 EPSG:29177 EPSG:29178 EPSG:29179 EPSG:29180 EPSG:29181 EPSG:29182 EPSG:29183 EPSG:29184 EPSG:29185";
  370 + $l->setmetadata("ows_srs",$listaepsg);
  371 + $temp = ms_newLayerObj($mapa,$l);
  372 + $mapa->save($novonome);
  373 + return $novonome;
  374 + }
310 function dadosMedidaVariavel($id_medida_variavel,$filtro="",$todasascolunas = 0,$agruparpor = ""){ 375 function dadosMedidaVariavel($id_medida_variavel,$filtro="",$todasascolunas = 0,$agruparpor = ""){
311 $sql = $this->sqlMedidaVariavel($id_medida_variavel,$todasascolunas,$agruparpor); 376 $sql = $this->sqlMedidaVariavel($id_medida_variavel,$todasascolunas,$agruparpor);
312 $sqlf = $sql["sql"]; 377 $sqlf = $sql["sql"];
@@ -332,10 +397,12 @@ class Metaestat{ @@ -332,10 +397,12 @@ class Metaestat{
332 return false; 397 return false;
333 } 398 }
334 function sumarioMedidaVariavel($id_medida_variavel,$filtro="",$agruparpor=""){ 399 function sumarioMedidaVariavel($id_medida_variavel,$filtro="",$agruparpor=""){
335 - $dados = $this->dadosMedidaVariavel($id_medida_variavel,$filtro,0);  
336 if(!empty($agruparpor)){ 400 if(!empty($agruparpor)){
337 $dados = $this->dadosMedidaVariavel($id_medida_variavel,$filtro,1); 401 $dados = $this->dadosMedidaVariavel($id_medida_variavel,$filtro,1);
338 } 402 }
  403 + else{
  404 + $dados = $this->dadosMedidaVariavel($id_medida_variavel,$filtro,0);
  405 + }
339 if($dados){ 406 if($dados){
340 $metaVariavel = $this->listaMedidaVariavel("",$id_medida_variavel); 407 $metaVariavel = $this->listaMedidaVariavel("",$id_medida_variavel);
341 $un = $this->listaUnidadeMedida($metaVariavel["codigo_unidade_medida"]); 408 $un = $this->listaUnidadeMedida($metaVariavel["codigo_unidade_medida"]);
@@ -513,14 +580,14 @@ class Metaestat{ @@ -513,14 +580,14 @@ class Metaestat{
513 580
514 Altera uma regiao 581 Altera uma regiao
515 */ 582 */
516 - function alteraTipoRegiao($codigo_tipo_regiao,$nome_tipo_regiao,$descricao_tipo_regiao,$esquemadb,$tabela,$colunageo,$data,$identificador,$colunanomeregiao,$srid){ 583 + function alteraTipoRegiao($codigo_tipo_regiao,$nome_tipo_regiao,$descricao_tipo_regiao,$esquemadb,$tabela,$colunageo,$colunacentroide,$data,$identificador,$colunanomeregiao,$srid){
517 try { 584 try {
518 if($codigo_tipo_regiao != ""){ 585 if($codigo_tipo_regiao != ""){
519 if($this->convUTF){ 586 if($this->convUTF){
520 $nome_tipo_regiao = utf8_encode($nome_tipo_regiao); 587 $nome_tipo_regiao = utf8_encode($nome_tipo_regiao);
521 $descricao_tipo_regiao = utf8_encode($descricao_tipo_regiao); 588 $descricao_tipo_regiao = utf8_encode($descricao_tipo_regiao);
522 } 589 }
523 - $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_tipo_regiao SET nome_tipo_regiao = '$nome_tipo_regiao',descricao_tipo_regiao = '$descricao_tipo_regiao',esquemadb = '$esquemadb',tabela = '$tabela',colunageo = '$colunageo',data = '$data',identificador = '$identificador',colunanomeregiao = '$colunanomeregiao', srid = '$srid' WHERE codigo_tipo_regiao = $codigo_tipo_regiao"); 590 + $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_tipo_regiao SET colunacentroide = '$colunacentroide',nome_tipo_regiao = '$nome_tipo_regiao',descricao_tipo_regiao = '$descricao_tipo_regiao',esquemadb = '$esquemadb',tabela = '$tabela',colunageo = '$colunageo',data = '$data',identificador = '$identificador',colunanomeregiao = '$colunanomeregiao', srid = '$srid' WHERE codigo_tipo_regiao = $codigo_tipo_regiao");
524 $retorna = $codigo_tipo_regiao; 591 $retorna = $codigo_tipo_regiao;
525 } 592 }
526 else{ 593 else{
@@ -565,13 +632,14 @@ class Metaestat{ @@ -565,13 +632,14 @@ class Metaestat{
565 632
566 Altera uma dimensao de uma medida ou cria uma nova 633 Altera uma dimensao de uma medida ou cria uma nova
567 */ 634 */
568 - function alteraClassificacaoMedida($id_medida_variavel,$id_classificacao="",$nome){ 635 + function alteraClassificacaoMedida($id_medida_variavel,$id_classificacao="",$nome="",$observacao=""){
569 try { 636 try {
570 if($id_classificacao != ""){ 637 if($id_classificacao != ""){
571 if($this->convUTF){ 638 if($this->convUTF){
572 $nome = utf8_encode($nome); 639 $nome = utf8_encode($nome);
  640 + $observacao = utf8_encode($observacao);
573 } 641 }
574 - $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_classificacao SET nome = '$nome' WHERE id_classificacao = $id_classificacao"); 642 + $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_classificacao SET observacao = '$observacao',nome = '$nome' WHERE id_classificacao = $id_classificacao");
575 $retorna = $id_dimensao_medida; 643 $retorna = $id_dimensao_medida;
576 } 644 }
577 else{ 645 else{
@@ -591,14 +659,14 @@ class Metaestat{ @@ -591,14 +659,14 @@ class Metaestat{
591 659
592 Altera uma classe de uma classificacao 660 Altera uma classe de uma classificacao
593 */ 661 */
594 - function alteraClasseClassificacao($id_classificacao,$id_classe="",$titulo="",$expressao="",$vermelho="",$verde="",$azul=""){ 662 + function alteraClasseClassificacao($id_classificacao,$id_classe="",$titulo="",$expressao="",$vermelho="",$verde="",$azul="",$tamanho="",$simbolo="",$overmelho="",$overde="",$oazul="",$otamanho=""){
595 try { 663 try {
596 if($id_classe != ""){ 664 if($id_classe != ""){
597 if($this->convUTF){ 665 if($this->convUTF){
598 - $nome = utf8_encode($nome); 666 + $titulo = utf8_encode($titulo);
599 } 667 }
600 //echo "UPDATE ".$this->esquemaadmin."i3geoestat_classe SET azul = '$azul', verde = '$verde', vermelho = '$vermelho',expressao = '$expressao', titulo = '$titulo' WHERE id_classe = $id_classe";exit; 668 //echo "UPDATE ".$this->esquemaadmin."i3geoestat_classe SET azul = '$azul', verde = '$verde', vermelho = '$vermelho',expressao = '$expressao', titulo = '$titulo' WHERE id_classe = $id_classe";exit;
601 - $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_classes SET azul = '$azul', verde = '$verde', vermelho = '$vermelho',expressao = '$expressao', titulo = '$titulo' WHERE id_classe = $id_classe"); 669 + $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_classes SET tamanho='$tamanho',simbolo='$simbolo',overmelho='$overmelho',overde='$overde',oazul='$oazul',otamanho='$otamanho',azul = '$azul', verde = '$verde', vermelho = '$vermelho',expressao = '$expressao', titulo = '$titulo' WHERE id_classe = $id_classe");
602 $retorna = $id_classe; 670 $retorna = $id_classe;
603 } 671 }
604 else{ 672 else{
admin/php/conexaomma.php
  Diff comments   View file @a21dbce
@@ -36,7 +36,7 @@ Arquivo: i3geo/admin/php/conexaomma.php @@ -36,7 +36,7 @@ Arquivo: i3geo/admin/php/conexaomma.php
36 try 36 try
37 { 37 {
38 $dbh = new PDO('pgsql:dbname=geodados;user=geodados;password=geodados;host=pgsql1.mma.gov.br'); 38 $dbh = new PDO('pgsql:dbname=geodados;user=geodados;password=geodados;host=pgsql1.mma.gov.br');
39 - $dbhw = new PDO('pgsql:dbname=geodados;user=pgsql;password=pgsql;host=pgsql1.mma.gov.br'); 39 + $dbhw = new PDO('');
40 } 40 }
41 catch (PDOException $e) 41 catch (PDOException $e)
42 { 42 {
admin/php/metaestat.php
  Diff comments   View file @a21dbce
@@ -263,7 +263,7 @@ switch (strtoupper($funcao)) @@ -263,7 +263,7 @@ switch (strtoupper($funcao))
263 $id_classificacao = $m->alteraClassificacaoMedida($id_medida_variavel); 263 $id_classificacao = $m->alteraClassificacaoMedida($id_medida_variavel);
264 } 264 }
265 else{ 265 else{
266 - $m->alteraClassificacaoMedida("",$id_classificacao,$nome); 266 + $m->alteraClassificacaoMedida("",$id_classificacao,$nome,$observacao);
267 } 267 }
268 retornaJSON($m->listaClassificacaoMedida($id_medida_variavel,$id_classificacao)); 268 retornaJSON($m->listaClassificacaoMedida($id_medida_variavel,$id_classificacao));
269 exit; 269 exit;
@@ -283,7 +283,7 @@ switch (strtoupper($funcao)) @@ -283,7 +283,7 @@ switch (strtoupper($funcao))
283 $id_classe = $m->alteraClasseClassificacao($id_classificacao); 283 $id_classe = $m->alteraClasseClassificacao($id_classificacao);
284 } 284 }
285 else{ 285 else{
286 - $m->alteraClasseClassificacao("",$id_classe,$titulo,$expressao,$vermelho,$verde,$azul); 286 + $m->alteraClasseClassificacao("",$id_classe,$titulo,$expressao,$vermelho,$verde,$azul,$tamanho,$simbolo,$overmelho,$overde,$oazul,$otamanho);
287 } 287 }
288 retornaJSON($m->listaClasseClassificacao($id_classificacao,$id_classe)); 288 retornaJSON($m->listaClasseClassificacao($id_classificacao,$id_classe));
289 exit; 289 exit;
@@ -343,7 +343,7 @@ switch (strtoupper($funcao)) @@ -343,7 +343,7 @@ switch (strtoupper($funcao))
343 $codigo_tipo_regiao = $m->alteraTipoRegiao(); 343 $codigo_tipo_regiao = $m->alteraTipoRegiao();
344 } 344 }
345 else{ 345 else{
346 - $codigo_tipo_regiao = $m->alteraTipoRegiao($codigo_tipo_regiao,$nome_tipo_regiao,$descricao_tipo_regiao,$esquemadb,$tabela,$colunageo,$data,$identificador,$colunanomeregiao,$srid); 346 + $codigo_tipo_regiao = $m->alteraTipoRegiao($codigo_tipo_regiao,$nome_tipo_regiao,$descricao_tipo_regiao,$esquemadb,$tabela,$colunageo,$colunacentroide,$data,$identificador,$colunanomeregiao,$srid);
347 } 347 }
348 retornaJSON($m->listaTipoRegiao($codigo_tipo_regiao)); 348 retornaJSON($m->listaTipoRegiao($codigo_tipo_regiao));
349 exit; 349 exit;
@@ -654,6 +654,27 @@ switch (strtoupper($funcao)) @@ -654,6 +654,27 @@ switch (strtoupper($funcao))
654 exit; 654 exit;
655 break; 655 break;
656 /* 656 /*
  657 + Valor: KMLMEDIDAVARIAVEL
  658 +
  659 + Gera um arquivo kml que pode ser aberto no googleearth
  660 +
  661 + */
  662 + case "KMLMEDIDAVARIAVEL":
  663 + $m = new Metaestat();
  664 + $r = $m->mapfileMedidaVariavel($id_medida_variavel,$filtro,$todasascolunas,$tipolayer,$titulolayer,$id_classificacao,$agruparpor);
  665 + //cria um mapfile completo, que inclui a camada no mapfile de inicializacao do i3geo
  666 + $mapfile = $m->mapfileCompleto($r["mapfile"]);
  667 + //define as variaveis necessarias ao pacote kmlserver
  668 + set_time_limit(0);
  669 + $_REQUEST["map"] = $mapfile;
  670 + $_REQUEST["typename"] = $r["layer"];
  671 + $_REQUEST["request"] = $formato;
  672 + //$_REQUEST["service"] = "icon";
  673 + include (__DIR__."/../../pacotes/kmlmapserver/classes/kmlserver.class.php");
  674 + $server = new KmlServer();
  675 + exit;
  676 + break;
  677 + /*
657 Valor: SUMARIOMEDIDAVARIAVEL 678 Valor: SUMARIOMEDIDAVARIAVEL
658 679
659 Sumario estatistico media de uma variavel 680 Sumario estatistico media de uma variavel
admin/sql/metaestat.sql
  Diff comments   View file @a21dbce
@@ -16,10 +16,10 @@ drop table i3geoestat_variavel; @@ -16,10 +16,10 @@ drop table i3geoestat_variavel;
16 16
17 /* create tables */ 17 /* create tables */
18 18
19 --- lista controlada de tipos de período de tempo  
20 -create table i3geoestat_tipo_periodo 19 +-- tabela com o nome e descrição de uma variável variável
  20 +create table i3geoestat_variavel
21 ( 21 (
22 - codigo_tipo_periodo integer not null unique primary key autoincrement, 22 + codigo_variavel integer not null unique primary key autoincrement,
23 nome text, 23 nome text,
24 descricao text 24 descricao text
25 ); 25 );
@@ -42,6 +42,27 @@ create table i3geoestat_conexao @@ -42,6 +42,27 @@ create table i3geoestat_conexao
42 ); 42 );
43 43
44 44
  45 +create table i3geoestat_unidade_medida
  46 +(
  47 + codigo_unidade_medida integer not null unique primary key autoincrement,
  48 + nome text,
  49 + sigla text,
  50 + -- o tipo de unidade permite que os valores sejam somados? (0 ou 1)
  51 + permitesoma integer default 0,
  52 + -- o tipo de unidade permite o cálculo de média aritmética? (0 ou 1)
  53 + permitemedia integer default 0
  54 +);
  55 +
  56 +
  57 +-- lista controlada de tipos de período de tempo
  58 +create table i3geoestat_tipo_periodo
  59 +(
  60 + codigo_tipo_periodo integer not null unique primary key autoincrement,
  61 + nome text,
  62 + descricao text
  63 +);
  64 +
  65 +
45 -- identifica as tabelas que possuem colunas com geometrias de determinado local ou região 66 -- identifica as tabelas que possuem colunas com geometrias de determinado local ou região
46 create table i3geoestat_tipo_regiao 67 create table i3geoestat_tipo_regiao
47 ( 68 (
@@ -63,32 +84,13 @@ create table i3geoestat_tipo_regiao @@ -63,32 +84,13 @@ create table i3geoestat_tipo_regiao
63 colunanomeregiao text, 84 colunanomeregiao text,
64 -- código srid correspondente à projeção cartográfica da coluna com a geometria 85 -- código srid correspondente à projeção cartográfica da coluna com a geometria
65 srid text default '4326', 86 srid text default '4326',
  87 + -- coluna que contém um ponto que representa cada local. pode ser o mesmo que colunageo
  88 + colunacentroide text,
66 foreign key (codigo_estat_conexao) 89 foreign key (codigo_estat_conexao)
67 references i3geoestat_conexao (codigo_estat_conexao) 90 references i3geoestat_conexao (codigo_estat_conexao)
68 ); 91 );
69 92
70 93
71 --- tabela com o nome e descrição de uma variável variável  
72 -create table i3geoestat_variavel  
73 -(  
74 - codigo_variavel integer not null unique primary key autoincrement,  
75 - nome text,  
76 - descricao text  
77 -);  
78 -  
79 -  
80 -create table i3geoestat_unidade_medida  
81 -(  
82 - codigo_unidade_medida integer not null unique primary key autoincrement,  
83 - nome text,  
84 - sigla text,  
85 - -- o tipo de unidade permite que os valores sejam somados? (0 ou 1)  
86 - permitesoma integer default 0,  
87 - -- o tipo de unidade permite o cálculo de média aritmética? (0 ou 1)  
88 - permitemedia integer default 0  
89 -);  
90 -  
91 -  
92 -- descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente 94 -- descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente
93 create table i3geoestat_medida_variavel 95 create table i3geoestat_medida_variavel
94 ( 96 (
@@ -110,16 +112,16 @@ create table i3geoestat_medida_variavel @@ -110,16 +112,16 @@ create table i3geoestat_medida_variavel
110 filtro text, 112 filtro text,
111 -- titulo da medida 113 -- titulo da medida
112 nomemedida text, 114 nomemedida text,
113 - foreign key (codigo_tipo_periodo)  
114 - references i3geoestat_tipo_periodo (codigo_tipo_periodo),  
115 - foreign key (codigo_tipo_regiao)  
116 - references i3geoestat_tipo_regiao (codigo_tipo_regiao),  
117 - foreign key (codigo_estat_conexao)  
118 - references i3geoestat_conexao (codigo_estat_conexao),  
119 foreign key (codigo_variavel) 115 foreign key (codigo_variavel)
120 references i3geoestat_variavel (codigo_variavel), 116 references i3geoestat_variavel (codigo_variavel),
  117 + foreign key (codigo_estat_conexao)
  118 + references i3geoestat_conexao (codigo_estat_conexao),
121 foreign key (codigo_unidade_medida) 119 foreign key (codigo_unidade_medida)
122 - references i3geoestat_unidade_medida (codigo_unidade_medida) 120 + references i3geoestat_unidade_medida (codigo_unidade_medida),
  121 + foreign key (codigo_tipo_periodo)
  122 + references i3geoestat_tipo_periodo (codigo_tipo_periodo),
  123 + foreign key (codigo_tipo_regiao)
  124 + references i3geoestat_tipo_regiao (codigo_tipo_regiao)
123 ); 125 );
124 126
125 127
@@ -129,6 +131,8 @@ create table i3geoestat_classificacao @@ -129,6 +131,8 @@ create table i3geoestat_classificacao
129 id_classificacao integer not null unique primary key autoincrement, 131 id_classificacao integer not null unique primary key autoincrement,
130 nome text, 132 nome text,
131 id_medida_variavel integer, 133 id_medida_variavel integer,
  134 + -- observacao sobre a classificação
  135 + observacao text,
132 foreign key (id_medida_variavel) 136 foreign key (id_medida_variavel)
133 references i3geoestat_medida_variavel (id_medida_variavel) 137 references i3geoestat_medida_variavel (id_medida_variavel)
134 ); 138 );
@@ -149,6 +153,18 @@ create table i3geoestat_classes @@ -149,6 +153,18 @@ create table i3geoestat_classes
149 -- componente b da cor utilizada para representar a classe 153 -- componente b da cor utilizada para representar a classe
150 azul text, 154 azul text,
151 id_classificacao integer, 155 id_classificacao integer,
  156 + -- tamanho do símbolo (item size do mapfile)
  157 + tamanho text,
  158 + -- symbol name
  159 + simbolo text,
  160 + -- componente vermelho da cor do outline
  161 + overmelho text,
  162 + -- componente verde da cor do outline
  163 + overde text,
  164 + -- componente azul da cor do outline
  165 + oazul text,
  166 + -- largura da linha do outline
  167 + otamanho text,
152 foreign key (id_classificacao) 168 foreign key (id_classificacao)
153 references i3geoestat_classificacao (id_classificacao) 169 references i3geoestat_classificacao (id_classificacao)
154 ); 170 );
admin/sql/metaestat_basededados.sql
  Diff comments   View file @a21dbce
@@ -8,11 +8,11 @@ INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUE @@ -8,11 +8,11 @@ INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUE
8 8
9 9
10 -- i3geoestat_tipo_regiao 10 -- i3geoestat_tipo_regiao
11 -INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid) VALUES ('1', 'Município', 'Limites municipais', '1', 'public', 'tb_ibge', 'the_geom', '', 'ibge', 'no_cidade', '4326'); 11 +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');
12 12
13 13
14 -- i3geoestat_unidade_medida 14 -- i3geoestat_unidade_medida
15 -INSERT INTO i3geoestat_unidade_medida (codigo_unidade_medida, nome, sigla, permitesoma, permitemedia) VALUES ('1', 'Unidade', 'Un', '', ''); 15 +INSERT INTO i3geoestat_unidade_medida (codigo_unidade_medida, nome, sigla, permitesoma, permitemedia) VALUES ('1', 'Unidade', 'Un', '1', '1');
16 16
17 17
18 -- i3geoestat_medida_variavel 18 -- i3geoestat_medida_variavel
@@ -28,3 +28,13 @@ INSERT INTO i3geoestat_dimensao_medida (id_dimensao_medida, coluna, nomedimensao @@ -28,3 +28,13 @@ INSERT INTO i3geoestat_dimensao_medida (id_dimensao_medida, coluna, nomedimensao
28 INSERT INTO i3geoestat_variavel (codigo_variavel, nome, descricao) VALUES ('1', 'Farmácias populares existentes', 'Quantidade de farmácias populares existentes'); 28 INSERT INTO i3geoestat_variavel (codigo_variavel, nome, descricao) VALUES ('1', 'Farmácias populares existentes', 'Quantidade de farmácias populares existentes');
29 29
30 30
  31 +-- i3geoestat_classificacao
  32 +INSERT INTO i3geoestat_classificacao (id_classificacao, nome, id_medida_variavel, observacao) VALUES ('1', 'Pela média', '1', '');
  33 +
  34 +
  35 +-- i3geoestat_classes
  36 +INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('1', '([nu_farm_funcionando] < 1)', 'Nenhuma', '255', '0', '0', '1', '', '', '0', '0', '0', '');
  37 +INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('2', '([nu_farm_funcionando] = 1)', 'Uma', '0', '255', '0', '1', '', '', '', '', '', '');
  38 +INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('3', '([nu_farm_funcionando] > 1)', 'Mais de uma', '0', '0', '255', '1', '', '', '', '', '', '');
  39 +
  40 +
aplicmap/geral1debianv6.map
  Diff comments   View file @a21dbce
@@ -48,7 +48,7 @@ MAP @@ -48,7 +48,7 @@ MAP
48 FORMATOPTION "QUANTIZE_COLORS=256" 48 FORMATOPTION "QUANTIZE_COLORS=256"
49 FORMATOPTION "INTERLACE=OFF" 49 FORMATOPTION "INTERLACE=OFF"
50 END 50 END
51 - 51 +
52 #OUTPUTFORMAT 52 #OUTPUTFORMAT
53 # NAME svg 53 # NAME svg
54 # MIMETYPE "image/svg+xml" 54 # MIMETYPE "image/svg+xml"
@@ -56,7 +56,7 @@ MAP @@ -56,7 +56,7 @@ MAP
56 ##FORMATOPTION "COMPRESSED_OUTPUT=TRUE" 56 ##FORMATOPTION "COMPRESSED_OUTPUT=TRUE"
57 ##FORMATOPTION "FULL_RESOLUTION=TRUE" 57 ##FORMATOPTION "FULL_RESOLUTION=TRUE"
58 #END 58 #END
59 - 59 +
60 OUTPUTFORMAT 60 OUTPUTFORMAT
61 NAME jpeg 61 NAME jpeg
62 DRIVER "AGG/JPEG" 62 DRIVER "AGG/JPEG"
@@ -75,7 +75,7 @@ MAP @@ -75,7 +75,7 @@ MAP
75 TRANSPARENT FALSE 75 TRANSPARENT FALSE
76 FORMATOPTION "INTERLACE=OFF" 76 FORMATOPTION "INTERLACE=OFF"
77 END 77 END
78 - 78 +
79 OUTPUTFORMAT 79 OUTPUTFORMAT
80 NAME png2 80 NAME png2
81 MIMETYPE image/png 81 MIMETYPE image/png
@@ -85,7 +85,7 @@ MAP @@ -85,7 +85,7 @@ MAP
85 TRANSPARENT TRUE 85 TRANSPARENT TRUE
86 FORMATOPTION "INTERLACE=OFF" 86 FORMATOPTION "INTERLACE=OFF"
87 END 87 END
88 - 88 +
89 89
90 PROJECTION 90 PROJECTION
91 "+proj=longlat +ellps=GRS67 +no_defs" 91 "+proj=longlat +ellps=GRS67 +no_defs"
@@ -121,7 +121,7 @@ MAP @@ -121,7 +121,7 @@ MAP
121 REFERENCE 121 REFERENCE
122 COLOR -1 -1 -1 122 COLOR -1 -1 -1
123 EXTENT -75.5728 -37.4751 -30.525 7.57273 123 EXTENT -75.5728 -37.4751 -30.525 7.57273
124 - #-79.8713331401 -41.7736536401 -26.2264448599 11.8712346401 124 + #-79.8713331401 -41.7736536401 -26.2264448599 11.8712346401
125 #edite o caminho se a aplicacao for movida de lugar 125 #edite o caminho se a aplicacao for movida de lugar
126 IMAGE "/var/www/i3geo/imagens/referencia1.png" 126 IMAGE "/var/www/i3geo/imagens/referencia1.png"
127 OUTLINECOLOR -1 -1 -1 127 OUTLINECOLOR -1 -1 -1
@@ -249,7 +249,7 @@ MAP @@ -249,7 +249,7 @@ MAP
249 # END # CLASS 249 # END # CLASS
250 #END # LAYER 250 #END # LAYER
251 251
252 - 252 +
253 LAYER 253 LAYER
254 METADATA 254 METADATA
255 #"TEMA" "NAO" 255 #"TEMA" "NAO"
documentacao/diagramas/metaestat.erm
  Diff comments   View file @a21dbce
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 </page_setting> 11 </page_setting>
12 <category_index>0</category_index> 12 <category_index>0</category_index>
13 <zoom>1.0</zoom> 13 <zoom>1.0</zoom>
14 - <x>0</x>  
15 - <y>-2</y> 14 + <x>-343</x>
  15 + <y>3</y>
16 <default_color> 16 <default_color>
17 <r>230</r> 17 <r>230</r>
18 <g>230</g> 18 <g>230</g>
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 </connections> 110 </connections>
111 <display>false</display> 111 <display>false</display>
112 <creation_date>2012-07-17 15:03:53</creation_date> 112 <creation_date>2012-07-17 15:03:53</creation_date>
113 - <updated_date>2012-08-02 11:58:33</updated_date> 113 + <updated_date>2012-08-07 00:45:40</updated_date>
114 <model_property> 114 <model_property>
115 <name>Project Name</name> 115 <name>Project Name</name>
116 <value></value> 116 <value></value>
@@ -268,13 +268,26 @@ @@ -268,13 +268,26 @@
268 <array_dimension>null</array_dimension> 268 <array_dimension>null</array_dimension>
269 <unsigned>false</unsigned> 269 <unsigned>false</unsigned>
270 <args></args> 270 <args></args>
  271 + <description>Coluna que contém um ponto que representa cada local. Pode ser o mesmo que colunageo</description>
  272 + <logical_name>colunacentroide</logical_name>
  273 + <physical_name>colunacentroide</physical_name>
  274 + <type>text</type>
  275 + </word>
  276 + <word>
  277 + <id>10</id>
  278 + <length>null</length>
  279 + <decimal>null</decimal>
  280 + <array>false</array>
  281 + <array_dimension>null</array_dimension>
  282 + <unsigned>false</unsigned>
  283 + <args></args>
271 <description>Coluna com a geometria da região</description> 284 <description>Coluna com a geometria da região</description>
272 <logical_name>colunageo</logical_name> 285 <logical_name>colunageo</logical_name>
273 <physical_name>colunageo</physical_name> 286 <physical_name>colunageo</physical_name>
274 <type>text</type> 287 <type>text</type>
275 </word> 288 </word>
276 <word> 289 <word>
277 - <id>10</id> 290 + <id>11</id>
278 <length>null</length> 291 <length>null</length>
279 <decimal>null</decimal> 292 <decimal>null</decimal>
280 <array>false</array> 293 <array>false</array>
@@ -287,7 +300,7 @@ @@ -287,7 +300,7 @@
287 <type>text</type> 300 <type>text</type>
288 </word> 301 </word>
289 <word> 302 <word>
290 - <id>11</id> 303 + <id>12</id>
291 <length>null</length> 304 <length>null</length>
292 <decimal>null</decimal> 305 <decimal>null</decimal>
293 <array>false</array> 306 <array>false</array>
@@ -300,7 +313,7 @@ @@ -300,7 +313,7 @@
300 <type>text</type> 313 <type>text</type>
301 </word> 314 </word>
302 <word> 315 <word>
303 - <id>12</id> 316 + <id>13</id>
304 <length>null</length> 317 <length>null</length>
305 <decimal>null</decimal> 318 <decimal>null</decimal>
306 <array>false</array> 319 <array>false</array>
@@ -313,7 +326,7 @@ @@ -313,7 +326,7 @@
313 <type>text</type> 326 <type>text</type>
314 </word> 327 </word>
315 <word> 328 <word>
316 - <id>13</id> 329 + <id>14</id>
317 <length>null</length> 330 <length>null</length>
318 <decimal>null</decimal> 331 <decimal>null</decimal>
319 <array>false</array> 332 <array>false</array>
@@ -326,7 +339,7 @@ @@ -326,7 +339,7 @@
326 <type>text</type> 339 <type>text</type>
327 </word> 340 </word>
328 <word> 341 <word>
329 - <id>14</id> 342 + <id>15</id>
330 <length>null</length> 343 <length>null</length>
331 <decimal>null</decimal> 344 <decimal>null</decimal>
332 <array>false</array> 345 <array>false</array>
@@ -339,7 +352,7 @@ @@ -339,7 +352,7 @@
339 <type>text</type> 352 <type>text</type>
340 </word> 353 </word>
341 <word> 354 <word>
342 - <id>15</id> 355 + <id>16</id>
343 <length>null</length> 356 <length>null</length>
344 <decimal>null</decimal> 357 <decimal>null</decimal>
345 <array>false</array> 358 <array>false</array>
@@ -352,7 +365,7 @@ @@ -352,7 +365,7 @@
352 <type>text</type> 365 <type>text</type>
353 </word> 366 </word>
354 <word> 367 <word>
355 - <id>16</id> 368 + <id>17</id>
356 <length>null</length> 369 <length>null</length>
357 <decimal>null</decimal> 370 <decimal>null</decimal>
358 <array>false</array> 371 <array>false</array>
@@ -365,7 +378,7 @@ @@ -365,7 +378,7 @@
365 <type>text</type> 378 <type>text</type>
366 </word> 379 </word>
367 <word> 380 <word>
368 - <id>17</id> 381 + <id>18</id>
369 <length>null</length> 382 <length>null</length>
370 <decimal>null</decimal> 383 <decimal>null</decimal>
371 <array>false</array> 384 <array>false</array>
@@ -378,7 +391,7 @@ @@ -378,7 +391,7 @@
378 <type>text</type> 391 <type>text</type>
379 </word> 392 </word>
380 <word> 393 <word>
381 - <id>18</id> 394 + <id>19</id>
382 <length>null</length> 395 <length>null</length>
383 <decimal>null</decimal> 396 <decimal>null</decimal>
384 <array>false</array> 397 <array>false</array>
@@ -391,7 +404,7 @@ @@ -391,7 +404,7 @@
391 <type>text</type> 404 <type>text</type>
392 </word> 405 </word>
393 <word> 406 <word>
394 - <id>19</id> 407 + <id>20</id>
395 <length>null</length> 408 <length>null</length>
396 <decimal>null</decimal> 409 <decimal>null</decimal>
397 <array>false</array> 410 <array>false</array>
@@ -404,7 +417,7 @@ @@ -404,7 +417,7 @@
404 <type>text</type> 417 <type>text</type>
405 </word> 418 </word>
406 <word> 419 <word>
407 - <id>20</id> 420 + <id>21</id>
408 <length>null</length> 421 <length>null</length>
409 <decimal>null</decimal> 422 <decimal>null</decimal>
410 <array>false</array> 423 <array>false</array>
@@ -417,7 +430,7 @@ @@ -417,7 +430,7 @@
417 <type>text</type> 430 <type>text</type>
418 </word> 431 </word>
419 <word> 432 <word>
420 - <id>21</id> 433 + <id>22</id>
421 <length>null</length> 434 <length>null</length>
422 <decimal>null</decimal> 435 <decimal>null</decimal>
423 <array>false</array> 436 <array>false</array>
@@ -430,7 +443,7 @@ @@ -430,7 +443,7 @@
430 <type>text</type> 443 <type>text</type>
431 </word> 444 </word>
432 <word> 445 <word>
433 - <id>22</id> 446 + <id>23</id>
434 <length>null</length> 447 <length>null</length>
435 <decimal>null</decimal> 448 <decimal>null</decimal>
436 <array>false</array> 449 <array>false</array>
@@ -443,7 +456,7 @@ @@ -443,7 +456,7 @@
443 <type>text</type> 456 <type>text</type>
444 </word> 457 </word>
445 <word> 458 <word>
446 - <id>23</id> 459 + <id>24</id>
447 <length>null</length> 460 <length>null</length>
448 <decimal>null</decimal> 461 <decimal>null</decimal>
449 <array>false</array> 462 <array>false</array>
@@ -456,7 +469,7 @@ @@ -456,7 +469,7 @@
456 <type>integer</type> 469 <type>integer</type>
457 </word> 470 </word>
458 <word> 471 <word>
459 - <id>24</id> 472 + <id>25</id>
460 <length>null</length> 473 <length>null</length>
461 <decimal>null</decimal> 474 <decimal>null</decimal>
462 <array>false</array> 475 <array>false</array>
@@ -469,7 +482,7 @@ @@ -469,7 +482,7 @@
469 <type>integer</type> 482 <type>integer</type>
470 </word> 483 </word>
471 <word> 484 <word>
472 - <id>25</id> 485 + <id>26</id>
473 <length>null</length> 486 <length>null</length>
474 <decimal>null</decimal> 487 <decimal>null</decimal>
475 <array>false</array> 488 <array>false</array>
@@ -482,7 +495,7 @@ @@ -482,7 +495,7 @@
482 <type>integer</type> 495 <type>integer</type>
483 </word> 496 </word>
484 <word> 497 <word>
485 - <id>26</id> 498 + <id>27</id>
486 <length>null</length> 499 <length>null</length>
487 <decimal>null</decimal> 500 <decimal>null</decimal>
488 <array>false</array> 501 <array>false</array>
@@ -495,7 +508,7 @@ @@ -495,7 +508,7 @@
495 <type>integer</type> 508 <type>integer</type>
496 </word> 509 </word>
497 <word> 510 <word>
498 - <id>27</id> 511 + <id>28</id>
499 <length>null</length> 512 <length>null</length>
500 <decimal>null</decimal> 513 <decimal>null</decimal>
501 <array>false</array> 514 <array>false</array>
@@ -508,7 +521,7 @@ @@ -508,7 +521,7 @@
508 <type>integer</type> 521 <type>integer</type>
509 </word> 522 </word>
510 <word> 523 <word>
511 - <id>28</id> 524 + <id>29</id>
512 <length>null</length> 525 <length>null</length>
513 <decimal>null</decimal> 526 <decimal>null</decimal>
514 <array>false</array> 527 <array>false</array>
@@ -521,7 +534,7 @@ @@ -521,7 +534,7 @@
521 <type>text</type> 534 <type>text</type>
522 </word> 535 </word>
523 <word> 536 <word>
524 - <id>29</id> 537 + <id>30</id>
525 <length>null</length> 538 <length>null</length>
526 <decimal>null</decimal> 539 <decimal>null</decimal>
527 <array>false</array> 540 <array>false</array>
@@ -534,7 +547,7 @@ @@ -534,7 +547,7 @@
534 <type>text</type> 547 <type>text</type>
535 </word> 548 </word>
536 <word> 549 <word>
537 - <id>30</id> 550 + <id>31</id>
538 <length>null</length> 551 <length>null</length>
539 <decimal>null</decimal> 552 <decimal>null</decimal>
540 <array>false</array> 553 <array>false</array>
@@ -547,7 +560,7 @@ @@ -547,7 +560,7 @@
547 <type>text</type> 560 <type>text</type>
548 </word> 561 </word>
549 <word> 562 <word>
550 - <id>31</id> 563 + <id>32</id>
551 <length>null</length> 564 <length>null</length>
552 <decimal>null</decimal> 565 <decimal>null</decimal>
553 <array>false</array> 566 <array>false</array>
@@ -560,7 +573,7 @@ @@ -560,7 +573,7 @@
560 <type>text</type> 573 <type>text</type>
561 </word> 574 </word>
562 <word> 575 <word>
563 - <id>32</id> 576 + <id>33</id>
564 <length>null</length> 577 <length>null</length>
565 <decimal>null</decimal> 578 <decimal>null</decimal>
566 <array>false</array> 579 <array>false</array>
@@ -573,7 +586,7 @@ @@ -573,7 +586,7 @@
573 <type>text</type> 586 <type>text</type>
574 </word> 587 </word>
575 <word> 588 <word>
576 - <id>33</id> 589 + <id>34</id>
577 <length>null</length> 590 <length>null</length>
578 <decimal>null</decimal> 591 <decimal>null</decimal>
579 <array>false</array> 592 <array>false</array>
@@ -586,7 +599,7 @@ @@ -586,7 +599,7 @@
586 <type>text</type> 599 <type>text</type>
587 </word> 600 </word>
588 <word> 601 <word>
589 - <id>34</id> 602 + <id>35</id>
590 <length>null</length> 603 <length>null</length>
591 <decimal>null</decimal> 604 <decimal>null</decimal>
592 <array>false</array> 605 <array>false</array>
@@ -599,7 +612,72 @@ @@ -599,7 +612,72 @@
599 <type>text</type> 612 <type>text</type>
600 </word> 613 </word>
601 <word> 614 <word>
602 - <id>35</id> 615 + <id>36</id>
  616 + <length>null</length>
  617 + <decimal>null</decimal>
  618 + <array>false</array>
  619 + <array_dimension>null</array_dimension>
  620 + <unsigned>false</unsigned>
  621 + <args></args>
  622 + <description>Componente azul da cor do outline</description>
  623 + <logical_name>oazul</logical_name>
  624 + <physical_name>oazul</physical_name>
  625 + <type>text</type>
  626 + </word>
  627 + <word>
  628 + <id>37</id>
  629 + <length>null</length>
  630 + <decimal>null</decimal>
  631 + <array>false</array>
  632 + <array_dimension>null</array_dimension>
  633 + <unsigned>false</unsigned>
  634 + <args></args>
  635 + <description>Observacao sobre a classificação</description>
  636 + <logical_name>observacao</logical_name>
  637 + <physical_name>observacao</physical_name>
  638 + <type>text</type>
  639 + </word>
  640 + <word>
  641 + <id>38</id>
  642 + <length>null</length>
  643 + <decimal>null</decimal>
  644 + <array>false</array>
  645 + <array_dimension>null</array_dimension>
  646 + <unsigned>false</unsigned>
  647 + <args></args>
  648 + <description>Largura da linha do outline</description>
  649 + <logical_name>otamanho</logical_name>
  650 + <physical_name>otamanho</physical_name>
  651 + <type>text</type>
  652 + </word>
  653 + <word>
  654 + <id>39</id>
  655 + <length>null</length>
  656 + <decimal>null</decimal>
  657 + <array>false</array>
  658 + <array_dimension>null</array_dimension>
  659 + <unsigned>false</unsigned>
  660 + <args></args>
  661 + <description>Componente verde da cor do outline</description>
  662 + <logical_name>overde</logical_name>
  663 + <physical_name>overde</physical_name>
  664 + <type>text</type>
  665 + </word>
  666 + <word>
  667 + <id>40</id>
  668 + <length>null</length>
  669 + <decimal>null</decimal>
  670 + <array>false</array>
  671 + <array_dimension>null</array_dimension>
  672 + <unsigned>false</unsigned>
  673 + <args></args>
  674 + <description>Componente vermelho da cor do outline</description>
  675 + <logical_name>overmelho</logical_name>
  676 + <physical_name>overmelho</physical_name>
  677 + <type>text</type>
  678 + </word>
  679 + <word>
  680 + <id>41</id>
603 <length>null</length> 681 <length>null</length>
604 <decimal>null</decimal> 682 <decimal>null</decimal>
605 <array>false</array> 683 <array>false</array>
@@ -612,7 +690,7 @@ @@ -612,7 +690,7 @@
612 <type>integer</type> 690 <type>integer</type>
613 </word> 691 </word>
614 <word> 692 <word>
615 - <id>36</id> 693 + <id>42</id>
616 <length>null</length> 694 <length>null</length>
617 <decimal>null</decimal> 695 <decimal>null</decimal>
618 <array>false</array> 696 <array>false</array>
@@ -625,7 +703,7 @@ @@ -625,7 +703,7 @@
625 <type>integer</type> 703 <type>integer</type>
626 </word> 704 </word>
627 <word> 705 <word>
628 - <id>37</id> 706 + <id>43</id>
629 <length>null</length> 707 <length>null</length>
630 <decimal>null</decimal> 708 <decimal>null</decimal>
631 <array>false</array> 709 <array>false</array>
@@ -638,7 +716,7 @@ @@ -638,7 +716,7 @@
638 <type>text</type> 716 <type>text</type>
639 </word> 717 </word>
640 <word> 718 <word>
641 - <id>38</id> 719 + <id>44</id>
642 <length>null</length> 720 <length>null</length>
643 <decimal>null</decimal> 721 <decimal>null</decimal>
644 <array>false</array> 722 <array>false</array>
@@ -651,7 +729,7 @@ @@ -651,7 +729,7 @@
651 <type>text</type> 729 <type>text</type>
652 </word> 730 </word>
653 <word> 731 <word>
654 - <id>39</id> 732 + <id>45</id>
655 <length>null</length> 733 <length>null</length>
656 <decimal>null</decimal> 734 <decimal>null</decimal>
657 <array>false</array> 735 <array>false</array>
@@ -664,7 +742,20 @@ @@ -664,7 +742,20 @@
664 <type>text</type> 742 <type>text</type>
665 </word> 743 </word>
666 <word> 744 <word>
667 - <id>40</id> 745 + <id>46</id>
  746 + <length>null</length>
  747 + <decimal>null</decimal>
  748 + <array>false</array>
  749 + <array_dimension>null</array_dimension>
  750 + <unsigned>false</unsigned>
  751 + <args></args>
  752 + <description>Symbol name</description>
  753 + <logical_name>simbolo</logical_name>
  754 + <physical_name>simbolo</physical_name>
  755 + <type>text</type>
  756 + </word>
  757 + <word>
  758 + <id>47</id>
668 <length>null</length> 759 <length>null</length>
669 <decimal>null</decimal> 760 <decimal>null</decimal>
670 <array>false</array> 761 <array>false</array>
@@ -677,7 +768,7 @@ @@ -677,7 +768,7 @@
677 <type>text</type> 768 <type>text</type>
678 </word> 769 </word>
679 <word> 770 <word>
680 - <id>41</id> 771 + <id>48</id>
681 <length>null</length> 772 <length>null</length>
682 <decimal>null</decimal> 773 <decimal>null</decimal>
683 <array>false</array> 774 <array>false</array>
@@ -690,7 +781,7 @@ @@ -690,7 +781,7 @@
690 <type>text</type> 781 <type>text</type>
691 </word> 782 </word>
692 <word> 783 <word>
693 - <id>42</id> 784 + <id>49</id>
694 <length>null</length> 785 <length>null</length>
695 <decimal>null</decimal> 786 <decimal>null</decimal>
696 <array>false</array> 787 <array>false</array>
@@ -703,7 +794,20 @@ @@ -703,7 +794,20 @@
703 <type>text</type> 794 <type>text</type>
704 </word> 795 </word>
705 <word> 796 <word>
706 - <id>43</id> 797 + <id>50</id>
  798 + <length>null</length>
  799 + <decimal>null</decimal>
  800 + <array>false</array>
  801 + <array_dimension>null</array_dimension>
  802 + <unsigned>false</unsigned>
  803 + <args></args>
  804 + <description>Tamanho do símbolo (item size do mapfile)</description>
  805 + <logical_name>tamanho</logical_name>
  806 + <physical_name>tamanho</physical_name>
  807 + <type>text</type>
  808 + </word>
  809 + <word>
  810 + <id>51</id>
707 <length>null</length> 811 <length>null</length>
708 <decimal>null</decimal> 812 <decimal>null</decimal>
709 <array>false</array> 813 <array>false</array>
@@ -716,7 +820,7 @@ @@ -716,7 +820,7 @@
716 <type>text</type> 820 <type>text</type>
717 </word> 821 </word>
718 <word> 822 <word>
719 - <id>44</id> 823 + <id>52</id>
720 <length>null</length> 824 <length>null</length>
721 <decimal>null</decimal> 825 <decimal>null</decimal>
722 <array>false</array> 826 <array>false</array>
@@ -729,7 +833,7 @@ @@ -729,7 +833,7 @@
729 <type>text</type> 833 <type>text</type>
730 </word> 834 </word>
731 <word> 835 <word>
732 - <id>45</id> 836 + <id>53</id>
733 <length>null</length> 837 <length>null</length>
734 <decimal>null</decimal> 838 <decimal>null</decimal>
735 <array>false</array> 839 <array>false</array>
@@ -742,7 +846,7 @@ @@ -742,7 +846,7 @@
742 <type>text</type> 846 <type>text</type>
743 </word> 847 </word>
744 <word> 848 <word>
745 - <id>46</id> 849 + <id>54</id>
746 <length>null</length> 850 <length>null</length>
747 <decimal>null</decimal> 851 <decimal>null</decimal>
748 <array>false</array> 852 <array>false</array>
@@ -896,7 +1000,7 @@ @@ -896,7 +1000,7 @@
896 </sequence> 1000 </sequence>
897 </normal_column> 1001 </normal_column>
898 <normal_column> 1002 <normal_column>
899 - <word_id>39</word_id> 1003 + <word_id>45</word_id>
900 <id>2</id> 1004 <id>2</id>
901 <description></description> 1005 <description></description>
902 <unique_key_name></unique_key_name> 1006 <unique_key_name></unique_key_name>
@@ -928,7 +1032,7 @@ @@ -928,7 +1032,7 @@
928 </sequence> 1032 </sequence>
929 </normal_column> 1033 </normal_column>
930 <normal_column> 1034 <normal_column>
931 - <word_id>36</word_id> 1035 + <word_id>42</word_id>
932 <id>3</id> 1036 <id>3</id>
933 <description></description> 1037 <description></description>
934 <unique_key_name></unique_key_name> 1038 <unique_key_name></unique_key_name>
@@ -960,7 +1064,7 @@ @@ -960,7 +1064,7 @@
960 </sequence> 1064 </sequence>
961 </normal_column> 1065 </normal_column>
962 <normal_column> 1066 <normal_column>
963 - <word_id>35</word_id> 1067 + <word_id>41</word_id>
964 <id>4</id> 1068 <id>4</id>
965 <description></description> 1069 <description></description>
966 <unique_key_name></unique_key_name> 1070 <unique_key_name></unique_key_name>
@@ -1002,50 +1106,28 @@ @@ -1002,50 +1106,28 @@
1002 </table> 1106 </table>
1003 <table> 1107 <table>
1004 <id>4</id> 1108 <id>4</id>
1005 - <height>275</height>  
1006 - <width>292</width> 1109 + <height>107</height>
  1110 + <width>280</width>
1007 <font_name>Ubuntu</font_name> 1111 <font_name>Ubuntu</font_name>
1008 <font_size>9</font_size> 1112 <font_size>9</font_size>
1009 - <x>-336</x>  
1010 - <y>236</y> 1113 + <x>1</x>
  1114 + <y>188</y>
1011 <color> 1115 <color>
1012 <r>255</r> 1116 <r>255</r>
1013 <g>165</g> 1117 <g>165</g>
1014 <b>0</b> 1118 <b>0</b>
1015 </color> 1119 </color>
1016 <connections> 1120 <connections>
1017 - <comment_connection>  
1018 - <id>0</id>  
1019 - <source>0</source>  
1020 - <target>4</target>  
1021 - </comment_connection>  
1022 - <relation>  
1023 - <id>1</id>  
1024 - <source>6</source>  
1025 - <target>4</target>  
1026 - <child_cardinality>1..n</child_cardinality>  
1027 - <parent_cardinality>1</parent_cardinality>  
1028 - <reference_for_pk>true</reference_for_pk>  
1029 - <name></name>  
1030 - <on_delete_action>RESTRICT</on_delete_action>  
1031 - <on_update_action>RESTRICT</on_update_action>  
1032 - <source_xp>-1</source_xp>  
1033 - <source_yp>-1</source_yp>  
1034 - <target_xp>-1</target_xp>  
1035 - <target_yp>-1</target_yp>  
1036 - <referenced_column>null</referenced_column>  
1037 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
1038 - </relation>  
1039 </connections> 1121 </connections>
1040 - <physical_name>i3geoestat_tipo_regiao</physical_name>  
1041 - <logical_name>i3geoestat_tipo_regiao</logical_name>  
1042 - <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description> 1122 + <physical_name>i3geoestat_tipo_periodo</physical_name>
  1123 + <logical_name>i3geoestat_tipo_periodo</logical_name>
  1124 + <description>Lista controlada de tipos de período de tempo</description>
1043 <constraint></constraint> 1125 <constraint></constraint>
1044 <primary_key_name></primary_key_name> 1126 <primary_key_name></primary_key_name>
1045 <option></option> 1127 <option></option>
1046 <columns> 1128 <columns>
1047 <normal_column> 1129 <normal_column>
1048 - <word_id>5</word_id> 1130 + <word_id>4</word_id>
1049 <id>5</id> 1131 <id>5</id>
1050 <description></description> 1132 <description></description>
1051 <unique_key_name></unique_key_name> 1133 <unique_key_name></unique_key_name>
@@ -1077,7 +1159,7 @@ @@ -1077,7 +1159,7 @@
1077 </sequence> 1159 </sequence>
1078 </normal_column> 1160 </normal_column>
1079 <normal_column> 1161 <normal_column>
1080 - <word_id>34</word_id> 1162 + <word_id>32</word_id>
1081 <id>6</id> 1163 <id>6</id>
1082 <description></description> 1164 <description></description>
1083 <unique_key_name></unique_key_name> 1165 <unique_key_name></unique_key_name>
@@ -1109,7 +1191,7 @@ @@ -1109,7 +1191,7 @@
1109 </sequence> 1191 </sequence>
1110 </normal_column> 1192 </normal_column>
1111 <normal_column> 1193 <normal_column>
1112 - <word_id>17</word_id> 1194 + <word_id>16</word_id>
1113 <id>7</id> 1195 <id>7</id>
1114 <description></description> 1196 <description></description>
1115 <unique_key_name></unique_key_name> 1197 <unique_key_name></unique_key_name>
@@ -1140,10 +1222,40 @@ @@ -1140,10 +1222,40 @@
1140 <decimal_size>0</decimal_size> 1222 <decimal_size>0</decimal_size>
1141 </sequence> 1223 </sequence>
1142 </normal_column> 1224 </normal_column>
  1225 + </columns>
  1226 + <indexes>
  1227 + </indexes>
  1228 + <complex_unique_key_list>
  1229 + </complex_unique_key_list>
  1230 + <table_properties>
  1231 + <schema></schema>
  1232 + </table_properties>
  1233 + </table>
  1234 + <table>
  1235 + <id>5</id>
  1236 + <height>107</height>
  1237 + <width>250</width>
  1238 + <font_name>Ubuntu</font_name>
  1239 + <font_size>9</font_size>
  1240 + <x>373</x>
  1241 + <y>-2</y>
  1242 + <color>
  1243 + <r>160</r>
  1244 + <g>32</g>
  1245 + <b>240</b>
  1246 + </color>
  1247 + <connections>
  1248 + </connections>
  1249 + <physical_name>i3geoestat_variavel</physical_name>
  1250 + <logical_name>i3geoestat_variavel</logical_name>
  1251 + <description>Tabela com o nome e descrição de uma variável variável</description>
  1252 + <constraint></constraint>
  1253 + <primary_key_name></primary_key_name>
  1254 + <option></option>
  1255 + <columns>
1143 <normal_column> 1256 <normal_column>
  1257 + <word_id>7</word_id>
1144 <id>8</id> 1258 <id>8</id>
1145 - <referenced_column>19</referenced_column>  
1146 - <relation>1</relation>  
1147 <description></description> 1259 <description></description>
1148 <unique_key_name></unique_key_name> 1260 <unique_key_name></unique_key_name>
1149 <logical_name></logical_name> 1261 <logical_name></logical_name>
@@ -1151,11 +1263,11 @@ @@ -1151,11 +1263,11 @@
1151 <type>integer</type> 1263 <type>integer</type>
1152 <constraint></constraint> 1264 <constraint></constraint>
1153 <default_value></default_value> 1265 <default_value></default_value>
1154 - <auto_increment>false</auto_increment>  
1155 - <foreign_key>true</foreign_key>  
1156 - <not_null>false</not_null>  
1157 - <primary_key>false</primary_key>  
1158 - <unique_key>false</unique_key> 1266 + <auto_increment>true</auto_increment>
  1267 + <foreign_key>false</foreign_key>
  1268 + <not_null>true</not_null>
  1269 + <primary_key>true</primary_key>
  1270 + <unique_key>true</unique_key>
1159 <character_set></character_set> 1271 <character_set></character_set>
1160 <collation></collation> 1272 <collation></collation>
1161 <sequence> 1273 <sequence>
@@ -1174,7 +1286,7 @@ @@ -1174,7 +1286,7 @@
1174 </sequence> 1286 </sequence>
1175 </normal_column> 1287 </normal_column>
1176 <normal_column> 1288 <normal_column>
1177 - <word_id>19</word_id> 1289 + <word_id>30</word_id>
1178 <id>9</id> 1290 <id>9</id>
1179 <description></description> 1291 <description></description>
1180 <unique_key_name></unique_key_name> 1292 <unique_key_name></unique_key_name>
@@ -1206,7 +1318,7 @@ @@ -1206,7 +1318,7 @@
1206 </sequence> 1318 </sequence>
1207 </normal_column> 1319 </normal_column>
1208 <normal_column> 1320 <normal_column>
1209 - <word_id>42</word_id> 1321 + <word_id>17</word_id>
1210 <id>10</id> 1322 <id>10</id>
1211 <description></description> 1323 <description></description>
1212 <unique_key_name></unique_key_name> 1324 <unique_key_name></unique_key_name>
@@ -1237,23 +1349,139 @@ @@ -1237,23 +1349,139 @@
1237 <decimal_size>0</decimal_size> 1349 <decimal_size>0</decimal_size>
1238 </sequence> 1350 </sequence>
1239 </normal_column> 1351 </normal_column>
1240 - <normal_column>  
1241 - <word_id>9</word_id>  
1242 - <id>11</id>  
1243 - <description></description>  
1244 - <unique_key_name></unique_key_name>  
1245 - <logical_name></logical_name>  
1246 - <physical_name></physical_name>  
1247 - <type>text</type>  
1248 - <constraint></constraint>  
1249 - <default_value></default_value>  
1250 - <auto_increment>false</auto_increment>  
1251 - <foreign_key>false</foreign_key>  
1252 - <not_null>false</not_null>  
1253 - <primary_key>false</primary_key>  
1254 - <unique_key>false</unique_key>  
1255 - <character_set></character_set>  
1256 - <collation></collation> 1352 + </columns>
  1353 + <indexes>
  1354 + </indexes>
  1355 + <complex_unique_key_list>
  1356 + </complex_unique_key_list>
  1357 + <table_properties>
  1358 + <schema></schema>
  1359 + </table_properties>
  1360 + </table>
  1361 + <table>
  1362 + <id>6</id>
  1363 + <height>339</height>
  1364 + <width>292</width>
  1365 + <font_name>Ubuntu</font_name>
  1366 + <font_size>9</font_size>
  1367 + <x>353</x>
  1368 + <y>155</y>
  1369 + <color>
  1370 + <r>160</r>
  1371 + <g>32</g>
  1372 + <b>240</b>
  1373 + </color>
  1374 + <connections>
  1375 + <relation>
  1376 + <id>0</id>
  1377 + <source>5</source>
  1378 + <target>6</target>
  1379 + <child_cardinality>1..n</child_cardinality>
  1380 + <parent_cardinality>1</parent_cardinality>
  1381 + <reference_for_pk>true</reference_for_pk>
  1382 + <name></name>
  1383 + <on_delete_action>RESTRICT</on_delete_action>
  1384 + <on_update_action>RESTRICT</on_update_action>
  1385 + <source_xp>-1</source_xp>
  1386 + <source_yp>-1</source_yp>
  1387 + <target_xp>-1</target_xp>
  1388 + <target_yp>-1</target_yp>
  1389 + <referenced_column>null</referenced_column>
  1390 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1391 + </relation>
  1392 + <relation>
  1393 + <id>1</id>
  1394 + <source>12</source>
  1395 + <target>6</target>
  1396 + <child_cardinality>1..n</child_cardinality>
  1397 + <parent_cardinality>1</parent_cardinality>
  1398 + <reference_for_pk>true</reference_for_pk>
  1399 + <name></name>
  1400 + <on_delete_action>RESTRICT</on_delete_action>
  1401 + <on_update_action>RESTRICT</on_update_action>
  1402 + <source_xp>-1</source_xp>
  1403 + <source_yp>-1</source_yp>
  1404 + <target_xp>-1</target_xp>
  1405 + <target_yp>-1</target_yp>
  1406 + <referenced_column>null</referenced_column>
  1407 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1408 + </relation>
  1409 + <relation>
  1410 + <id>2</id>
  1411 + <source>3</source>
  1412 + <target>6</target>
  1413 + <child_cardinality>1..n</child_cardinality>
  1414 + <parent_cardinality>1</parent_cardinality>
  1415 + <reference_for_pk>true</reference_for_pk>
  1416 + <name></name>
  1417 + <on_delete_action>RESTRICT</on_delete_action>
  1418 + <on_update_action>RESTRICT</on_update_action>
  1419 + <source_xp>-1</source_xp>
  1420 + <source_yp>-1</source_yp>
  1421 + <target_xp>-1</target_xp>
  1422 + <target_yp>-1</target_yp>
  1423 + <referenced_column>null</referenced_column>
  1424 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1425 + </relation>
  1426 + <relation>
  1427 + <id>3</id>
  1428 + <source>4</source>
  1429 + <target>6</target>
  1430 + <child_cardinality>1..n</child_cardinality>
  1431 + <parent_cardinality>1</parent_cardinality>
  1432 + <reference_for_pk>true</reference_for_pk>
  1433 + <name></name>
  1434 + <on_delete_action>RESTRICT</on_delete_action>
  1435 + <on_update_action>RESTRICT</on_update_action>
  1436 + <source_xp>-1</source_xp>
  1437 + <source_yp>-1</source_yp>
  1438 + <target_xp>-1</target_xp>
  1439 + <target_yp>-1</target_yp>
  1440 + <referenced_column>null</referenced_column>
  1441 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1442 + </relation>
  1443 + <relation>
  1444 + <id>4</id>
  1445 + <source>11</source>
  1446 + <target>6</target>
  1447 + <child_cardinality>1..n</child_cardinality>
  1448 + <parent_cardinality>1</parent_cardinality>
  1449 + <reference_for_pk>true</reference_for_pk>
  1450 + <name></name>
  1451 + <on_delete_action>RESTRICT</on_delete_action>
  1452 + <on_update_action>RESTRICT</on_update_action>
  1453 + <source_xp>-1</source_xp>
  1454 + <source_yp>-1</source_yp>
  1455 + <target_xp>-1</target_xp>
  1456 + <target_yp>-1</target_yp>
  1457 + <referenced_column>null</referenced_column>
  1458 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1459 + </relation>
  1460 + </connections>
  1461 + <physical_name>i3geoestat_medida_variavel</physical_name>
  1462 + <logical_name>i3geoestat_medida_variavel</logical_name>
  1463 + <description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description>
  1464 + <constraint></constraint>
  1465 + <primary_key_name></primary_key_name>
  1466 + <option></option>
  1467 + <columns>
  1468 + <normal_column>
  1469 + <word_id>28</word_id>
  1470 + <id>11</id>
  1471 + <description></description>
  1472 + <unique_key_name></unique_key_name>
  1473 + <logical_name></logical_name>
  1474 + <physical_name></physical_name>
  1475 + <type>integer</type>
  1476 + <constraint></constraint>
  1477 + <default_value></default_value>
  1478 + <auto_increment>true</auto_increment>
  1479 + <foreign_key>false</foreign_key>
  1480 + <not_null>true</not_null>
  1481 + <primary_key>true</primary_key>
  1482 + <unique_key>true</unique_key>
  1483 + <character_set></character_set>
  1484 + <collation></collation>
1257 <sequence> 1485 <sequence>
1258 <name></name> 1486 <name></name>
1259 <schema></schema> 1487 <schema></schema>
@@ -1270,17 +1498,18 @@ @@ -1270,17 +1498,18 @@
1270 </sequence> 1498 </sequence>
1271 </normal_column> 1499 </normal_column>
1272 <normal_column> 1500 <normal_column>
1273 - <word_id>13</word_id>  
1274 <id>12</id> 1501 <id>12</id>
  1502 + <referenced_column>0</referenced_column>
  1503 + <relation>2</relation>
1275 <description></description> 1504 <description></description>
1276 <unique_key_name></unique_key_name> 1505 <unique_key_name></unique_key_name>
1277 <logical_name></logical_name> 1506 <logical_name></logical_name>
1278 <physical_name></physical_name> 1507 <physical_name></physical_name>
1279 - <type>text</type> 1508 + <type>integer</type>
1280 <constraint></constraint> 1509 <constraint></constraint>
1281 <default_value></default_value> 1510 <default_value></default_value>
1282 <auto_increment>false</auto_increment> 1511 <auto_increment>false</auto_increment>
1283 - <foreign_key>false</foreign_key> 1512 + <foreign_key>true</foreign_key>
1284 <not_null>false</not_null> 1513 <not_null>false</not_null>
1285 <primary_key>false</primary_key> 1514 <primary_key>false</primary_key>
1286 <unique_key>false</unique_key> 1515 <unique_key>false</unique_key>
@@ -1302,8 +1531,9 @@ @@ -1302,8 +1531,9 @@
1302 </sequence> 1531 </sequence>
1303 </normal_column> 1532 </normal_column>
1304 <normal_column> 1533 <normal_column>
1305 - <word_id>23</word_id>  
1306 <id>13</id> 1534 <id>13</id>
  1535 + <referenced_column>5</referenced_column>
  1536 + <relation>3</relation>
1307 <description></description> 1537 <description></description>
1308 <unique_key_name></unique_key_name> 1538 <unique_key_name></unique_key_name>
1309 <logical_name></logical_name> 1539 <logical_name></logical_name>
@@ -1312,7 +1542,7 @@ @@ -1312,7 +1542,7 @@
1312 <constraint></constraint> 1542 <constraint></constraint>
1313 <default_value></default_value> 1543 <default_value></default_value>
1314 <auto_increment>false</auto_increment> 1544 <auto_increment>false</auto_increment>
1315 - <foreign_key>false</foreign_key> 1545 + <foreign_key>true</foreign_key>
1316 <not_null>false</not_null> 1546 <not_null>false</not_null>
1317 <primary_key>false</primary_key> 1547 <primary_key>false</primary_key>
1318 <unique_key>false</unique_key> 1548 <unique_key>false</unique_key>
@@ -1334,17 +1564,18 @@ @@ -1334,17 +1564,18 @@
1334 </sequence> 1564 </sequence>
1335 </normal_column> 1565 </normal_column>
1336 <normal_column> 1566 <normal_column>
1337 - <word_id>11</word_id>  
1338 <id>14</id> 1567 <id>14</id>
  1568 + <referenced_column>8</referenced_column>
  1569 + <relation>0</relation>
1339 <description></description> 1570 <description></description>
1340 <unique_key_name></unique_key_name> 1571 <unique_key_name></unique_key_name>
1341 <logical_name></logical_name> 1572 <logical_name></logical_name>
1342 <physical_name></physical_name> 1573 <physical_name></physical_name>
1343 - <type>text</type> 1574 + <type>integer</type>
1344 <constraint></constraint> 1575 <constraint></constraint>
1345 <default_value></default_value> 1576 <default_value></default_value>
1346 <auto_increment>false</auto_increment> 1577 <auto_increment>false</auto_increment>
1347 - <foreign_key>false</foreign_key> 1578 + <foreign_key>true</foreign_key>
1348 <not_null>false</not_null> 1579 <not_null>false</not_null>
1349 <primary_key>false</primary_key> 1580 <primary_key>false</primary_key>
1350 <unique_key>false</unique_key> 1581 <unique_key>false</unique_key>
@@ -1366,17 +1597,18 @@ @@ -1366,17 +1597,18 @@
1366 </sequence> 1597 </sequence>
1367 </normal_column> 1598 </normal_column>
1368 <normal_column> 1599 <normal_column>
1369 - <word_id>40</word_id>  
1370 <id>15</id> 1600 <id>15</id>
  1601 + <referenced_column>46</referenced_column>
  1602 + <relation>4</relation>
1371 <description></description> 1603 <description></description>
1372 <unique_key_name></unique_key_name> 1604 <unique_key_name></unique_key_name>
1373 <logical_name></logical_name> 1605 <logical_name></logical_name>
1374 <physical_name></physical_name> 1606 <physical_name></physical_name>
1375 - <type>text</type> 1607 + <type>integer</type>
1376 <constraint></constraint> 1608 <constraint></constraint>
1377 - <default_value>4326</default_value> 1609 + <default_value></default_value>
1378 <auto_increment>false</auto_increment> 1610 <auto_increment>false</auto_increment>
1379 - <foreign_key>false</foreign_key> 1611 + <foreign_key>true</foreign_key>
1380 <not_null>false</not_null> 1612 <not_null>false</not_null>
1381 <primary_key>false</primary_key> 1613 <primary_key>false</primary_key>
1382 <unique_key>false</unique_key> 1614 <unique_key>false</unique_key>
@@ -1397,40 +1629,10 @@ @@ -1397,40 +1629,10 @@
1397 <decimal_size>0</decimal_size> 1629 <decimal_size>0</decimal_size>
1398 </sequence> 1630 </sequence>
1399 </normal_column> 1631 </normal_column>
1400 - </columns>  
1401 - <indexes>  
1402 - </indexes>  
1403 - <complex_unique_key_list>  
1404 - </complex_unique_key_list>  
1405 - <table_properties>  
1406 - <schema></schema>  
1407 - </table_properties>  
1408 - </table>  
1409 - <table>  
1410 - <id>5</id>  
1411 - <height>107</height>  
1412 - <width>280</width>  
1413 - <font_name>Ubuntu</font_name>  
1414 - <font_size>9</font_size>  
1415 - <x>1</x>  
1416 - <y>188</y>  
1417 - <color>  
1418 - <r>255</r>  
1419 - <g>165</g>  
1420 - <b>0</b>  
1421 - </color>  
1422 - <connections>  
1423 - </connections>  
1424 - <physical_name>i3geoestat_tipo_periodo</physical_name>  
1425 - <logical_name>i3geoestat_tipo_periodo</logical_name>  
1426 - <description>Lista controlada de tipos de período de tempo</description>  
1427 - <constraint></constraint>  
1428 - <primary_key_name></primary_key_name>  
1429 - <option></option>  
1430 - <columns>  
1431 <normal_column> 1632 <normal_column>
1432 - <word_id>4</word_id>  
1433 <id>16</id> 1633 <id>16</id>
  1634 + <referenced_column>58</referenced_column>
  1635 + <relation>1</relation>
1434 <description></description> 1636 <description></description>
1435 <unique_key_name></unique_key_name> 1637 <unique_key_name></unique_key_name>
1436 <logical_name></logical_name> 1638 <logical_name></logical_name>
@@ -1438,11 +1640,11 @@ @@ -1438,11 +1640,11 @@
1438 <type>integer</type> 1640 <type>integer</type>
1439 <constraint></constraint> 1641 <constraint></constraint>
1440 <default_value></default_value> 1642 <default_value></default_value>
1441 - <auto_increment>true</auto_increment>  
1442 - <foreign_key>false</foreign_key>  
1443 - <not_null>true</not_null>  
1444 - <primary_key>true</primary_key>  
1445 - <unique_key>true</unique_key> 1643 + <auto_increment>false</auto_increment>
  1644 + <foreign_key>true</foreign_key>
  1645 + <not_null>false</not_null>
  1646 + <primary_key>false</primary_key>
  1647 + <unique_key>false</unique_key>
1446 <character_set></character_set> 1648 <character_set></character_set>
1447 <collation></collation> 1649 <collation></collation>
1448 <sequence> 1650 <sequence>
@@ -1461,7 +1663,7 @@ @@ -1461,7 +1663,7 @@
1461 </sequence> 1663 </sequence>
1462 </normal_column> 1664 </normal_column>
1463 <normal_column> 1665 <normal_column>
1464 - <word_id>28</word_id> 1666 + <word_id>19</word_id>
1465 <id>17</id> 1667 <id>17</id>
1466 <description></description> 1668 <description></description>
1467 <unique_key_name></unique_key_name> 1669 <unique_key_name></unique_key_name>
@@ -1493,7 +1695,7 @@ @@ -1493,7 +1695,7 @@
1493 </sequence> 1695 </sequence>
1494 </normal_column> 1696 </normal_column>
1495 <normal_column> 1697 <normal_column>
1496 - <word_id>16</word_id> 1698 + <word_id>48</word_id>
1497 <id>18</id> 1699 <id>18</id>
1498 <description></description> 1700 <description></description>
1499 <unique_key_name></unique_key_name> 1701 <unique_key_name></unique_key_name>
@@ -1524,52 +1726,21 @@ @@ -1524,52 +1726,21 @@
1524 <decimal_size>0</decimal_size> 1726 <decimal_size>0</decimal_size>
1525 </sequence> 1727 </sequence>
1526 </normal_column> 1728 </normal_column>
1527 - </columns>  
1528 - <indexes>  
1529 - </indexes>  
1530 - <complex_unique_key_list>  
1531 - </complex_unique_key_list>  
1532 - <table_properties>  
1533 - <schema></schema>  
1534 - </table_properties>  
1535 - </table>  
1536 - <table>  
1537 - <id>6</id>  
1538 - <height>170</height>  
1539 - <width>292</width>  
1540 - <font_name>Ubuntu</font_name>  
1541 - <font_size>9</font_size>  
1542 - <x>7</x>  
1543 - <y>453</y>  
1544 - <color>  
1545 - <r>255</r>  
1546 - <g>165</g>  
1547 - <b>0</b>  
1548 - </color>  
1549 - <connections>  
1550 - </connections>  
1551 - <physical_name>i3geoestat_conexao</physical_name>  
1552 - <logical_name>i3geoestat_conexao</logical_name>  
1553 - <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados</description>  
1554 - <constraint></constraint>  
1555 - <primary_key_name></primary_key_name>  
1556 - <option></option>  
1557 - <columns>  
1558 <normal_column> 1729 <normal_column>
1559 - <word_id>3</word_id> 1730 + <word_id>13</word_id>
1560 <id>19</id> 1731 <id>19</id>
1561 <description></description> 1732 <description></description>
1562 <unique_key_name></unique_key_name> 1733 <unique_key_name></unique_key_name>
1563 <logical_name></logical_name> 1734 <logical_name></logical_name>
1564 <physical_name></physical_name> 1735 <physical_name></physical_name>
1565 - <type>integer</type> 1736 + <type>text</type>
1566 <constraint></constraint> 1737 <constraint></constraint>
1567 <default_value></default_value> 1738 <default_value></default_value>
1568 - <auto_increment>true</auto_increment> 1739 + <auto_increment>false</auto_increment>
1569 <foreign_key>false</foreign_key> 1740 <foreign_key>false</foreign_key>
1570 - <not_null>true</not_null>  
1571 - <primary_key>true</primary_key>  
1572 - <unique_key>true</unique_key> 1741 + <not_null>false</not_null>
  1742 + <primary_key>false</primary_key>
  1743 + <unique_key>false</unique_key>
1573 <character_set></character_set> 1744 <character_set></character_set>
1574 <collation></collation> 1745 <collation></collation>
1575 <sequence> 1746 <sequence>
@@ -1588,7 +1759,7 @@ @@ -1588,7 +1759,7 @@
1588 </sequence> 1759 </sequence>
1589 </normal_column> 1760 </normal_column>
1590 <normal_column> 1761 <normal_column>
1591 - <word_id>2</word_id> 1762 + <word_id>11</word_id>
1592 <id>20</id> 1763 <id>20</id>
1593 <description></description> 1764 <description></description>
1594 <unique_key_name></unique_key_name> 1765 <unique_key_name></unique_key_name>
@@ -1652,7 +1823,7 @@ @@ -1652,7 +1823,7 @@
1652 </sequence> 1823 </sequence>
1653 </normal_column> 1824 </normal_column>
1654 <normal_column> 1825 <normal_column>
1655 - <word_id>37</word_id> 1826 + <word_id>34</word_id>
1656 <id>22</id> 1827 <id>22</id>
1657 <description></description> 1828 <description></description>
1658 <unique_key_name></unique_key_name> 1829 <unique_key_name></unique_key_name>
@@ -1683,70 +1854,6 @@ @@ -1683,70 +1854,6 @@
1683 <decimal_size>0</decimal_size> 1854 <decimal_size>0</decimal_size>
1684 </sequence> 1855 </sequence>
1685 </normal_column> 1856 </normal_column>
1686 - <normal_column>  
1687 - <word_id>44</word_id>  
1688 - <id>23</id>  
1689 - <description></description>  
1690 - <unique_key_name></unique_key_name>  
1691 - <logical_name></logical_name>  
1692 - <physical_name></physical_name>  
1693 - <type>text</type>  
1694 - <constraint></constraint>  
1695 - <default_value></default_value>  
1696 - <auto_increment>false</auto_increment>  
1697 - <foreign_key>false</foreign_key>  
1698 - <not_null>false</not_null>  
1699 - <primary_key>false</primary_key>  
1700 - <unique_key>false</unique_key>  
1701 - <character_set></character_set>  
1702 - <collation></collation>  
1703 - <sequence>  
1704 - <name></name>  
1705 - <schema></schema>  
1706 - <increment></increment>  
1707 - <min_value></min_value>  
1708 - <max_value></max_value>  
1709 - <start></start>  
1710 - <cache></cache>  
1711 - <cycle>false</cycle>  
1712 - <order>false</order>  
1713 - <description></description>  
1714 - <data_type></data_type>  
1715 - <decimal_size>0</decimal_size>  
1716 - </sequence>  
1717 - </normal_column>  
1718 - <normal_column>  
1719 - <word_id>38</word_id>  
1720 - <id>24</id>  
1721 - <description></description>  
1722 - <unique_key_name></unique_key_name>  
1723 - <logical_name></logical_name>  
1724 - <physical_name></physical_name>  
1725 - <type>text</type>  
1726 - <constraint></constraint>  
1727 - <default_value></default_value>  
1728 - <auto_increment>false</auto_increment>  
1729 - <foreign_key>false</foreign_key>  
1730 - <not_null>false</not_null>  
1731 - <primary_key>false</primary_key>  
1732 - <unique_key>false</unique_key>  
1733 - <character_set></character_set>  
1734 - <collation></collation>  
1735 - <sequence>  
1736 - <name></name>  
1737 - <schema></schema>  
1738 - <increment></increment>  
1739 - <min_value></min_value>  
1740 - <max_value></max_value>  
1741 - <start></start>  
1742 - <cache></cache>  
1743 - <cycle>false</cycle>  
1744 - <order>false</order>  
1745 - <description></description>  
1746 - <data_type></data_type>  
1747 - <decimal_size>0</decimal_size>  
1748 - </sequence>  
1749 - </normal_column>  
1750 </columns> 1857 </columns>
1751 <indexes> 1858 <indexes>
1752 </indexes> 1859 </indexes>
@@ -1758,29 +1865,51 @@ @@ -1758,29 +1865,51 @@
1758 </table> 1865 </table>
1759 <table> 1866 <table>
1760 <id>7</id> 1867 <id>7</id>
1761 - <height>107</height>  
1762 - <width>250</width> 1868 + <height>170</height>
  1869 + <width>292</width>
1763 <font_name>Ubuntu</font_name> 1870 <font_name>Ubuntu</font_name>
1764 <font_size>9</font_size> 1871 <font_size>9</font_size>
1765 - <x>373</x>  
1766 - <y>-2</y> 1872 + <x>387</x>
  1873 + <y>533</y>
1767 <color> 1874 <color>
1768 <r>160</r> 1875 <r>160</r>
1769 <g>32</g> 1876 <g>32</g>
1770 <b>240</b> 1877 <b>240</b>
1771 </color> 1878 </color>
1772 <connections> 1879 <connections>
  1880 + <relation>
  1881 + <id>5</id>
  1882 + <source>6</source>
  1883 + <target>7</target>
  1884 + <child_cardinality>1..n</child_cardinality>
  1885 + <parent_cardinality>1</parent_cardinality>
  1886 + <reference_for_pk>true</reference_for_pk>
  1887 + <name></name>
  1888 + <on_delete_action>RESTRICT</on_delete_action>
  1889 + <on_update_action>RESTRICT</on_update_action>
  1890 + <source_xp>-1</source_xp>
  1891 + <source_yp>-1</source_yp>
  1892 + <target_xp>-1</target_xp>
  1893 + <target_yp>-1</target_yp>
  1894 + <referenced_column>null</referenced_column>
  1895 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1896 + </relation>
  1897 + <comment_connection>
  1898 + <id>6</id>
  1899 + <source>8</source>
  1900 + <target>7</target>
  1901 + </comment_connection>
1773 </connections> 1902 </connections>
1774 - <physical_name>i3geoestat_variavel</physical_name>  
1775 - <logical_name>i3geoestat_variavel</logical_name>  
1776 - <description>Tabela com o nome e descrição de uma variável variável</description> 1903 + <physical_name>i3geoestat_dimensao_medida</physical_name>
  1904 + <logical_name>i3geoestat_dimensao_medida</logical_name>
  1905 + <description></description>
1777 <constraint></constraint> 1906 <constraint></constraint>
1778 <primary_key_name></primary_key_name> 1907 <primary_key_name></primary_key_name>
1779 <option></option> 1908 <option></option>
1780 <columns> 1909 <columns>
1781 <normal_column> 1910 <normal_column>
1782 - <word_id>7</word_id>  
1783 - <id>25</id> 1911 + <word_id>27</word_id>
  1912 + <id>23</id>
1784 <description></description> 1913 <description></description>
1785 <unique_key_name></unique_key_name> 1914 <unique_key_name></unique_key_name>
1786 <logical_name></logical_name> 1915 <logical_name></logical_name>
@@ -1811,8 +1940,8 @@ @@ -1811,8 +1940,8 @@
1811 </sequence> 1940 </sequence>
1812 </normal_column> 1941 </normal_column>
1813 <normal_column> 1942 <normal_column>
1814 - <word_id>30</word_id>  
1815 - <id>26</id> 1943 + <word_id>8</word_id>
  1944 + <id>24</id>
1816 <description></description> 1945 <description></description>
1817 <unique_key_name></unique_key_name> 1946 <unique_key_name></unique_key_name>
1818 <logical_name></logical_name> 1947 <logical_name></logical_name>
@@ -1843,8 +1972,8 @@ @@ -1843,8 +1972,8 @@
1843 </sequence> 1972 </sequence>
1844 </normal_column> 1973 </normal_column>
1845 <normal_column> 1974 <normal_column>
1846 - <word_id>15</word_id>  
1847 - <id>27</id> 1975 + <word_id>33</word_id>
  1976 + <id>25</id>
1848 <description></description> 1977 <description></description>
1849 <unique_key_name></unique_key_name> 1978 <unique_key_name></unique_key_name>
1850 <logical_name></logical_name> 1979 <logical_name></logical_name>
@@ -1874,137 +2003,21 @@ @@ -1874,137 +2003,21 @@
1874 <decimal_size>0</decimal_size> 2003 <decimal_size>0</decimal_size>
1875 </sequence> 2004 </sequence>
1876 </normal_column> 2005 </normal_column>
1877 - </columns>  
1878 - <indexes>  
1879 - </indexes>  
1880 - <complex_unique_key_list>  
1881 - </complex_unique_key_list>  
1882 - <table_properties>  
1883 - <schema></schema>  
1884 - </table_properties>  
1885 - </table>  
1886 - <table>  
1887 - <id>8</id>  
1888 - <height>339</height>  
1889 - <width>292</width>  
1890 - <font_name>Ubuntu</font_name>  
1891 - <font_size>9</font_size>  
1892 - <x>353</x>  
1893 - <y>155</y>  
1894 - <color>  
1895 - <r>160</r>  
1896 - <g>32</g>  
1897 - <b>240</b>  
1898 - </color>  
1899 - <connections>  
1900 - <relation>  
1901 - <id>2</id>  
1902 - <source>5</source>  
1903 - <target>8</target>  
1904 - <child_cardinality>1..n</child_cardinality>  
1905 - <parent_cardinality>1</parent_cardinality>  
1906 - <reference_for_pk>true</reference_for_pk>  
1907 - <name></name>  
1908 - <on_delete_action>RESTRICT</on_delete_action>  
1909 - <on_update_action>RESTRICT</on_update_action>  
1910 - <source_xp>-1</source_xp>  
1911 - <source_yp>-1</source_yp>  
1912 - <target_xp>-1</target_xp>  
1913 - <target_yp>-1</target_yp>  
1914 - <referenced_column>null</referenced_column>  
1915 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
1916 - </relation>  
1917 - <relation>  
1918 - <id>3</id>  
1919 - <source>4</source>  
1920 - <target>8</target>  
1921 - <child_cardinality>1..n</child_cardinality>  
1922 - <parent_cardinality>1</parent_cardinality>  
1923 - <reference_for_pk>true</reference_for_pk>  
1924 - <name></name>  
1925 - <on_delete_action>RESTRICT</on_delete_action>  
1926 - <on_update_action>RESTRICT</on_update_action>  
1927 - <source_xp>-1</source_xp>  
1928 - <source_yp>-1</source_yp>  
1929 - <target_xp>-1</target_xp>  
1930 - <target_yp>-1</target_yp>  
1931 - <referenced_column>null</referenced_column>  
1932 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
1933 - </relation>  
1934 - <relation>  
1935 - <id>4</id>  
1936 - <source>6</source>  
1937 - <target>8</target>  
1938 - <child_cardinality>1..n</child_cardinality>  
1939 - <parent_cardinality>1</parent_cardinality>  
1940 - <reference_for_pk>true</reference_for_pk>  
1941 - <name></name>  
1942 - <on_delete_action>RESTRICT</on_delete_action>  
1943 - <on_update_action>RESTRICT</on_update_action>  
1944 - <source_xp>-1</source_xp>  
1945 - <source_yp>-1</source_yp>  
1946 - <target_xp>-1</target_xp>  
1947 - <target_yp>-1</target_yp>  
1948 - <referenced_column>null</referenced_column>  
1949 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
1950 - </relation>  
1951 - <relation>  
1952 - <id>5</id>  
1953 - <source>7</source>  
1954 - <target>8</target>  
1955 - <child_cardinality>1..n</child_cardinality>  
1956 - <parent_cardinality>1</parent_cardinality>  
1957 - <reference_for_pk>true</reference_for_pk>  
1958 - <name></name>  
1959 - <on_delete_action>RESTRICT</on_delete_action>  
1960 - <on_update_action>RESTRICT</on_update_action>  
1961 - <source_xp>-1</source_xp>  
1962 - <source_yp>-1</source_yp>  
1963 - <target_xp>-1</target_xp>  
1964 - <target_yp>-1</target_yp>  
1965 - <referenced_column>null</referenced_column>  
1966 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
1967 - </relation>  
1968 - <relation>  
1969 - <id>6</id>  
1970 - <source>3</source>  
1971 - <target>8</target>  
1972 - <child_cardinality>1..n</child_cardinality>  
1973 - <parent_cardinality>1</parent_cardinality>  
1974 - <reference_for_pk>true</reference_for_pk>  
1975 - <name></name>  
1976 - <on_delete_action>RESTRICT</on_delete_action>  
1977 - <on_update_action>RESTRICT</on_update_action>  
1978 - <source_xp>-1</source_xp>  
1979 - <source_yp>-1</source_yp>  
1980 - <target_xp>-1</target_xp>  
1981 - <target_yp>-1</target_yp>  
1982 - <referenced_column>null</referenced_column>  
1983 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
1984 - </relation>  
1985 - </connections>  
1986 - <physical_name>i3geoestat_medida_variavel</physical_name>  
1987 - <logical_name>i3geoestat_medida_variavel</logical_name>  
1988 - <description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description>  
1989 - <constraint></constraint>  
1990 - <primary_key_name></primary_key_name>  
1991 - <option></option>  
1992 - <columns>  
1993 <normal_column> 2006 <normal_column>
1994 - <word_id>27</word_id>  
1995 - <id>28</id> 2007 + <word_id>15</word_id>
  2008 + <id>26</id>
1996 <description></description> 2009 <description></description>
1997 <unique_key_name></unique_key_name> 2010 <unique_key_name></unique_key_name>
1998 <logical_name></logical_name> 2011 <logical_name></logical_name>
1999 <physical_name></physical_name> 2012 <physical_name></physical_name>
2000 - <type>integer</type> 2013 + <type>text</type>
2001 <constraint></constraint> 2014 <constraint></constraint>
2002 <default_value></default_value> 2015 <default_value></default_value>
2003 - <auto_increment>true</auto_increment> 2016 + <auto_increment>false</auto_increment>
2004 <foreign_key>false</foreign_key> 2017 <foreign_key>false</foreign_key>
2005 - <not_null>true</not_null>  
2006 - <primary_key>true</primary_key>  
2007 - <unique_key>true</unique_key> 2018 + <not_null>false</not_null>
  2019 + <primary_key>false</primary_key>
  2020 + <unique_key>false</unique_key>
2008 <character_set></character_set> 2021 <character_set></character_set>
2009 <collation></collation> 2022 <collation></collation>
2010 <sequence> 2023 <sequence>
@@ -2023,18 +2036,17 @@ @@ -2023,18 +2036,17 @@
2023 </sequence> 2036 </sequence>
2024 </normal_column> 2037 </normal_column>
2025 <normal_column> 2038 <normal_column>
2026 - <id>29</id>  
2027 - <referenced_column>0</referenced_column>  
2028 - <relation>6</relation> 2039 + <word_id>0</word_id>
  2040 + <id>27</id>
2029 <description></description> 2041 <description></description>
2030 <unique_key_name></unique_key_name> 2042 <unique_key_name></unique_key_name>
2031 <logical_name></logical_name> 2043 <logical_name></logical_name>
2032 <physical_name></physical_name> 2044 <physical_name></physical_name>
2033 <type>integer</type> 2045 <type>integer</type>
2034 <constraint></constraint> 2046 <constraint></constraint>
2035 - <default_value></default_value> 2047 + <default_value>0</default_value>
2036 <auto_increment>false</auto_increment> 2048 <auto_increment>false</auto_increment>
2037 - <foreign_key>true</foreign_key> 2049 + <foreign_key>false</foreign_key>
2038 <not_null>false</not_null> 2050 <not_null>false</not_null>
2039 <primary_key>false</primary_key> 2051 <primary_key>false</primary_key>
2040 <unique_key>false</unique_key> 2052 <unique_key>false</unique_key>
@@ -2056,9 +2068,9 @@ @@ -2056,9 +2068,9 @@
2056 </sequence> 2068 </sequence>
2057 </normal_column> 2069 </normal_column>
2058 <normal_column> 2070 <normal_column>
2059 - <id>30</id>  
2060 - <referenced_column>16</referenced_column>  
2061 - <relation>2</relation> 2071 + <id>28</id>
  2072 + <referenced_column>11</referenced_column>
  2073 + <relation>5</relation>
2062 <description></description> 2074 <description></description>
2063 <unique_key_name></unique_key_name> 2075 <unique_key_name></unique_key_name>
2064 <logical_name></logical_name> 2076 <logical_name></logical_name>
@@ -2088,29 +2100,93 @@ @@ -2088,29 +2100,93 @@
2088 <decimal_size>0</decimal_size> 2100 <decimal_size>0</decimal_size>
2089 </sequence> 2101 </sequence>
2090 </normal_column> 2102 </normal_column>
2091 - <normal_column>  
2092 - <id>31</id>  
2093 - <referenced_column>25</referenced_column>  
2094 - <relation>5</relation>  
2095 - <description></description>  
2096 - <unique_key_name></unique_key_name>  
2097 - <logical_name></logical_name>  
2098 - <physical_name></physical_name>  
2099 - <type>integer</type>  
2100 - <constraint></constraint>  
2101 - <default_value></default_value>  
2102 - <auto_increment>false</auto_increment>  
2103 - <foreign_key>true</foreign_key>  
2104 - <not_null>false</not_null>  
2105 - <primary_key>false</primary_key>  
2106 - <unique_key>false</unique_key>  
2107 - <character_set></character_set>  
2108 - <collation></collation>  
2109 - <sequence>  
2110 - <name></name>  
2111 - <schema></schema>  
2112 - <increment></increment>  
2113 - <min_value></min_value> 2103 + </columns>
  2104 + <indexes>
  2105 + </indexes>
  2106 + <complex_unique_key_list>
  2107 + </complex_unique_key_list>
  2108 + <table_properties>
  2109 + <schema></schema>
  2110 + </table_properties>
  2111 + </table>
  2112 + <note>
  2113 + <id>8</id>
  2114 + <height>111</height>
  2115 + <width>188</width>
  2116 + <font_name>Ubuntu</font_name>
  2117 + <font_size>9</font_size>
  2118 + <x>748</x>
  2119 + <y>594</y>
  2120 + <color>
  2121 + <r>255</r>
  2122 + <g>255</g>
  2123 + <b>255</b>
  2124 + </color>
  2125 + <connections>
  2126 + </connections>
  2127 + <text>As colunas obtidas da junção de medida_variavel com tipo_regiao podem ser utilizadas para definir uma dimensão</text>
  2128 + </note>
  2129 + <table>
  2130 + <id>9</id>
  2131 + <height>107</height>
  2132 + <width>247</width>
  2133 + <font_name>Ubuntu</font_name>
  2134 + <font_size>9</font_size>
  2135 + <x>719</x>
  2136 + <y>68</y>
  2137 + <color>
  2138 + <r>230</r>
  2139 + <g>230</g>
  2140 + <b>250</b>
  2141 + </color>
  2142 + <connections>
  2143 + <relation>
  2144 + <id>7</id>
  2145 + <source>6</source>
  2146 + <target>9</target>
  2147 + <child_cardinality>1..n</child_cardinality>
  2148 + <parent_cardinality>1</parent_cardinality>
  2149 + <reference_for_pk>true</reference_for_pk>
  2150 + <name></name>
  2151 + <on_delete_action>RESTRICT</on_delete_action>
  2152 + <on_update_action>RESTRICT</on_update_action>
  2153 + <source_xp>-1</source_xp>
  2154 + <source_yp>-1</source_yp>
  2155 + <target_xp>-1</target_xp>
  2156 + <target_yp>-1</target_yp>
  2157 + <referenced_column>null</referenced_column>
  2158 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2159 + </relation>
  2160 + </connections>
  2161 + <physical_name>i3geoestat_classificacao</physical_name>
  2162 + <logical_name>i3geoestat_classificacao</logical_name>
  2163 + <description>Lista de classificacoes de uma medida de variável</description>
  2164 + <constraint></constraint>
  2165 + <primary_key_name></primary_key_name>
  2166 + <option></option>
  2167 + <columns>
  2168 + <normal_column>
  2169 + <word_id>26</word_id>
  2170 + <id>29</id>
  2171 + <description></description>
  2172 + <unique_key_name></unique_key_name>
  2173 + <logical_name></logical_name>
  2174 + <physical_name></physical_name>
  2175 + <type>integer</type>
  2176 + <constraint></constraint>
  2177 + <default_value></default_value>
  2178 + <auto_increment>true</auto_increment>
  2179 + <foreign_key>false</foreign_key>
  2180 + <not_null>true</not_null>
  2181 + <primary_key>true</primary_key>
  2182 + <unique_key>true</unique_key>
  2183 + <character_set></character_set>
  2184 + <collation></collation>
  2185 + <sequence>
  2186 + <name></name>
  2187 + <schema></schema>
  2188 + <increment></increment>
  2189 + <min_value></min_value>
2114 <max_value></max_value> 2190 <max_value></max_value>
2115 <start></start> 2191 <start></start>
2116 <cache></cache> 2192 <cache></cache>
@@ -2122,18 +2198,17 @@ @@ -2122,18 +2198,17 @@
2122 </sequence> 2198 </sequence>
2123 </normal_column> 2199 </normal_column>
2124 <normal_column> 2200 <normal_column>
2125 - <id>32</id>  
2126 - <referenced_column>5</referenced_column>  
2127 - <relation>3</relation> 2201 + <word_id>31</word_id>
  2202 + <id>30</id>
2128 <description></description> 2203 <description></description>
2129 <unique_key_name></unique_key_name> 2204 <unique_key_name></unique_key_name>
2130 <logical_name></logical_name> 2205 <logical_name></logical_name>
2131 <physical_name></physical_name> 2206 <physical_name></physical_name>
2132 - <type>integer</type> 2207 + <type>text</type>
2133 <constraint></constraint> 2208 <constraint></constraint>
2134 <default_value></default_value> 2209 <default_value></default_value>
2135 <auto_increment>false</auto_increment> 2210 <auto_increment>false</auto_increment>
2136 - <foreign_key>true</foreign_key> 2211 + <foreign_key>false</foreign_key>
2137 <not_null>false</not_null> 2212 <not_null>false</not_null>
2138 <primary_key>false</primary_key> 2213 <primary_key>false</primary_key>
2139 <unique_key>false</unique_key> 2214 <unique_key>false</unique_key>
@@ -2155,9 +2230,9 @@ @@ -2155,9 +2230,9 @@
2155 </sequence> 2230 </sequence>
2156 </normal_column> 2231 </normal_column>
2157 <normal_column> 2232 <normal_column>
2158 - <id>33</id>  
2159 - <referenced_column>19</referenced_column>  
2160 - <relation>4</relation> 2233 + <id>31</id>
  2234 + <referenced_column>11</referenced_column>
  2235 + <relation>7</relation>
2161 <description></description> 2236 <description></description>
2162 <unique_key_name></unique_key_name> 2237 <unique_key_name></unique_key_name>
2163 <logical_name></logical_name> 2238 <logical_name></logical_name>
@@ -2188,8 +2263,8 @@ @@ -2188,8 +2263,8 @@
2188 </sequence> 2263 </sequence>
2189 </normal_column> 2264 </normal_column>
2190 <normal_column> 2265 <normal_column>
2191 - <word_id>18</word_id>  
2192 - <id>34</id> 2266 + <word_id>37</word_id>
  2267 + <id>32</id>
2193 <description></description> 2268 <description></description>
2194 <unique_key_name></unique_key_name> 2269 <unique_key_name></unique_key_name>
2195 <logical_name></logical_name> 2270 <logical_name></logical_name>
@@ -2219,21 +2294,69 @@ @@ -2219,21 +2294,69 @@
2219 <decimal_size>0</decimal_size> 2294 <decimal_size>0</decimal_size>
2220 </sequence> 2295 </sequence>
2221 </normal_column> 2296 </normal_column>
  2297 + </columns>
  2298 + <indexes>
  2299 + </indexes>
  2300 + <complex_unique_key_list>
  2301 + </complex_unique_key_list>
  2302 + <table_properties>
  2303 + <schema></schema>
  2304 + </table_properties>
  2305 + </table>
  2306 + <table>
  2307 + <id>10</id>
  2308 + <height>317</height>
  2309 + <width>210</width>
  2310 + <font_name>Ubuntu</font_name>
  2311 + <font_size>9</font_size>
  2312 + <x>799</x>
  2313 + <y>246</y>
  2314 + <color>
  2315 + <r>230</r>
  2316 + <g>230</g>
  2317 + <b>250</b>
  2318 + </color>
  2319 + <connections>
  2320 + <relation>
  2321 + <id>8</id>
  2322 + <source>9</source>
  2323 + <target>10</target>
  2324 + <child_cardinality>1..n</child_cardinality>
  2325 + <parent_cardinality>1</parent_cardinality>
  2326 + <reference_for_pk>true</reference_for_pk>
  2327 + <name></name>
  2328 + <on_delete_action>RESTRICT</on_delete_action>
  2329 + <on_update_action>RESTRICT</on_update_action>
  2330 + <source_xp>-1</source_xp>
  2331 + <source_yp>-1</source_yp>
  2332 + <target_xp>-1</target_xp>
  2333 + <target_yp>-1</target_yp>
  2334 + <referenced_column>null</referenced_column>
  2335 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2336 + </relation>
  2337 + </connections>
  2338 + <physical_name>i3geoestat_classes</physical_name>
  2339 + <logical_name>i3geoestat_classes</logical_name>
  2340 + <description>Classes pertencentes a uma classificação</description>
  2341 + <constraint></constraint>
  2342 + <primary_key_name></primary_key_name>
  2343 + <option></option>
  2344 + <columns>
2222 <normal_column> 2345 <normal_column>
2223 - <word_id>41</word_id>  
2224 - <id>35</id> 2346 + <word_id>25</word_id>
  2347 + <id>33</id>
2225 <description></description> 2348 <description></description>
2226 <unique_key_name></unique_key_name> 2349 <unique_key_name></unique_key_name>
2227 <logical_name></logical_name> 2350 <logical_name></logical_name>
2228 <physical_name></physical_name> 2351 <physical_name></physical_name>
2229 - <type>text</type> 2352 + <type>integer</type>
2230 <constraint></constraint> 2353 <constraint></constraint>
2231 <default_value></default_value> 2354 <default_value></default_value>
2232 - <auto_increment>false</auto_increment> 2355 + <auto_increment>true</auto_increment>
2233 <foreign_key>false</foreign_key> 2356 <foreign_key>false</foreign_key>
2234 - <not_null>false</not_null>  
2235 - <primary_key>false</primary_key>  
2236 - <unique_key>false</unique_key> 2357 + <not_null>true</not_null>
  2358 + <primary_key>true</primary_key>
  2359 + <unique_key>true</unique_key>
2237 <character_set></character_set> 2360 <character_set></character_set>
2238 <collation></collation> 2361 <collation></collation>
2239 <sequence> 2362 <sequence>
@@ -2252,8 +2375,8 @@ @@ -2252,8 +2375,8 @@
2252 </sequence> 2375 </sequence>
2253 </normal_column> 2376 </normal_column>
2254 <normal_column> 2377 <normal_column>
2255 - <word_id>12</word_id>  
2256 - <id>36</id> 2378 + <word_id>21</word_id>
  2379 + <id>34</id>
2257 <description></description> 2380 <description></description>
2258 <unique_key_name></unique_key_name> 2381 <unique_key_name></unique_key_name>
2259 <logical_name></logical_name> 2382 <logical_name></logical_name>
@@ -2284,8 +2407,8 @@ @@ -2284,8 +2407,8 @@
2284 </sequence> 2407 </sequence>
2285 </normal_column> 2408 </normal_column>
2286 <normal_column> 2409 <normal_column>
2287 - <word_id>10</word_id>  
2288 - <id>37</id> 2410 + <word_id>51</word_id>
  2411 + <id>35</id>
2289 <description></description> 2412 <description></description>
2290 <unique_key_name></unique_key_name> 2413 <unique_key_name></unique_key_name>
2291 <logical_name></logical_name> 2414 <logical_name></logical_name>
@@ -2316,8 +2439,8 @@ @@ -2316,8 +2439,8 @@
2316 </sequence> 2439 </sequence>
2317 </normal_column> 2440 </normal_column>
2318 <normal_column> 2441 <normal_column>
2319 - <word_id>21</word_id>  
2320 - <id>38</id> 2442 + <word_id>54</word_id>
  2443 + <id>36</id>
2321 <description></description> 2444 <description></description>
2322 <unique_key_name></unique_key_name> 2445 <unique_key_name></unique_key_name>
2323 <logical_name></logical_name> 2446 <logical_name></logical_name>
@@ -2348,8 +2471,8 @@ @@ -2348,8 +2471,8 @@
2348 </sequence> 2471 </sequence>
2349 </normal_column> 2472 </normal_column>
2350 <normal_column> 2473 <normal_column>
2351 - <word_id>33</word_id>  
2352 - <id>39</id> 2474 + <word_id>53</word_id>
  2475 + <id>37</id>
2353 <description></description> 2476 <description></description>
2354 <unique_key_name></unique_key_name> 2477 <unique_key_name></unique_key_name>
2355 <logical_name></logical_name> 2478 <logical_name></logical_name>
@@ -2379,74 +2502,21 @@ @@ -2379,74 +2502,21 @@
2379 <decimal_size>0</decimal_size> 2502 <decimal_size>0</decimal_size>
2380 </sequence> 2503 </sequence>
2381 </normal_column> 2504 </normal_column>
2382 - </columns>  
2383 - <indexes>  
2384 - </indexes>  
2385 - <complex_unique_key_list>  
2386 - </complex_unique_key_list>  
2387 - <table_properties>  
2388 - <schema></schema>  
2389 - </table_properties>  
2390 - </table>  
2391 - <table>  
2392 - <id>9</id>  
2393 - <height>170</height>  
2394 - <width>292</width>  
2395 - <font_name>Ubuntu</font_name>  
2396 - <font_size>9</font_size>  
2397 - <x>387</x>  
2398 - <y>533</y>  
2399 - <color>  
2400 - <r>160</r>  
2401 - <g>32</g>  
2402 - <b>240</b>  
2403 - </color>  
2404 - <connections>  
2405 - <comment_connection>  
2406 - <id>7</id>  
2407 - <source>10</source>  
2408 - <target>9</target>  
2409 - </comment_connection>  
2410 - <relation>  
2411 - <id>8</id>  
2412 - <source>8</source>  
2413 - <target>9</target>  
2414 - <child_cardinality>1..n</child_cardinality>  
2415 - <parent_cardinality>1</parent_cardinality>  
2416 - <reference_for_pk>true</reference_for_pk>  
2417 - <name></name>  
2418 - <on_delete_action>RESTRICT</on_delete_action>  
2419 - <on_update_action>RESTRICT</on_update_action>  
2420 - <source_xp>-1</source_xp>  
2421 - <source_yp>-1</source_yp>  
2422 - <target_xp>-1</target_xp>  
2423 - <target_yp>-1</target_yp>  
2424 - <referenced_column>null</referenced_column>  
2425 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
2426 - </relation>  
2427 - </connections>  
2428 - <physical_name>i3geoestat_dimensao_medida</physical_name>  
2429 - <logical_name>i3geoestat_dimensao_medida</logical_name>  
2430 - <description></description>  
2431 - <constraint></constraint>  
2432 - <primary_key_name></primary_key_name>  
2433 - <option></option>  
2434 - <columns>  
2435 <normal_column> 2505 <normal_column>
2436 - <word_id>26</word_id>  
2437 - <id>40</id> 2506 + <word_id>1</word_id>
  2507 + <id>38</id>
2438 <description></description> 2508 <description></description>
2439 <unique_key_name></unique_key_name> 2509 <unique_key_name></unique_key_name>
2440 <logical_name></logical_name> 2510 <logical_name></logical_name>
2441 <physical_name></physical_name> 2511 <physical_name></physical_name>
2442 - <type>integer</type> 2512 + <type>text</type>
2443 <constraint></constraint> 2513 <constraint></constraint>
2444 <default_value></default_value> 2514 <default_value></default_value>
2445 - <auto_increment>true</auto_increment> 2515 + <auto_increment>false</auto_increment>
2446 <foreign_key>false</foreign_key> 2516 <foreign_key>false</foreign_key>
2447 - <not_null>true</not_null>  
2448 - <primary_key>true</primary_key>  
2449 - <unique_key>true</unique_key> 2517 + <not_null>false</not_null>
  2518 + <primary_key>false</primary_key>
  2519 + <unique_key>false</unique_key>
2450 <character_set></character_set> 2520 <character_set></character_set>
2451 <collation></collation> 2521 <collation></collation>
2452 <sequence> 2522 <sequence>
@@ -2465,17 +2535,18 @@ @@ -2465,17 +2535,18 @@
2465 </sequence> 2535 </sequence>
2466 </normal_column> 2536 </normal_column>
2467 <normal_column> 2537 <normal_column>
2468 - <word_id>8</word_id>  
2469 - <id>41</id> 2538 + <id>39</id>
  2539 + <referenced_column>29</referenced_column>
  2540 + <relation>8</relation>
2470 <description></description> 2541 <description></description>
2471 <unique_key_name></unique_key_name> 2542 <unique_key_name></unique_key_name>
2472 <logical_name></logical_name> 2543 <logical_name></logical_name>
2473 <physical_name></physical_name> 2544 <physical_name></physical_name>
2474 - <type>text</type> 2545 + <type>integer</type>
2475 <constraint></constraint> 2546 <constraint></constraint>
2476 <default_value></default_value> 2547 <default_value></default_value>
2477 <auto_increment>false</auto_increment> 2548 <auto_increment>false</auto_increment>
2478 - <foreign_key>false</foreign_key> 2549 + <foreign_key>true</foreign_key>
2479 <not_null>false</not_null> 2550 <not_null>false</not_null>
2480 <primary_key>false</primary_key> 2551 <primary_key>false</primary_key>
2481 <unique_key>false</unique_key> 2552 <unique_key>false</unique_key>
@@ -2497,8 +2568,8 @@ @@ -2497,8 +2568,8 @@
2497 </sequence> 2568 </sequence>
2498 </normal_column> 2569 </normal_column>
2499 <normal_column> 2570 <normal_column>
2500 - <word_id>32</word_id>  
2501 - <id>42</id> 2571 + <word_id>50</word_id>
  2572 + <id>40</id>
2502 <description></description> 2573 <description></description>
2503 <unique_key_name></unique_key_name> 2574 <unique_key_name></unique_key_name>
2504 <logical_name></logical_name> 2575 <logical_name></logical_name>
@@ -2529,8 +2600,8 @@ @@ -2529,8 +2600,8 @@
2529 </sequence> 2600 </sequence>
2530 </normal_column> 2601 </normal_column>
2531 <normal_column> 2602 <normal_column>
2532 - <word_id>14</word_id>  
2533 - <id>43</id> 2603 + <word_id>46</word_id>
  2604 + <id>41</id>
2534 <description></description> 2605 <description></description>
2535 <unique_key_name></unique_key_name> 2606 <unique_key_name></unique_key_name>
2536 <logical_name></logical_name> 2607 <logical_name></logical_name>
@@ -2561,15 +2632,79 @@ @@ -2561,15 +2632,79 @@
2561 </sequence> 2632 </sequence>
2562 </normal_column> 2633 </normal_column>
2563 <normal_column> 2634 <normal_column>
2564 - <word_id>0</word_id>  
2565 - <id>44</id> 2635 + <word_id>40</word_id>
  2636 + <id>42</id>
2566 <description></description> 2637 <description></description>
2567 <unique_key_name></unique_key_name> 2638 <unique_key_name></unique_key_name>
2568 <logical_name></logical_name> 2639 <logical_name></logical_name>
2569 <physical_name></physical_name> 2640 <physical_name></physical_name>
2570 - <type>integer</type> 2641 + <type>text</type>
2571 <constraint></constraint> 2642 <constraint></constraint>
2572 - <default_value>0</default_value> 2643 + <default_value></default_value>
  2644 + <auto_increment>false</auto_increment>
  2645 + <foreign_key>false</foreign_key>
  2646 + <not_null>false</not_null>
  2647 + <primary_key>false</primary_key>
  2648 + <unique_key>false</unique_key>
  2649 + <character_set></character_set>
  2650 + <collation></collation>
  2651 + <sequence>
  2652 + <name></name>
  2653 + <schema></schema>
  2654 + <increment></increment>
  2655 + <min_value></min_value>
  2656 + <max_value></max_value>
  2657 + <start></start>
  2658 + <cache></cache>
  2659 + <cycle>false</cycle>
  2660 + <order>false</order>
  2661 + <description></description>
  2662 + <data_type></data_type>
  2663 + <decimal_size>0</decimal_size>
  2664 + </sequence>
  2665 + </normal_column>
  2666 + <normal_column>
  2667 + <word_id>39</word_id>
  2668 + <id>43</id>
  2669 + <description></description>
  2670 + <unique_key_name></unique_key_name>
  2671 + <logical_name></logical_name>
  2672 + <physical_name></physical_name>
  2673 + <type>text</type>
  2674 + <constraint></constraint>
  2675 + <default_value></default_value>
  2676 + <auto_increment>false</auto_increment>
  2677 + <foreign_key>false</foreign_key>
  2678 + <not_null>false</not_null>
  2679 + <primary_key>false</primary_key>
  2680 + <unique_key>false</unique_key>
  2681 + <character_set></character_set>
  2682 + <collation></collation>
  2683 + <sequence>
  2684 + <name></name>
  2685 + <schema></schema>
  2686 + <increment></increment>
  2687 + <min_value></min_value>
  2688 + <max_value></max_value>
  2689 + <start></start>
  2690 + <cache></cache>
  2691 + <cycle>false</cycle>
  2692 + <order>false</order>
  2693 + <description></description>
  2694 + <data_type></data_type>
  2695 + <decimal_size>0</decimal_size>
  2696 + </sequence>
  2697 + </normal_column>
  2698 + <normal_column>
  2699 + <word_id>36</word_id>
  2700 + <id>44</id>
  2701 + <description></description>
  2702 + <unique_key_name></unique_key_name>
  2703 + <logical_name></logical_name>
  2704 + <physical_name></physical_name>
  2705 + <type>text</type>
  2706 + <constraint></constraint>
  2707 + <default_value></default_value>
2573 <auto_increment>false</auto_increment> 2708 <auto_increment>false</auto_increment>
2574 <foreign_key>false</foreign_key> 2709 <foreign_key>false</foreign_key>
2575 <not_null>false</not_null> 2710 <not_null>false</not_null>
@@ -2593,18 +2728,17 @@ @@ -2593,18 +2728,17 @@
2593 </sequence> 2728 </sequence>
2594 </normal_column> 2729 </normal_column>
2595 <normal_column> 2730 <normal_column>
  2731 + <word_id>38</word_id>
2596 <id>45</id> 2732 <id>45</id>
2597 - <referenced_column>28</referenced_column>  
2598 - <relation>8</relation>  
2599 <description></description> 2733 <description></description>
2600 <unique_key_name></unique_key_name> 2734 <unique_key_name></unique_key_name>
2601 <logical_name></logical_name> 2735 <logical_name></logical_name>
2602 <physical_name></physical_name> 2736 <physical_name></physical_name>
2603 - <type>integer</type> 2737 + <type>text</type>
2604 <constraint></constraint> 2738 <constraint></constraint>
2605 <default_value></default_value> 2739 <default_value></default_value>
2606 <auto_increment>false</auto_increment> 2740 <auto_increment>false</auto_increment>
2607 - <foreign_key>true</foreign_key> 2741 + <foreign_key>false</foreign_key>
2608 <not_null>false</not_null> 2742 <not_null>false</not_null>
2609 <primary_key>false</primary_key> 2743 <primary_key>false</primary_key>
2610 <unique_key>false</unique_key> 2744 <unique_key>false</unique_key>
@@ -2634,40 +2768,23 @@ @@ -2634,40 +2768,23 @@
2634 <schema></schema> 2768 <schema></schema>
2635 </table_properties> 2769 </table_properties>
2636 </table> 2770 </table>
2637 - <note>  
2638 - <id>10</id>  
2639 - <height>111</height>  
2640 - <width>188</width>  
2641 - <font_name>Ubuntu</font_name>  
2642 - <font_size>9</font_size>  
2643 - <x>748</x>  
2644 - <y>594</y>  
2645 - <color>  
2646 - <r>255</r>  
2647 - <g>255</g>  
2648 - <b>255</b>  
2649 - </color>  
2650 - <connections>  
2651 - </connections>  
2652 - <text>As colunas obtidas da junção de medida_variavel com tipo_regiao podem ser utilizadas para definir uma dimensão</text>  
2653 - </note>  
2654 <table> 2771 <table>
2655 <id>11</id> 2772 <id>11</id>
2656 - <height>75</height>  
2657 - <width>120</width> 2773 + <height>275</height>
  2774 + <width>292</width>
2658 <font_name>Ubuntu</font_name> 2775 <font_name>Ubuntu</font_name>
2659 <font_size>9</font_size> 2776 <font_size>9</font_size>
2660 - <x>746</x>  
2661 - <y>144</y> 2777 + <x>-336</x>
  2778 + <y>236</y>
2662 <color> 2779 <color>
2663 - <r>230</r>  
2664 - <g>230</g>  
2665 - <b>250</b> 2780 + <r>255</r>
  2781 + <g>165</g>
  2782 + <b>0</b>
2666 </color> 2783 </color>
2667 <connections> 2784 <connections>
2668 <relation> 2785 <relation>
2669 <id>9</id> 2786 <id>9</id>
2670 - <source>8</source> 2787 + <source>12</source>
2671 <target>11</target> 2788 <target>11</target>
2672 <child_cardinality>1..n</child_cardinality> 2789 <child_cardinality>1..n</child_cardinality>
2673 <parent_cardinality>1</parent_cardinality> 2790 <parent_cardinality>1</parent_cardinality>
@@ -2682,16 +2799,21 @@ @@ -2682,16 +2799,21 @@
2682 <referenced_column>null</referenced_column> 2799 <referenced_column>null</referenced_column>
2683 <referenced_complex_unique_key>null</referenced_complex_unique_key> 2800 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2684 </relation> 2801 </relation>
  2802 + <comment_connection>
  2803 + <id>10</id>
  2804 + <source>0</source>
  2805 + <target>11</target>
  2806 + </comment_connection>
2685 </connections> 2807 </connections>
2686 - <physical_name>i3geoestat_classificacao</physical_name>  
2687 - <logical_name>i3geoestat_classificacao</logical_name>  
2688 - <description>Lista de classificacoes de uma medida de variável</description> 2808 + <physical_name>i3geoestat_tipo_regiao</physical_name>
  2809 + <logical_name>i3geoestat_tipo_regiao</logical_name>
  2810 + <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description>
2689 <constraint></constraint> 2811 <constraint></constraint>
2690 <primary_key_name></primary_key_name> 2812 <primary_key_name></primary_key_name>
2691 <option></option> 2813 <option></option>
2692 <columns> 2814 <columns>
2693 <normal_column> 2815 <normal_column>
2694 - <word_id>25</word_id> 2816 + <word_id>5</word_id>
2695 <id>46</id> 2817 <id>46</id>
2696 <description></description> 2818 <description></description>
2697 <unique_key_name></unique_key_name> 2819 <unique_key_name></unique_key_name>
@@ -2723,7 +2845,7 @@ @@ -2723,7 +2845,7 @@
2723 </sequence> 2845 </sequence>
2724 </normal_column> 2846 </normal_column>
2725 <normal_column> 2847 <normal_column>
2726 - <word_id>31</word_id> 2848 + <word_id>35</word_id>
2727 <id>47</id> 2849 <id>47</id>
2728 <description></description> 2850 <description></description>
2729 <unique_key_name></unique_key_name> 2851 <unique_key_name></unique_key_name>
@@ -2755,18 +2877,17 @@ @@ -2755,18 +2877,17 @@
2755 </sequence> 2877 </sequence>
2756 </normal_column> 2878 </normal_column>
2757 <normal_column> 2879 <normal_column>
  2880 + <word_id>18</word_id>
2758 <id>48</id> 2881 <id>48</id>
2759 - <referenced_column>28</referenced_column>  
2760 - <relation>9</relation>  
2761 <description></description> 2882 <description></description>
2762 <unique_key_name></unique_key_name> 2883 <unique_key_name></unique_key_name>
2763 <logical_name></logical_name> 2884 <logical_name></logical_name>
2764 <physical_name></physical_name> 2885 <physical_name></physical_name>
2765 - <type>integer</type> 2886 + <type>text</type>
2766 <constraint></constraint> 2887 <constraint></constraint>
2767 <default_value></default_value> 2888 <default_value></default_value>
2768 <auto_increment>false</auto_increment> 2889 <auto_increment>false</auto_increment>
2769 - <foreign_key>true</foreign_key> 2890 + <foreign_key>false</foreign_key>
2770 <not_null>false</not_null> 2891 <not_null>false</not_null>
2771 <primary_key>false</primary_key> 2892 <primary_key>false</primary_key>
2772 <unique_key>false</unique_key> 2893 <unique_key>false</unique_key>
@@ -2787,57 +2908,10 @@ @@ -2787,57 +2908,10 @@
2787 <decimal_size>0</decimal_size> 2908 <decimal_size>0</decimal_size>
2788 </sequence> 2909 </sequence>
2789 </normal_column> 2910 </normal_column>
2790 - </columns>  
2791 - <indexes>  
2792 - </indexes>  
2793 - <complex_unique_key_list>  
2794 - </complex_unique_key_list>  
2795 - <table_properties>  
2796 - <schema></schema>  
2797 - </table_properties>  
2798 - </table>  
2799 - <table>  
2800 - <id>12</id>  
2801 - <height>75</height>  
2802 - <width>120</width>  
2803 - <font_name>Ubuntu</font_name>  
2804 - <font_size>9</font_size>  
2805 - <x>771</x>  
2806 - <y>314</y>  
2807 - <color>  
2808 - <r>230</r>  
2809 - <g>230</g>  
2810 - <b>250</b>  
2811 - </color>  
2812 - <connections>  
2813 - <relation>  
2814 - <id>10</id>  
2815 - <source>11</source>  
2816 - <target>12</target>  
2817 - <child_cardinality>1..n</child_cardinality>  
2818 - <parent_cardinality>1</parent_cardinality>  
2819 - <reference_for_pk>true</reference_for_pk>  
2820 - <name></name>  
2821 - <on_delete_action>RESTRICT</on_delete_action>  
2822 - <on_update_action>RESTRICT</on_update_action>  
2823 - <source_xp>-1</source_xp>  
2824 - <source_yp>-1</source_yp>  
2825 - <target_xp>-1</target_xp>  
2826 - <target_yp>-1</target_yp>  
2827 - <referenced_column>null</referenced_column>  
2828 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
2829 - </relation>  
2830 - </connections>  
2831 - <physical_name>i3geoestat_classes</physical_name>  
2832 - <logical_name>i3geoestat_classes</logical_name>  
2833 - <description>Classes pertencentes a uma classificação</description>  
2834 - <constraint></constraint>  
2835 - <primary_key_name></primary_key_name>  
2836 - <option></option>  
2837 - <columns>  
2838 <normal_column> 2911 <normal_column>
2839 - <word_id>24</word_id>  
2840 <id>49</id> 2912 <id>49</id>
  2913 + <referenced_column>58</referenced_column>
  2914 + <relation>9</relation>
2841 <description></description> 2915 <description></description>
2842 <unique_key_name></unique_key_name> 2916 <unique_key_name></unique_key_name>
2843 <logical_name></logical_name> 2917 <logical_name></logical_name>
@@ -2845,11 +2919,11 @@ @@ -2845,11 +2919,11 @@
2845 <type>integer</type> 2919 <type>integer</type>
2846 <constraint></constraint> 2920 <constraint></constraint>
2847 <default_value></default_value> 2921 <default_value></default_value>
2848 - <auto_increment>true</auto_increment>  
2849 - <foreign_key>false</foreign_key>  
2850 - <not_null>true</not_null>  
2851 - <primary_key>true</primary_key>  
2852 - <unique_key>true</unique_key> 2922 + <auto_increment>false</auto_increment>
  2923 + <foreign_key>true</foreign_key>
  2924 + <not_null>false</not_null>
  2925 + <primary_key>false</primary_key>
  2926 + <unique_key>false</unique_key>
2853 <character_set></character_set> 2927 <character_set></character_set>
2854 <collation></collation> 2928 <collation></collation>
2855 <sequence> 2929 <sequence>
@@ -2900,7 +2974,7 @@ @@ -2900,7 +2974,7 @@
2900 </sequence> 2974 </sequence>
2901 </normal_column> 2975 </normal_column>
2902 <normal_column> 2976 <normal_column>
2903 - <word_id>43</word_id> 2977 + <word_id>49</word_id>
2904 <id>51</id> 2978 <id>51</id>
2905 <description></description> 2979 <description></description>
2906 <unique_key_name></unique_key_name> 2980 <unique_key_name></unique_key_name>
@@ -2932,7 +3006,7 @@ @@ -2932,7 +3006,7 @@
2932 </sequence> 3006 </sequence>
2933 </normal_column> 3007 </normal_column>
2934 <normal_column> 3008 <normal_column>
2935 - <word_id>46</word_id> 3009 + <word_id>10</word_id>
2936 <id>52</id> 3010 <id>52</id>
2937 <description></description> 3011 <description></description>
2938 <unique_key_name></unique_key_name> 3012 <unique_key_name></unique_key_name>
@@ -2964,7 +3038,7 @@ @@ -2964,7 +3038,7 @@
2964 </sequence> 3038 </sequence>
2965 </normal_column> 3039 </normal_column>
2966 <normal_column> 3040 <normal_column>
2967 - <word_id>45</word_id> 3041 + <word_id>14</word_id>
2968 <id>53</id> 3042 <id>53</id>
2969 <description></description> 3043 <description></description>
2970 <unique_key_name></unique_key_name> 3044 <unique_key_name></unique_key_name>
@@ -2996,13 +3070,13 @@ @@ -2996,13 +3070,13 @@
2996 </sequence> 3070 </sequence>
2997 </normal_column> 3071 </normal_column>
2998 <normal_column> 3072 <normal_column>
2999 - <word_id>1</word_id> 3073 + <word_id>24</word_id>
3000 <id>54</id> 3074 <id>54</id>
3001 <description></description> 3075 <description></description>
3002 <unique_key_name></unique_key_name> 3076 <unique_key_name></unique_key_name>
3003 <logical_name></logical_name> 3077 <logical_name></logical_name>
3004 <physical_name></physical_name> 3078 <physical_name></physical_name>
3005 - <type>text</type> 3079 + <type>integer</type>
3006 <constraint></constraint> 3080 <constraint></constraint>
3007 <default_value></default_value> 3081 <default_value></default_value>
3008 <auto_increment>false</auto_increment> 3082 <auto_increment>false</auto_increment>
@@ -3028,18 +3102,304 @@ @@ -3028,18 +3102,304 @@
3028 </sequence> 3102 </sequence>
3029 </normal_column> 3103 </normal_column>
3030 <normal_column> 3104 <normal_column>
  3105 + <word_id>12</word_id>
3031 <id>55</id> 3106 <id>55</id>
3032 - <referenced_column>46</referenced_column>  
3033 - <relation>10</relation>  
3034 <description></description> 3107 <description></description>
3035 <unique_key_name></unique_key_name> 3108 <unique_key_name></unique_key_name>
3036 <logical_name></logical_name> 3109 <logical_name></logical_name>
3037 <physical_name></physical_name> 3110 <physical_name></physical_name>
3038 - <type>integer</type> 3111 + <type>text</type>
3039 <constraint></constraint> 3112 <constraint></constraint>
3040 <default_value></default_value> 3113 <default_value></default_value>
3041 <auto_increment>false</auto_increment> 3114 <auto_increment>false</auto_increment>
3042 - <foreign_key>true</foreign_key> 3115 + <foreign_key>false</foreign_key>
  3116 + <not_null>false</not_null>
  3117 + <primary_key>false</primary_key>
  3118 + <unique_key>false</unique_key>
  3119 + <character_set></character_set>
  3120 + <collation></collation>
  3121 + <sequence>
  3122 + <name></name>
  3123 + <schema></schema>
  3124 + <increment></increment>
  3125 + <min_value></min_value>
  3126 + <max_value></max_value>
  3127 + <start></start>
  3128 + <cache></cache>
  3129 + <cycle>false</cycle>
  3130 + <order>false</order>
  3131 + <description></description>
  3132 + <data_type></data_type>
  3133 + <decimal_size>0</decimal_size>
  3134 + </sequence>
  3135 + </normal_column>
  3136 + <normal_column>
  3137 + <word_id>47</word_id>
  3138 + <id>56</id>
  3139 + <description></description>
  3140 + <unique_key_name></unique_key_name>
  3141 + <logical_name></logical_name>
  3142 + <physical_name></physical_name>
  3143 + <type>text</type>
  3144 + <constraint></constraint>
  3145 + <default_value>4326</default_value>
  3146 + <auto_increment>false</auto_increment>
  3147 + <foreign_key>false</foreign_key>
  3148 + <not_null>false</not_null>
  3149 + <primary_key>false</primary_key>
  3150 + <unique_key>false</unique_key>
  3151 + <character_set></character_set>
  3152 + <collation></collation>
  3153 + <sequence>
  3154 + <name></name>
  3155 + <schema></schema>
  3156 + <increment></increment>
  3157 + <min_value></min_value>
  3158 + <max_value></max_value>
  3159 + <start></start>
  3160 + <cache></cache>
  3161 + <cycle>false</cycle>
  3162 + <order>false</order>
  3163 + <description></description>
  3164 + <data_type></data_type>
  3165 + <decimal_size>0</decimal_size>
  3166 + </sequence>
  3167 + </normal_column>
  3168 + <normal_column>
  3169 + <word_id>9</word_id>
  3170 + <id>57</id>
  3171 + <description></description>
  3172 + <unique_key_name></unique_key_name>
  3173 + <logical_name></logical_name>
  3174 + <physical_name></physical_name>
  3175 + <type>text</type>
  3176 + <constraint></constraint>
  3177 + <default_value></default_value>
  3178 + <auto_increment>false</auto_increment>
  3179 + <foreign_key>false</foreign_key>
  3180 + <not_null>false</not_null>
  3181 + <primary_key>false</primary_key>
  3182 + <unique_key>false</unique_key>
  3183 + <character_set></character_set>
  3184 + <collation></collation>
  3185 + <sequence>
  3186 + <name></name>
  3187 + <schema></schema>
  3188 + <increment></increment>
  3189 + <min_value></min_value>
  3190 + <max_value></max_value>
  3191 + <start></start>
  3192 + <cache></cache>
  3193 + <cycle>false</cycle>
  3194 + <order>false</order>
  3195 + <description></description>
  3196 + <data_type></data_type>
  3197 + <decimal_size>0</decimal_size>
  3198 + </sequence>
  3199 + </normal_column>
  3200 + </columns>
  3201 + <indexes>
  3202 + </indexes>
  3203 + <complex_unique_key_list>
  3204 + </complex_unique_key_list>
  3205 + <table_properties>
  3206 + <schema></schema>
  3207 + </table_properties>
  3208 + </table>
  3209 + <table>
  3210 + <id>12</id>
  3211 + <height>170</height>
  3212 + <width>292</width>
  3213 + <font_name>Ubuntu</font_name>
  3214 + <font_size>9</font_size>
  3215 + <x>8</x>
  3216 + <y>499</y>
  3217 + <color>
  3218 + <r>255</r>
  3219 + <g>165</g>
  3220 + <b>0</b>
  3221 + </color>
  3222 + <connections>
  3223 + </connections>
  3224 + <physical_name>i3geoestat_conexao</physical_name>
  3225 + <logical_name>i3geoestat_conexao</logical_name>
  3226 + <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados</description>
  3227 + <constraint></constraint>
  3228 + <primary_key_name></primary_key_name>
  3229 + <option></option>
  3230 + <columns>
  3231 + <normal_column>
  3232 + <word_id>3</word_id>
  3233 + <id>58</id>
  3234 + <description></description>
  3235 + <unique_key_name></unique_key_name>
  3236 + <logical_name></logical_name>
  3237 + <physical_name></physical_name>
  3238 + <type>integer</type>
  3239 + <constraint></constraint>
  3240 + <default_value></default_value>
  3241 + <auto_increment>true</auto_increment>
  3242 + <foreign_key>false</foreign_key>
  3243 + <not_null>true</not_null>
  3244 + <primary_key>true</primary_key>
  3245 + <unique_key>true</unique_key>
  3246 + <character_set></character_set>
  3247 + <collation></collation>
  3248 + <sequence>
  3249 + <name></name>
  3250 + <schema></schema>
  3251 + <increment></increment>
  3252 + <min_value></min_value>
  3253 + <max_value></max_value>
  3254 + <start></start>
  3255 + <cache></cache>
  3256 + <cycle>false</cycle>
  3257 + <order>false</order>
  3258 + <description></description>
  3259 + <data_type></data_type>
  3260 + <decimal_size>0</decimal_size>
  3261 + </sequence>
  3262 + </normal_column>
  3263 + <normal_column>
  3264 + <word_id>2</word_id>
  3265 + <id>59</id>
  3266 + <description></description>
  3267 + <unique_key_name></unique_key_name>
  3268 + <logical_name></logical_name>
  3269 + <physical_name></physical_name>
  3270 + <type>text</type>
  3271 + <constraint></constraint>
  3272 + <default_value></default_value>
  3273 + <auto_increment>false</auto_increment>
  3274 + <foreign_key>false</foreign_key>
  3275 + <not_null>false</not_null>
  3276 + <primary_key>false</primary_key>
  3277 + <unique_key>false</unique_key>
  3278 + <character_set></character_set>
  3279 + <collation></collation>
  3280 + <sequence>
  3281 + <name></name>
  3282 + <schema></schema>
  3283 + <increment></increment>
  3284 + <min_value></min_value>
  3285 + <max_value></max_value>
  3286 + <start></start>
  3287 + <cache></cache>
  3288 + <cycle>false</cycle>
  3289 + <order>false</order>
  3290 + <description></description>
  3291 + <data_type></data_type>
  3292 + <decimal_size>0</decimal_size>
  3293 + </sequence>
  3294 + </normal_column>
  3295 + <normal_column>
  3296 + <word_id>23</word_id>
  3297 + <id>60</id>
  3298 + <description></description>
  3299 + <unique_key_name></unique_key_name>
  3300 + <logical_name></logical_name>
  3301 + <physical_name></physical_name>
  3302 + <type>text</type>
  3303 + <constraint></constraint>
  3304 + <default_value></default_value>
  3305 + <auto_increment>false</auto_increment>
  3306 + <foreign_key>false</foreign_key>
  3307 + <not_null>false</not_null>
  3308 + <primary_key>false</primary_key>
  3309 + <unique_key>false</unique_key>
  3310 + <character_set></character_set>
  3311 + <collation></collation>
  3312 + <sequence>
  3313 + <name></name>
  3314 + <schema></schema>
  3315 + <increment></increment>
  3316 + <min_value></min_value>
  3317 + <max_value></max_value>
  3318 + <start></start>
  3319 + <cache></cache>
  3320 + <cycle>false</cycle>
  3321 + <order>false</order>
  3322 + <description></description>
  3323 + <data_type></data_type>
  3324 + <decimal_size>0</decimal_size>
  3325 + </sequence>
  3326 + </normal_column>
  3327 + <normal_column>
  3328 + <word_id>43</word_id>
  3329 + <id>61</id>
  3330 + <description></description>
  3331 + <unique_key_name></unique_key_name>
  3332 + <logical_name></logical_name>
  3333 + <physical_name></physical_name>
  3334 + <type>text</type>
  3335 + <constraint></constraint>
  3336 + <default_value></default_value>
  3337 + <auto_increment>false</auto_increment>
  3338 + <foreign_key>false</foreign_key>
  3339 + <not_null>false</not_null>
  3340 + <primary_key>false</primary_key>
  3341 + <unique_key>false</unique_key>
  3342 + <character_set></character_set>
  3343 + <collation></collation>
  3344 + <sequence>
  3345 + <name></name>
  3346 + <schema></schema>
  3347 + <increment></increment>
  3348 + <min_value></min_value>
  3349 + <max_value></max_value>
  3350 + <start></start>
  3351 + <cache></cache>
  3352 + <cycle>false</cycle>
  3353 + <order>false</order>
  3354 + <description></description>
  3355 + <data_type></data_type>
  3356 + <decimal_size>0</decimal_size>
  3357 + </sequence>
  3358 + </normal_column>
  3359 + <normal_column>
  3360 + <word_id>52</word_id>
  3361 + <id>62</id>
  3362 + <description></description>
  3363 + <unique_key_name></unique_key_name>
  3364 + <logical_name></logical_name>
  3365 + <physical_name></physical_name>
  3366 + <type>text</type>
  3367 + <constraint></constraint>
  3368 + <default_value></default_value>
  3369 + <auto_increment>false</auto_increment>
  3370 + <foreign_key>false</foreign_key>
  3371 + <not_null>false</not_null>
  3372 + <primary_key>false</primary_key>
  3373 + <unique_key>false</unique_key>
  3374 + <character_set></character_set>
  3375 + <collation></collation>
  3376 + <sequence>
  3377 + <name></name>
  3378 + <schema></schema>
  3379 + <increment></increment>
  3380 + <min_value></min_value>
  3381 + <max_value></max_value>
  3382 + <start></start>
  3383 + <cache></cache>
  3384 + <cycle>false</cycle>
  3385 + <order>false</order>
  3386 + <description></description>
  3387 + <data_type></data_type>
  3388 + <decimal_size>0</decimal_size>
  3389 + </sequence>
  3390 + </normal_column>
  3391 + <normal_column>
  3392 + <word_id>44</word_id>
  3393 + <id>63</id>
  3394 + <description></description>
  3395 + <unique_key_name></unique_key_name>
  3396 + <logical_name></logical_name>
  3397 + <physical_name></physical_name>
  3398 + <type>text</type>
  3399 + <constraint></constraint>
  3400 + <default_value></default_value>
  3401 + <auto_increment>false</auto_increment>
  3402 + <foreign_key>false</foreign_key>
3043 <not_null>false</not_null> 3403 <not_null>false</not_null>
3044 <primary_key>false</primary_key> 3404 <primary_key>false</primary_key>
3045 <unique_key>false</unique_key> 3405 <unique_key>false</unique_key>
@@ -3077,31 +3437,31 @@ @@ -3077,31 +3437,31 @@
3077 <name>metaestat_basededados</name> 3437 <name>metaestat_basededados</name>
3078 <export_order>0</export_order> 3438 <export_order>0</export_order>
3079 <table_test_data> 3439 <table_test_data>
3080 - <table_id>6</table_id> 3440 + <table_id>12</table_id>
3081 <direct_test_data> 3441 <direct_test_data>
3082 <data> 3442 <data>
3083 <column_data> 3443 <column_data>
3084 - <column_id>19</column_id> 3444 + <column_id>58</column_id>
3085 <value>1</value> 3445 <value>1</value>
3086 </column_data> 3446 </column_data>
3087 <column_data> 3447 <column_data>
3088 - <column_id>20</column_id> 3448 + <column_id>59</column_id>
3089 <value>dbspo</value> 3449 <value>dbspo</value>
3090 </column_data> 3450 </column_data>
3091 <column_data> 3451 <column_data>
3092 - <column_id>21</column_id> 3452 + <column_id>60</column_id>
3093 <value>localhost</value> 3453 <value>localhost</value>
3094 </column_data> 3454 </column_data>
3095 <column_data> 3455 <column_data>
3096 - <column_id>22</column_id> 3456 + <column_id>61</column_id>
3097 <value>5432</value> 3457 <value>5432</value>
3098 </column_data> 3458 </column_data>
3099 <column_data> 3459 <column_data>
3100 - <column_id>23</column_id> 3460 + <column_id>62</column_id>
3101 <value>postgres</value> 3461 <value>postgres</value>
3102 </column_data> 3462 </column_data>
3103 <column_data> 3463 <column_data>
3104 - <column_id>24</column_id> 3464 + <column_id>63</column_id>
3105 <value>postgres</value> 3465 <value>postgres</value>
3106 </column_data> 3466 </column_data>
3107 </data> 3467 </data>
@@ -3110,7 +3470,7 @@ @@ -3110,7 +3470,7 @@
3110 <test_data_num>0</test_data_num> 3470 <test_data_num>0</test_data_num>
3111 <data_def_list> 3471 <data_def_list>
3112 <data_def> 3472 <data_def>
3113 - <column_id>19</column_id> 3473 + <column_id>58</column_id>
3114 <type>Format</type> 3474 <type>Format</type>
3115 <repeat_num>1</repeat_num> 3475 <repeat_num>1</repeat_num>
3116 <template>%</template> 3476 <template>%</template>
@@ -3125,7 +3485,7 @@ @@ -3125,7 +3485,7 @@
3125 </modified_values> 3485 </modified_values>
3126 </data_def> 3486 </data_def>
3127 <data_def> 3487 <data_def>
3128 - <column_id>20</column_id> 3488 + <column_id>59</column_id>
3129 <type>Format</type> 3489 <type>Format</type>
3130 <repeat_num>1</repeat_num> 3490 <repeat_num>1</repeat_num>
3131 <template>database%</template> 3491 <template>database%</template>
@@ -3140,7 +3500,7 @@ @@ -3140,7 +3500,7 @@
3140 </modified_values> 3500 </modified_values>
3141 </data_def> 3501 </data_def>
3142 <data_def> 3502 <data_def>
3143 - <column_id>21</column_id> 3503 + <column_id>60</column_id>
3144 <type>Format</type> 3504 <type>Format</type>
3145 <repeat_num>1</repeat_num> 3505 <repeat_num>1</repeat_num>
3146 <template>host%</template> 3506 <template>host%</template>
@@ -3155,7 +3515,7 @@ @@ -3155,7 +3515,7 @@
3155 </modified_values> 3515 </modified_values>
3156 </data_def> 3516 </data_def>
3157 <data_def> 3517 <data_def>
3158 - <column_id>22</column_id> 3518 + <column_id>61</column_id>
3159 <type>Format</type> 3519 <type>Format</type>
3160 <repeat_num>1</repeat_num> 3520 <repeat_num>1</repeat_num>
3161 <template>porta%</template> 3521 <template>porta%</template>
@@ -3170,7 +3530,7 @@ @@ -3170,7 +3530,7 @@
3170 </modified_values> 3530 </modified_values>
3171 </data_def> 3531 </data_def>
3172 <data_def> 3532 <data_def>
3173 - <column_id>23</column_id> 3533 + <column_id>62</column_id>
3174 <type>Format</type> 3534 <type>Format</type>
3175 <repeat_num>1</repeat_num> 3535 <repeat_num>1</repeat_num>
3176 <template>usuario%</template> 3536 <template>usuario%</template>
@@ -3185,7 +3545,7 @@ @@ -3185,7 +3545,7 @@
3185 </modified_values> 3545 </modified_values>
3186 </data_def> 3546 </data_def>
3187 <data_def> 3547 <data_def>
3188 - <column_id>24</column_id> 3548 + <column_id>63</column_id>
3189 <type>Format</type> 3549 <type>Format</type>
3190 <repeat_num>1</repeat_num> 3550 <repeat_num>1</repeat_num>
3191 <template>senha%</template> 3551 <template>senha%</template>
@@ -3203,33 +3563,33 @@ @@ -3203,33 +3563,33 @@
3203 </repeat_test_data> 3563 </repeat_test_data>
3204 </table_test_data> 3564 </table_test_data>
3205 <table_test_data> 3565 <table_test_data>
3206 - <table_id>5</table_id> 3566 + <table_id>4</table_id>
3207 <direct_test_data> 3567 <direct_test_data>
3208 <data> 3568 <data>
3209 <column_data> 3569 <column_data>
3210 - <column_id>16</column_id> 3570 + <column_id>5</column_id>
3211 <value>1</value> 3571 <value>1</value>
3212 </column_data> 3572 </column_data>
3213 <column_data> 3573 <column_data>
3214 - <column_id>17</column_id> 3574 + <column_id>6</column_id>
3215 <value>Anual</value> 3575 <value>Anual</value>
3216 </column_data> 3576 </column_data>
3217 <column_data> 3577 <column_data>
3218 - <column_id>18</column_id> 3578 + <column_id>7</column_id>
3219 <value></value> 3579 <value></value>
3220 </column_data> 3580 </column_data>
3221 </data> 3581 </data>
3222 <data> 3582 <data>
3223 <column_data> 3583 <column_data>
3224 - <column_id>16</column_id> 3584 + <column_id>5</column_id>
3225 <value>2</value> 3585 <value>2</value>
3226 </column_data> 3586 </column_data>
3227 <column_data> 3587 <column_data>
3228 - <column_id>17</column_id> 3588 + <column_id>6</column_id>
3229 <value>Mensal</value> 3589 <value>Mensal</value>
3230 </column_data> 3590 </column_data>
3231 <column_data> 3591 <column_data>
3232 - <column_id>18</column_id> 3592 + <column_id>7</column_id>
3233 <value></value> 3593 <value></value>
3234 </column_data> 3594 </column_data>
3235 </data> 3595 </data>
@@ -3238,7 +3598,7 @@ @@ -3238,7 +3598,7 @@
3238 <test_data_num>0</test_data_num> 3598 <test_data_num>0</test_data_num>
3239 <data_def_list> 3599 <data_def_list>
3240 <data_def> 3600 <data_def>
3241 - <column_id>16</column_id> 3601 + <column_id>5</column_id>
3242 <type>Format</type> 3602 <type>Format</type>
3243 <repeat_num>1</repeat_num> 3603 <repeat_num>1</repeat_num>
3244 <template>%</template> 3604 <template>%</template>
@@ -3253,7 +3613,7 @@ @@ -3253,7 +3613,7 @@
3253 </modified_values> 3613 </modified_values>
3254 </data_def> 3614 </data_def>
3255 <data_def> 3615 <data_def>
3256 - <column_id>17</column_id> 3616 + <column_id>6</column_id>
3257 <type>Format</type> 3617 <type>Format</type>
3258 <repeat_num>1</repeat_num> 3618 <repeat_num>1</repeat_num>
3259 <template>nome%</template> 3619 <template>nome%</template>
@@ -3268,7 +3628,7 @@ @@ -3268,7 +3628,7 @@
3268 </modified_values> 3628 </modified_values>
3269 </data_def> 3629 </data_def>
3270 <data_def> 3630 <data_def>
3271 - <column_id>18</column_id> 3631 + <column_id>7</column_id>
3272 <type>Format</type> 3632 <type>Format</type>
3273 <repeat_num>1</repeat_num> 3633 <repeat_num>1</repeat_num>
3274 <template>descricao%</template> 3634 <template>descricao%</template>
@@ -3286,60 +3646,64 @@ @@ -3286,60 +3646,64 @@
3286 </repeat_test_data> 3646 </repeat_test_data>
3287 </table_test_data> 3647 </table_test_data>
3288 <table_test_data> 3648 <table_test_data>
3289 - <table_id>4</table_id> 3649 + <table_id>11</table_id>
3290 <direct_test_data> 3650 <direct_test_data>
3291 <data> 3651 <data>
3292 <column_data> 3652 <column_data>
3293 - <column_id>5</column_id> 3653 + <column_id>46</column_id>
3294 <value>1</value> 3654 <value>1</value>
3295 </column_data> 3655 </column_data>
3296 <column_data> 3656 <column_data>
3297 - <column_id>6</column_id> 3657 + <column_id>47</column_id>
3298 <value>Município</value> 3658 <value>Município</value>
3299 </column_data> 3659 </column_data>
3300 <column_data> 3660 <column_data>
3301 - <column_id>7</column_id> 3661 + <column_id>48</column_id>
3302 <value>Limites municipais</value> 3662 <value>Limites municipais</value>
3303 </column_data> 3663 </column_data>
3304 <column_data> 3664 <column_data>
3305 - <column_id>8</column_id> 3665 + <column_id>49</column_id>
3306 <value>1</value> 3666 <value>1</value>
3307 </column_data> 3667 </column_data>
3308 <column_data> 3668 <column_data>
3309 - <column_id>9</column_id> 3669 + <column_id>50</column_id>
3310 <value>public</value> 3670 <value>public</value>
3311 </column_data> 3671 </column_data>
3312 <column_data> 3672 <column_data>
3313 - <column_id>10</column_id> 3673 + <column_id>51</column_id>
3314 <value>tb_ibge</value> 3674 <value>tb_ibge</value>
3315 </column_data> 3675 </column_data>
3316 <column_data> 3676 <column_data>
3317 - <column_id>11</column_id> 3677 + <column_id>52</column_id>
3318 <value>the_geom</value> 3678 <value>the_geom</value>
3319 </column_data> 3679 </column_data>
3320 <column_data> 3680 <column_data>
3321 - <column_id>12</column_id> 3681 + <column_id>53</column_id>
3322 <value></value> 3682 <value></value>
3323 </column_data> 3683 </column_data>
3324 <column_data> 3684 <column_data>
3325 - <column_id>13</column_id> 3685 + <column_id>54</column_id>
3326 <value>ibge</value> 3686 <value>ibge</value>
3327 </column_data> 3687 </column_data>
3328 <column_data> 3688 <column_data>
3329 - <column_id>14</column_id> 3689 + <column_id>55</column_id>
3330 <value>no_cidade</value> 3690 <value>no_cidade</value>
3331 </column_data> 3691 </column_data>
3332 <column_data> 3692 <column_data>
3333 - <column_id>15</column_id> 3693 + <column_id>56</column_id>
3334 <value>4326</value> 3694 <value>4326</value>
3335 </column_data> 3695 </column_data>
  3696 + <column_data>
  3697 + <column_id>57</column_id>
  3698 + <value>the_geom2</value>
  3699 + </column_data>
3336 </data> 3700 </data>
3337 </direct_test_data> 3701 </direct_test_data>
3338 <repeat_test_data> 3702 <repeat_test_data>
3339 <test_data_num>0</test_data_num> 3703 <test_data_num>0</test_data_num>
3340 <data_def_list> 3704 <data_def_list>
3341 <data_def> 3705 <data_def>
3342 - <column_id>5</column_id> 3706 + <column_id>46</column_id>
3343 <type>Format</type> 3707 <type>Format</type>
3344 <repeat_num>1</repeat_num> 3708 <repeat_num>1</repeat_num>
3345 <template>%</template> 3709 <template>%</template>
@@ -3354,7 +3718,7 @@ @@ -3354,7 +3718,7 @@
3354 </modified_values> 3718 </modified_values>
3355 </data_def> 3719 </data_def>
3356 <data_def> 3720 <data_def>
3357 - <column_id>6</column_id> 3721 + <column_id>47</column_id>
3358 <type>Format</type> 3722 <type>Format</type>
3359 <repeat_num>1</repeat_num> 3723 <repeat_num>1</repeat_num>
3360 <template>nome_tipo_regiao%</template> 3724 <template>nome_tipo_regiao%</template>
@@ -3369,7 +3733,7 @@ @@ -3369,7 +3733,7 @@
3369 </modified_values> 3733 </modified_values>
3370 </data_def> 3734 </data_def>
3371 <data_def> 3735 <data_def>
3372 - <column_id>7</column_id> 3736 + <column_id>48</column_id>
3373 <type>Format</type> 3737 <type>Format</type>
3374 <repeat_num>1</repeat_num> 3738 <repeat_num>1</repeat_num>
3375 <template>descricao_tipo_regiao%</template> 3739 <template>descricao_tipo_regiao%</template>
@@ -3384,7 +3748,7 @@ @@ -3384,7 +3748,7 @@
3384 </modified_values> 3748 </modified_values>
3385 </data_def> 3749 </data_def>
3386 <data_def> 3750 <data_def>
3387 - <column_id>8</column_id> 3751 + <column_id>49</column_id>
3388 <type>Foreign Key</type> 3752 <type>Foreign Key</type>
3389 <repeat_num>1</repeat_num> 3753 <repeat_num>1</repeat_num>
3390 <template>%</template> 3754 <template>%</template>
@@ -3399,7 +3763,7 @@ @@ -3399,7 +3763,7 @@
3399 </modified_values> 3763 </modified_values>
3400 </data_def> 3764 </data_def>
3401 <data_def> 3765 <data_def>
3402 - <column_id>9</column_id> 3766 + <column_id>50</column_id>
3403 <type>Format</type> 3767 <type>Format</type>
3404 <repeat_num>1</repeat_num> 3768 <repeat_num>1</repeat_num>
3405 <template>esquemadb%</template> 3769 <template>esquemadb%</template>
@@ -3414,7 +3778,7 @@ @@ -3414,7 +3778,7 @@
3414 </modified_values> 3778 </modified_values>
3415 </data_def> 3779 </data_def>
3416 <data_def> 3780 <data_def>
3417 - <column_id>10</column_id> 3781 + <column_id>51</column_id>
3418 <type>Format</type> 3782 <type>Format</type>
3419 <repeat_num>1</repeat_num> 3783 <repeat_num>1</repeat_num>
3420 <template>tabela%</template> 3784 <template>tabela%</template>
@@ -3429,7 +3793,7 @@ @@ -3429,7 +3793,7 @@
3429 </modified_values> 3793 </modified_values>
3430 </data_def> 3794 </data_def>
3431 <data_def> 3795 <data_def>
3432 - <column_id>11</column_id> 3796 + <column_id>52</column_id>
3433 <type>Format</type> 3797 <type>Format</type>
3434 <repeat_num>1</repeat_num> 3798 <repeat_num>1</repeat_num>
3435 <template>colunageo%</template> 3799 <template>colunageo%</template>
@@ -3444,7 +3808,7 @@ @@ -3444,7 +3808,7 @@
3444 </modified_values> 3808 </modified_values>
3445 </data_def> 3809 </data_def>
3446 <data_def> 3810 <data_def>
3447 - <column_id>12</column_id> 3811 + <column_id>53</column_id>
3448 <type>Format</type> 3812 <type>Format</type>
3449 <repeat_num>1</repeat_num> 3813 <repeat_num>1</repeat_num>
3450 <template>data%</template> 3814 <template>data%</template>
@@ -3459,7 +3823,7 @@ @@ -3459,7 +3823,7 @@
3459 </modified_values> 3823 </modified_values>
3460 </data_def> 3824 </data_def>
3461 <data_def> 3825 <data_def>
3462 - <column_id>13</column_id> 3826 + <column_id>54</column_id>
3463 <type>Format</type> 3827 <type>Format</type>
3464 <repeat_num>1</repeat_num> 3828 <repeat_num>1</repeat_num>
3465 <template>%</template> 3829 <template>%</template>
@@ -3474,7 +3838,7 @@ @@ -3474,7 +3838,7 @@
3474 </modified_values> 3838 </modified_values>
3475 </data_def> 3839 </data_def>
3476 <data_def> 3840 <data_def>
3477 - <column_id>14</column_id> 3841 + <column_id>55</column_id>
3478 <type>Format</type> 3842 <type>Format</type>
3479 <repeat_num>1</repeat_num> 3843 <repeat_num>1</repeat_num>
3480 <template>colunanomeregiao%</template> 3844 <template>colunanomeregiao%</template>
@@ -3489,7 +3853,7 @@ @@ -3489,7 +3853,7 @@
3489 </modified_values> 3853 </modified_values>
3490 </data_def> 3854 </data_def>
3491 <data_def> 3855 <data_def>
3492 - <column_id>15</column_id> 3856 + <column_id>56</column_id>
3493 <type>Format</type> 3857 <type>Format</type>
3494 <repeat_num>1</repeat_num> 3858 <repeat_num>1</repeat_num>
3495 <template>srid%</template> 3859 <template>srid%</template>
@@ -3503,6 +3867,21 @@ @@ -3503,6 +3867,21 @@
3503 <modified_values> 3867 <modified_values>
3504 </modified_values> 3868 </modified_values>
3505 </data_def> 3869 </data_def>
  3870 + <data_def>
  3871 + <column_id>57</column_id>
  3872 + <type>Format</type>
  3873 + <repeat_num>1</repeat_num>
  3874 + <template>colunacentroide%</template>
  3875 + <from>1</from>
  3876 + <to>100</to>
  3877 + <increment>1</increment>
  3878 + <select>colunacentroide1</select>
  3879 + <select>colunacentroide2</select>
  3880 + <select>colunacentroide3</select>
  3881 + <select>colunacentroide4</select>
  3882 + <modified_values>
  3883 + </modified_values>
  3884 + </data_def>
3506 </data_def_list> 3885 </data_def_list>
3507 </repeat_test_data> 3886 </repeat_test_data>
3508 </table_test_data> 3887 </table_test_data>
@@ -3524,11 +3903,11 @@ @@ -3524,11 +3903,11 @@
3524 </column_data> 3903 </column_data>
3525 <column_data> 3904 <column_data>
3526 <column_id>3</column_id> 3905 <column_id>3</column_id>
3527 - <value></value> 3906 + <value>1</value>
3528 </column_data> 3907 </column_data>
3529 <column_data> 3908 <column_data>
3530 <column_id>4</column_id> 3909 <column_id>4</column_id>
3531 - <value></value> 3910 + <value>1</value>
3532 </column_data> 3911 </column_data>
3533 </data> 3912 </data>
3534 </direct_test_data> 3913 </direct_test_data>
@@ -3614,55 +3993,55 @@ @@ -3614,55 +3993,55 @@
3614 </repeat_test_data> 3993 </repeat_test_data>
3615 </table_test_data> 3994 </table_test_data>
3616 <table_test_data> 3995 <table_test_data>
3617 - <table_id>8</table_id> 3996 + <table_id>6</table_id>
3618 <direct_test_data> 3997 <direct_test_data>
3619 <data> 3998 <data>
3620 <column_data> 3999 <column_data>
3621 - <column_id>28</column_id> 4000 + <column_id>11</column_id>
3622 <value>1</value> 4001 <value>1</value>
3623 </column_data> 4002 </column_data>
3624 <column_data> 4003 <column_data>
3625 - <column_id>29</column_id> 4004 + <column_id>12</column_id>
3626 <value>1</value> 4005 <value>1</value>
3627 </column_data> 4006 </column_data>
3628 <column_data> 4007 <column_data>
3629 - <column_id>30</column_id> 4008 + <column_id>13</column_id>
3630 <value>2</value> 4009 <value>2</value>
3631 </column_data> 4010 </column_data>
3632 <column_data> 4011 <column_data>
3633 - <column_id>31</column_id> 4012 + <column_id>14</column_id>
3634 <value>1</value> 4013 <value>1</value>
3635 </column_data> 4014 </column_data>
3636 <column_data> 4015 <column_data>
3637 - <column_id>32</column_id> 4016 + <column_id>15</column_id>
3638 <value>1</value> 4017 <value>1</value>
3639 </column_data> 4018 </column_data>
3640 <column_data> 4019 <column_data>
3641 - <column_id>33</column_id> 4020 + <column_id>16</column_id>
3642 <value>1</value> 4021 <value>1</value>
3643 </column_data> 4022 </column_data>
3644 <column_data> 4023 <column_data>
3645 - <column_id>34</column_id> 4024 + <column_id>17</column_id>
3646 <value>dbacoes_saude</value> 4025 <value>dbacoes_saude</value>
3647 </column_data> 4026 </column_data>
3648 <column_data> 4027 <column_data>
3649 - <column_id>35</column_id> 4028 + <column_id>18</column_id>
3650 <value>tb_farmacia_pop</value> 4029 <value>tb_farmacia_pop</value>
3651 </column_data> 4030 </column_data>
3652 <column_data> 4031 <column_data>
3653 - <column_id>36</column_id> 4032 + <column_id>19</column_id>
3654 <value>nu_farm_funcionando</value> 4033 <value>nu_farm_funcionando</value>
3655 </column_data> 4034 </column_data>
3656 <column_data> 4035 <column_data>
3657 - <column_id>37</column_id> 4036 + <column_id>20</column_id>
3658 <value>co_ibge</value> 4037 <value>co_ibge</value>
3659 </column_data> 4038 </column_data>
3660 <column_data> 4039 <column_data>
3661 - <column_id>38</column_id> 4040 + <column_id>21</column_id>
3662 <value></value> 4041 <value></value>
3663 </column_data> 4042 </column_data>
3664 <column_data> 4043 <column_data>
3665 - <column_id>39</column_id> 4044 + <column_id>22</column_id>
3666 <value>Número de farmácias em funcionamento por mês e ano</value> 4045 <value>Número de farmácias em funcionamento por mês e ano</value>
3667 </column_data> 4046 </column_data>
3668 </data> 4047 </data>
@@ -3671,7 +4050,7 @@ @@ -3671,7 +4050,7 @@
3671 <test_data_num>0</test_data_num> 4050 <test_data_num>0</test_data_num>
3672 <data_def_list> 4051 <data_def_list>
3673 <data_def> 4052 <data_def>
3674 - <column_id>28</column_id> 4053 + <column_id>11</column_id>
3675 <type>Format</type> 4054 <type>Format</type>
3676 <repeat_num>1</repeat_num> 4055 <repeat_num>1</repeat_num>
3677 <template>%</template> 4056 <template>%</template>
@@ -3686,7 +4065,7 @@ @@ -3686,7 +4065,7 @@
3686 </modified_values> 4065 </modified_values>
3687 </data_def> 4066 </data_def>
3688 <data_def> 4067 <data_def>
3689 - <column_id>29</column_id> 4068 + <column_id>12</column_id>
3690 <type>Foreign Key</type> 4069 <type>Foreign Key</type>
3691 <repeat_num>1</repeat_num> 4070 <repeat_num>1</repeat_num>
3692 <template>%</template> 4071 <template>%</template>
@@ -3701,7 +4080,7 @@ @@ -3701,7 +4080,7 @@
3701 </modified_values> 4080 </modified_values>
3702 </data_def> 4081 </data_def>
3703 <data_def> 4082 <data_def>
3704 - <column_id>30</column_id> 4083 + <column_id>13</column_id>
3705 <type>Foreign Key</type> 4084 <type>Foreign Key</type>
3706 <repeat_num>1</repeat_num> 4085 <repeat_num>1</repeat_num>
3707 <template>%</template> 4086 <template>%</template>
@@ -3716,7 +4095,7 @@ @@ -3716,7 +4095,7 @@
3716 </modified_values> 4095 </modified_values>
3717 </data_def> 4096 </data_def>
3718 <data_def> 4097 <data_def>
3719 - <column_id>31</column_id> 4098 + <column_id>14</column_id>
3720 <type>Foreign Key</type> 4099 <type>Foreign Key</type>
3721 <repeat_num>1</repeat_num> 4100 <repeat_num>1</repeat_num>
3722 <template>%</template> 4101 <template>%</template>
@@ -3731,7 +4110,7 @@ @@ -3731,7 +4110,7 @@
3731 </modified_values> 4110 </modified_values>
3732 </data_def> 4111 </data_def>
3733 <data_def> 4112 <data_def>
3734 - <column_id>32</column_id> 4113 + <column_id>15</column_id>
3735 <type>Foreign Key</type> 4114 <type>Foreign Key</type>
3736 <repeat_num>1</repeat_num> 4115 <repeat_num>1</repeat_num>
3737 <template>%</template> 4116 <template>%</template>
@@ -3746,7 +4125,7 @@ @@ -3746,7 +4125,7 @@
3746 </modified_values> 4125 </modified_values>
3747 </data_def> 4126 </data_def>
3748 <data_def> 4127 <data_def>
3749 - <column_id>33</column_id> 4128 + <column_id>16</column_id>
3750 <type>Foreign Key</type> 4129 <type>Foreign Key</type>
3751 <repeat_num>1</repeat_num> 4130 <repeat_num>1</repeat_num>
3752 <template>%</template> 4131 <template>%</template>
@@ -3761,7 +4140,7 @@ @@ -3761,7 +4140,7 @@
3761 </modified_values> 4140 </modified_values>
3762 </data_def> 4141 </data_def>
3763 <data_def> 4142 <data_def>
3764 - <column_id>34</column_id> 4143 + <column_id>17</column_id>
3765 <type>Format</type> 4144 <type>Format</type>
3766 <repeat_num>1</repeat_num> 4145 <repeat_num>1</repeat_num>
3767 <template>esquemadb%</template> 4146 <template>esquemadb%</template>
@@ -3776,7 +4155,7 @@ @@ -3776,7 +4155,7 @@
3776 </modified_values> 4155 </modified_values>
3777 </data_def> 4156 </data_def>
3778 <data_def> 4157 <data_def>
3779 - <column_id>35</column_id> 4158 + <column_id>18</column_id>
3780 <type>Format</type> 4159 <type>Format</type>
3781 <repeat_num>1</repeat_num> 4160 <repeat_num>1</repeat_num>
3782 <template>tabela%</template> 4161 <template>tabela%</template>
@@ -3791,7 +4170,7 @@ @@ -3791,7 +4170,7 @@
3791 </modified_values> 4170 </modified_values>
3792 </data_def> 4171 </data_def>
3793 <data_def> 4172 <data_def>
3794 - <column_id>36</column_id> 4173 + <column_id>19</column_id>
3795 <type>Format</type> 4174 <type>Format</type>
3796 <repeat_num>1</repeat_num> 4175 <repeat_num>1</repeat_num>
3797 <template>colunavalor%</template> 4176 <template>colunavalor%</template>
@@ -3806,7 +4185,7 @@ @@ -3806,7 +4185,7 @@
3806 </modified_values> 4185 </modified_values>
3807 </data_def> 4186 </data_def>
3808 <data_def> 4187 <data_def>
3809 - <column_id>37</column_id> 4188 + <column_id>20</column_id>
3810 <type>Format</type> 4189 <type>Format</type>
3811 <repeat_num>1</repeat_num> 4190 <repeat_num>1</repeat_num>
3812 <template>colunaidgeo_%</template> 4191 <template>colunaidgeo_%</template>
@@ -3821,7 +4200,7 @@ @@ -3821,7 +4200,7 @@
3821 </modified_values> 4200 </modified_values>
3822 </data_def> 4201 </data_def>
3823 <data_def> 4202 <data_def>
3824 - <column_id>38</column_id> 4203 + <column_id>21</column_id>
3825 <type>Format</type> 4204 <type>Format</type>
3826 <repeat_num>1</repeat_num> 4205 <repeat_num>1</repeat_num>
3827 <template>filtro%</template> 4206 <template>filtro%</template>
@@ -3836,7 +4215,7 @@ @@ -3836,7 +4215,7 @@
3836 </modified_values> 4215 </modified_values>
3837 </data_def> 4216 </data_def>
3838 <data_def> 4217 <data_def>
3839 - <column_id>39</column_id> 4218 + <column_id>22</column_id>
3840 <type>Format</type> 4219 <type>Format</type>
3841 <repeat_num>1</repeat_num> 4220 <repeat_num>1</repeat_num>
3842 <template>nomemedida_%</template> 4221 <template>nomemedida_%</template>
@@ -3854,57 +4233,57 @@ @@ -3854,57 +4233,57 @@
3854 </repeat_test_data> 4233 </repeat_test_data>
3855 </table_test_data> 4234 </table_test_data>
3856 <table_test_data> 4235 <table_test_data>
3857 - <table_id>9</table_id> 4236 + <table_id>7</table_id>
3858 <direct_test_data> 4237 <direct_test_data>
3859 <data> 4238 <data>
3860 <column_data> 4239 <column_data>
3861 - <column_id>40</column_id> 4240 + <column_id>23</column_id>
3862 <value>1</value> 4241 <value>1</value>
3863 </column_data> 4242 </column_data>
3864 <column_data> 4243 <column_data>
3865 - <column_id>41</column_id> 4244 + <column_id>24</column_id>
3866 <value>to_date(mes_farm_pop||&apos; &apos;||ano_farm,&apos;MM YYYY&apos;) as mes</value> 4245 <value>to_date(mes_farm_pop||&apos; &apos;||ano_farm,&apos;MM YYYY&apos;) as mes</value>
3867 </column_data> 4246 </column_data>
3868 <column_data> 4247 <column_data>
3869 - <column_id>42</column_id> 4248 + <column_id>25</column_id>
3870 <value>mês e ano</value> 4249 <value>mês e ano</value>
3871 </column_data> 4250 </column_data>
3872 <column_data> 4251 <column_data>
3873 - <column_id>43</column_id> 4252 + <column_id>26</column_id>
3874 <value></value> 4253 <value></value>
3875 </column_data> 4254 </column_data>
3876 <column_data> 4255 <column_data>
3877 - <column_id>44</column_id> 4256 + <column_id>27</column_id>
3878 <value>0</value> 4257 <value>0</value>
3879 </column_data> 4258 </column_data>
3880 <column_data> 4259 <column_data>
3881 - <column_id>45</column_id> 4260 + <column_id>28</column_id>
3882 <value>1</value> 4261 <value>1</value>
3883 </column_data> 4262 </column_data>
3884 </data> 4263 </data>
3885 <data> 4264 <data>
3886 <column_data> 4265 <column_data>
3887 - <column_id>40</column_id> 4266 + <column_id>23</column_id>
3888 <value>2</value> 4267 <value>2</value>
3889 </column_data> 4268 </column_data>
3890 <column_data> 4269 <column_data>
3891 - <column_id>41</column_id> 4270 + <column_id>24</column_id>
3892 <value>ano_farm</value> 4271 <value>ano_farm</value>
3893 </column_data> 4272 </column_data>
3894 <column_data> 4273 <column_data>
3895 - <column_id>42</column_id> 4274 + <column_id>25</column_id>
3896 <value>ano</value> 4275 <value>ano</value>
3897 </column_data> 4276 </column_data>
3898 <column_data> 4277 <column_data>
3899 - <column_id>43</column_id> 4278 + <column_id>26</column_id>
3900 <value></value> 4279 <value></value>
3901 </column_data> 4280 </column_data>
3902 <column_data> 4281 <column_data>
3903 - <column_id>44</column_id> 4282 + <column_id>27</column_id>
3904 <value>1</value> 4283 <value>1</value>
3905 </column_data> 4284 </column_data>
3906 <column_data> 4285 <column_data>
3907 - <column_id>45</column_id> 4286 + <column_id>28</column_id>
3908 <value>1</value> 4287 <value>1</value>
3909 </column_data> 4288 </column_data>
3910 </data> 4289 </data>
@@ -3913,7 +4292,7 @@ @@ -3913,7 +4292,7 @@
3913 <test_data_num>0</test_data_num> 4292 <test_data_num>0</test_data_num>
3914 <data_def_list> 4293 <data_def_list>
3915 <data_def> 4294 <data_def>
3916 - <column_id>40</column_id> 4295 + <column_id>23</column_id>
3917 <type>Format</type> 4296 <type>Format</type>
3918 <repeat_num>1</repeat_num> 4297 <repeat_num>1</repeat_num>
3919 <template>%</template> 4298 <template>%</template>
@@ -3928,7 +4307,7 @@ @@ -3928,7 +4307,7 @@
3928 </modified_values> 4307 </modified_values>
3929 </data_def> 4308 </data_def>
3930 <data_def> 4309 <data_def>
3931 - <column_id>41</column_id> 4310 + <column_id>24</column_id>
3932 <type>Format</type> 4311 <type>Format</type>
3933 <repeat_num>1</repeat_num> 4312 <repeat_num>1</repeat_num>
3934 <template>coluna%</template> 4313 <template>coluna%</template>
@@ -3943,7 +4322,7 @@ @@ -3943,7 +4322,7 @@
3943 </modified_values> 4322 </modified_values>
3944 </data_def> 4323 </data_def>
3945 <data_def> 4324 <data_def>
3946 - <column_id>42</column_id> 4325 + <column_id>25</column_id>
3947 <type>Format</type> 4326 <type>Format</type>
3948 <repeat_num>1</repeat_num> 4327 <repeat_num>1</repeat_num>
3949 <template>nomedimensao%</template> 4328 <template>nomedimensao%</template>
@@ -3958,7 +4337,7 @@ @@ -3958,7 +4337,7 @@
3958 </modified_values> 4337 </modified_values>
3959 </data_def> 4338 </data_def>
3960 <data_def> 4339 <data_def>
3961 - <column_id>43</column_id> 4340 + <column_id>26</column_id>
3962 <type>Format</type> 4341 <type>Format</type>
3963 <repeat_num>1</repeat_num> 4342 <repeat_num>1</repeat_num>
3964 <template>descricao%</template> 4343 <template>descricao%</template>
@@ -3973,7 +4352,7 @@ @@ -3973,7 +4352,7 @@
3973 </modified_values> 4352 </modified_values>
3974 </data_def> 4353 </data_def>
3975 <data_def> 4354 <data_def>
3976 - <column_id>44</column_id> 4355 + <column_id>27</column_id>
3977 <type>Format</type> 4356 <type>Format</type>
3978 <repeat_num>1</repeat_num> 4357 <repeat_num>1</repeat_num>
3979 <template>%</template> 4358 <template>%</template>
@@ -3988,7 +4367,7 @@ @@ -3988,7 +4367,7 @@
3988 </modified_values> 4367 </modified_values>
3989 </data_def> 4368 </data_def>
3990 <data_def> 4369 <data_def>
3991 - <column_id>45</column_id> 4370 + <column_id>28</column_id>
3992 <type>Foreign Key</type> 4371 <type>Foreign Key</type>
3993 <repeat_num>1</repeat_num> 4372 <repeat_num>1</repeat_num>
3994 <template>%</template> 4373 <template>%</template>
@@ -4006,19 +4385,19 @@ @@ -4006,19 +4385,19 @@
4006 </repeat_test_data> 4385 </repeat_test_data>
4007 </table_test_data> 4386 </table_test_data>
4008 <table_test_data> 4387 <table_test_data>
4009 - <table_id>7</table_id> 4388 + <table_id>5</table_id>
4010 <direct_test_data> 4389 <direct_test_data>
4011 <data> 4390 <data>
4012 <column_data> 4391 <column_data>
4013 - <column_id>25</column_id> 4392 + <column_id>8</column_id>
4014 <value>1</value> 4393 <value>1</value>
4015 </column_data> 4394 </column_data>
4016 <column_data> 4395 <column_data>
4017 - <column_id>26</column_id> 4396 + <column_id>9</column_id>
4018 <value>Farmácias populares existentes</value> 4397 <value>Farmácias populares existentes</value>
4019 </column_data> 4398 </column_data>
4020 <column_data> 4399 <column_data>
4021 - <column_id>27</column_id> 4400 + <column_id>10</column_id>
4022 <value>Quantidade de farmácias populares existentes</value> 4401 <value>Quantidade de farmácias populares existentes</value>
4023 </column_data> 4402 </column_data>
4024 </data> 4403 </data>
@@ -4027,7 +4406,7 @@ @@ -4027,7 +4406,7 @@
4027 <test_data_num>0</test_data_num> 4406 <test_data_num>0</test_data_num>
4028 <data_def_list> 4407 <data_def_list>
4029 <data_def> 4408 <data_def>
4030 - <column_id>25</column_id> 4409 + <column_id>8</column_id>
4031 <type>Format</type> 4410 <type>Format</type>
4032 <repeat_num>1</repeat_num> 4411 <repeat_num>1</repeat_num>
4033 <template>%</template> 4412 <template>%</template>
@@ -4042,7 +4421,7 @@ @@ -4042,7 +4421,7 @@
4042 </modified_values> 4421 </modified_values>
4043 </data_def> 4422 </data_def>
4044 <data_def> 4423 <data_def>
4045 - <column_id>26</column_id> 4424 + <column_id>9</column_id>
4046 <type>Format</type> 4425 <type>Format</type>
4047 <repeat_num>1</repeat_num> 4426 <repeat_num>1</repeat_num>
4048 <template>nome%</template> 4427 <template>nome%</template>
@@ -4057,7 +4436,7 @@ @@ -4057,7 +4436,7 @@
4057 </modified_values> 4436 </modified_values>
4058 </data_def> 4437 </data_def>
4059 <data_def> 4438 <data_def>
4060 - <column_id>27</column_id> 4439 + <column_id>10</column_id>
4061 <type>Format</type> 4440 <type>Format</type>
4062 <repeat_num>1</repeat_num> 4441 <repeat_num>1</repeat_num>
4063 <template>descricao%</template> 4442 <template>descricao%</template>
@@ -4074,6 +4453,461 @@ @@ -4074,6 +4453,461 @@
4074 </data_def_list> 4453 </data_def_list>
4075 </repeat_test_data> 4454 </repeat_test_data>
4076 </table_test_data> 4455 </table_test_data>
  4456 + <table_test_data>
  4457 + <table_id>9</table_id>
  4458 + <direct_test_data>
  4459 + <data>
  4460 + <column_data>
  4461 + <column_id>29</column_id>
  4462 + <value>1</value>
  4463 + </column_data>
  4464 + <column_data>
  4465 + <column_id>30</column_id>
  4466 + <value>Pela média</value>
  4467 + </column_data>
  4468 + <column_data>
  4469 + <column_id>31</column_id>
  4470 + <value>1</value>
  4471 + </column_data>
  4472 + <column_data>
  4473 + <column_id>32</column_id>
  4474 + <value></value>
  4475 + </column_data>
  4476 + </data>
  4477 + </direct_test_data>
  4478 + <repeat_test_data>
  4479 + <test_data_num>0</test_data_num>
  4480 + <data_def_list>
  4481 + <data_def>
  4482 + <column_id>29</column_id>
  4483 + <type>Format</type>
  4484 + <repeat_num>1</repeat_num>
  4485 + <template>%</template>
  4486 + <from>1</from>
  4487 + <to>100</to>
  4488 + <increment>1</increment>
  4489 + <select>1</select>
  4490 + <select>2</select>
  4491 + <select>3</select>
  4492 + <select>4</select>
  4493 + <modified_values>
  4494 + </modified_values>
  4495 + </data_def>
  4496 + <data_def>
  4497 + <column_id>30</column_id>
  4498 + <type>Format</type>
  4499 + <repeat_num>1</repeat_num>
  4500 + <template>nome%</template>
  4501 + <from>1</from>
  4502 + <to>100</to>
  4503 + <increment>1</increment>
  4504 + <select>nome1</select>
  4505 + <select>nome2</select>
  4506 + <select>nome3</select>
  4507 + <select>nome4</select>
  4508 + <modified_values>
  4509 + </modified_values>
  4510 + </data_def>
  4511 + <data_def>
  4512 + <column_id>31</column_id>
  4513 + <type>Foreign Key</type>
  4514 + <repeat_num>1</repeat_num>
  4515 + <template>%</template>
  4516 + <from>1</from>
  4517 + <to>100</to>
  4518 + <increment>1</increment>
  4519 + <select>1</select>
  4520 + <select>2</select>
  4521 + <select>3</select>
  4522 + <select>4</select>
  4523 + <modified_values>
  4524 + </modified_values>
  4525 + </data_def>
  4526 + <data_def>
  4527 + <column_id>32</column_id>
  4528 + <type>Format</type>
  4529 + <repeat_num>1</repeat_num>
  4530 + <template>observacao%</template>
  4531 + <from>1</from>
  4532 + <to>100</to>
  4533 + <increment>1</increment>
  4534 + <select>observacao1</select>
  4535 + <select>observacao2</select>
  4536 + <select>observacao3</select>
  4537 + <select>observacao4</select>
  4538 + <modified_values>
  4539 + </modified_values>
  4540 + </data_def>
  4541 + </data_def_list>
  4542 + </repeat_test_data>
  4543 + </table_test_data>
  4544 + <table_test_data>
  4545 + <table_id>10</table_id>
  4546 + <direct_test_data>
  4547 + <data>
  4548 + <column_data>
  4549 + <column_id>33</column_id>
  4550 + <value>1</value>
  4551 + </column_data>
  4552 + <column_data>
  4553 + <column_id>34</column_id>
  4554 + <value>([nu_farm_funcionando] &lt; 1)</value>
  4555 + </column_data>
  4556 + <column_data>
  4557 + <column_id>35</column_id>
  4558 + <value>Nenhuma</value>
  4559 + </column_data>
  4560 + <column_data>
  4561 + <column_id>36</column_id>
  4562 + <value>255</value>
  4563 + </column_data>
  4564 + <column_data>
  4565 + <column_id>37</column_id>
  4566 + <value>0</value>
  4567 + </column_data>
  4568 + <column_data>
  4569 + <column_id>38</column_id>
  4570 + <value>0</value>
  4571 + </column_data>
  4572 + <column_data>
  4573 + <column_id>39</column_id>
  4574 + <value>1</value>
  4575 + </column_data>
  4576 + <column_data>
  4577 + <column_id>40</column_id>
  4578 + <value></value>
  4579 + </column_data>
  4580 + <column_data>
  4581 + <column_id>41</column_id>
  4582 + <value></value>
  4583 + </column_data>
  4584 + <column_data>
  4585 + <column_id>42</column_id>
  4586 + <value>0</value>
  4587 + </column_data>
  4588 + <column_data>
  4589 + <column_id>43</column_id>
  4590 + <value>0</value>
  4591 + </column_data>
  4592 + <column_data>
  4593 + <column_id>44</column_id>
  4594 + <value>0</value>
  4595 + </column_data>
  4596 + <column_data>
  4597 + <column_id>45</column_id>
  4598 + <value></value>
  4599 + </column_data>
  4600 + </data>
  4601 + <data>
  4602 + <column_data>
  4603 + <column_id>33</column_id>
  4604 + <value>2</value>
  4605 + </column_data>
  4606 + <column_data>
  4607 + <column_id>34</column_id>
  4608 + <value>([nu_farm_funcionando] = 1)</value>
  4609 + </column_data>
  4610 + <column_data>
  4611 + <column_id>35</column_id>
  4612 + <value>Uma</value>
  4613 + </column_data>
  4614 + <column_data>
  4615 + <column_id>36</column_id>
  4616 + <value>0</value>
  4617 + </column_data>
  4618 + <column_data>
  4619 + <column_id>37</column_id>
  4620 + <value>255</value>
  4621 + </column_data>
  4622 + <column_data>
  4623 + <column_id>38</column_id>
  4624 + <value>0</value>
  4625 + </column_data>
  4626 + <column_data>
  4627 + <column_id>39</column_id>
  4628 + <value>1</value>
  4629 + </column_data>
  4630 + <column_data>
  4631 + <column_id>40</column_id>
  4632 + <value></value>
  4633 + </column_data>
  4634 + <column_data>
  4635 + <column_id>41</column_id>
  4636 + <value></value>
  4637 + </column_data>
  4638 + <column_data>
  4639 + <column_id>42</column_id>
  4640 + <value></value>
  4641 + </column_data>
  4642 + <column_data>
  4643 + <column_id>43</column_id>
  4644 + <value></value>
  4645 + </column_data>
  4646 + <column_data>
  4647 + <column_id>44</column_id>
  4648 + <value></value>
  4649 + </column_data>
  4650 + <column_data>
  4651 + <column_id>45</column_id>
  4652 + <value></value>
  4653 + </column_data>
  4654 + </data>
  4655 + <data>
  4656 + <column_data>
  4657 + <column_id>33</column_id>
  4658 + <value>3</value>
  4659 + </column_data>
  4660 + <column_data>
  4661 + <column_id>34</column_id>
  4662 + <value>([nu_farm_funcionando] &gt; 1)</value>
  4663 + </column_data>
  4664 + <column_data>
  4665 + <column_id>35</column_id>
  4666 + <value>Mais de uma</value>
  4667 + </column_data>
  4668 + <column_data>
  4669 + <column_id>36</column_id>
  4670 + <value>0</value>
  4671 + </column_data>
  4672 + <column_data>
  4673 + <column_id>37</column_id>
  4674 + <value>0</value>
  4675 + </column_data>
  4676 + <column_data>
  4677 + <column_id>38</column_id>
  4678 + <value>255</value>
  4679 + </column_data>
  4680 + <column_data>
  4681 + <column_id>39</column_id>
  4682 + <value>1</value>
  4683 + </column_data>
  4684 + <column_data>
  4685 + <column_id>40</column_id>
  4686 + <value></value>
  4687 + </column_data>
  4688 + <column_data>
  4689 + <column_id>41</column_id>
  4690 + <value></value>
  4691 + </column_data>
  4692 + <column_data>
  4693 + <column_id>42</column_id>
  4694 + <value></value>
  4695 + </column_data>
  4696 + <column_data>
  4697 + <column_id>43</column_id>
  4698 + <value></value>
  4699 + </column_data>
  4700 + <column_data>
  4701 + <column_id>44</column_id>
  4702 + <value></value>
  4703 + </column_data>
  4704 + <column_data>
  4705 + <column_id>45</column_id>
  4706 + <value></value>
  4707 + </column_data>
  4708 + </data>
  4709 + </direct_test_data>
  4710 + <repeat_test_data>
  4711 + <test_data_num>0</test_data_num>
  4712 + <data_def_list>
  4713 + <data_def>
  4714 + <column_id>33</column_id>
  4715 + <type>Format</type>
  4716 + <repeat_num>1</repeat_num>
  4717 + <template>%</template>
  4718 + <from>1</from>
  4719 + <to>100</to>
  4720 + <increment>1</increment>
  4721 + <select>1</select>
  4722 + <select>2</select>
  4723 + <select>3</select>
  4724 + <select>4</select>
  4725 + <modified_values>
  4726 + </modified_values>
  4727 + </data_def>
  4728 + <data_def>
  4729 + <column_id>34</column_id>
  4730 + <type>Format</type>
  4731 + <repeat_num>1</repeat_num>
  4732 + <template>expressao%</template>
  4733 + <from>1</from>
  4734 + <to>100</to>
  4735 + <increment>1</increment>
  4736 + <select>expressao1</select>
  4737 + <select>expressao2</select>
  4738 + <select>expressao3</select>
  4739 + <select>expressao4</select>
  4740 + <modified_values>
  4741 + </modified_values>
  4742 + </data_def>
  4743 + <data_def>
  4744 + <column_id>35</column_id>
  4745 + <type>Format</type>
  4746 + <repeat_num>1</repeat_num>
  4747 + <template>titulo%</template>
  4748 + <from>1</from>
  4749 + <to>100</to>
  4750 + <increment>1</increment>
  4751 + <select>titulo1</select>
  4752 + <select>titulo2</select>
  4753 + <select>titulo3</select>
  4754 + <select>titulo4</select>
  4755 + <modified_values>
  4756 + </modified_values>
  4757 + </data_def>
  4758 + <data_def>
  4759 + <column_id>36</column_id>
  4760 + <type>Format</type>
  4761 + <repeat_num>1</repeat_num>
  4762 + <template>vermelho%</template>
  4763 + <from>1</from>
  4764 + <to>100</to>
  4765 + <increment>1</increment>
  4766 + <select>vermelho1</select>
  4767 + <select>vermelho2</select>
  4768 + <select>vermelho3</select>
  4769 + <select>vermelho4</select>
  4770 + <modified_values>
  4771 + </modified_values>
  4772 + </data_def>
  4773 + <data_def>
  4774 + <column_id>37</column_id>
  4775 + <type>Format</type>
  4776 + <repeat_num>1</repeat_num>
  4777 + <template>verde%</template>
  4778 + <from>1</from>
  4779 + <to>100</to>
  4780 + <increment>1</increment>
  4781 + <select>verde1</select>
  4782 + <select>verde2</select>
  4783 + <select>verde3</select>
  4784 + <select>verde4</select>
  4785 + <modified_values>
  4786 + </modified_values>
  4787 + </data_def>
  4788 + <data_def>
  4789 + <column_id>38</column_id>
  4790 + <type>Format</type>
  4791 + <repeat_num>1</repeat_num>
  4792 + <template>azul%</template>
  4793 + <from>1</from>
  4794 + <to>100</to>
  4795 + <increment>1</increment>
  4796 + <select>azul1</select>
  4797 + <select>azul2</select>
  4798 + <select>azul3</select>
  4799 + <select>azul4</select>
  4800 + <modified_values>
  4801 + </modified_values>
  4802 + </data_def>
  4803 + <data_def>
  4804 + <column_id>39</column_id>
  4805 + <type>Foreign Key</type>
  4806 + <repeat_num>1</repeat_num>
  4807 + <template>%</template>
  4808 + <from>1</from>
  4809 + <to>100</to>
  4810 + <increment>1</increment>
  4811 + <select>1</select>
  4812 + <select>2</select>
  4813 + <select>3</select>
  4814 + <select>4</select>
  4815 + <modified_values>
  4816 + </modified_values>
  4817 + </data_def>
  4818 + <data_def>
  4819 + <column_id>40</column_id>
  4820 + <type>Format</type>
  4821 + <repeat_num>1</repeat_num>
  4822 + <template>tamanho%</template>
  4823 + <from>1</from>
  4824 + <to>100</to>
  4825 + <increment>1</increment>
  4826 + <select>tamanho1</select>
  4827 + <select>tamanho2</select>
  4828 + <select>tamanho3</select>
  4829 + <select>tamanho4</select>
  4830 + <modified_values>
  4831 + </modified_values>
  4832 + </data_def>
  4833 + <data_def>
  4834 + <column_id>41</column_id>
  4835 + <type>Format</type>
  4836 + <repeat_num>1</repeat_num>
  4837 + <template>simbolo%</template>
  4838 + <from>1</from>
  4839 + <to>100</to>
  4840 + <increment>1</increment>
  4841 + <select>simbolo1</select>
  4842 + <select>simbolo2</select>
  4843 + <select>simbolo3</select>
  4844 + <select>simbolo4</select>
  4845 + <modified_values>
  4846 + </modified_values>
  4847 + </data_def>
  4848 + <data_def>
  4849 + <column_id>42</column_id>
  4850 + <type>Format</type>
  4851 + <repeat_num>1</repeat_num>
  4852 + <template>overmelho%</template>
  4853 + <from>1</from>
  4854 + <to>100</to>
  4855 + <increment>1</increment>
  4856 + <select>overmelho1</select>
  4857 + <select>overmelho2</select>
  4858 + <select>overmelho3</select>
  4859 + <select>overmelho4</select>
  4860 + <modified_values>
  4861 + </modified_values>
  4862 + </data_def>
  4863 + <data_def>
  4864 + <column_id>43</column_id>
  4865 + <type>Format</type>
  4866 + <repeat_num>1</repeat_num>
  4867 + <template>overde%</template>
  4868 + <from>1</from>
  4869 + <to>100</to>
  4870 + <increment>1</increment>
  4871 + <select>overde1</select>
  4872 + <select>overde2</select>
  4873 + <select>overde3</select>
  4874 + <select>overde4</select>
  4875 + <modified_values>
  4876 + </modified_values>
  4877 + </data_def>
  4878 + <data_def>
  4879 + <column_id>44</column_id>
  4880 + <type>Format</type>
  4881 + <repeat_num>1</repeat_num>
  4882 + <template>oazul%</template>
  4883 + <from>1</from>
  4884 + <to>100</to>
  4885 + <increment>1</increment>
  4886 + <select>oazul1</select>
  4887 + <select>oazul2</select>
  4888 + <select>oazul3</select>
  4889 + <select>oazul4</select>
  4890 + <modified_values>
  4891 + </modified_values>
  4892 + </data_def>
  4893 + <data_def>
  4894 + <column_id>45</column_id>
  4895 + <type>Format</type>
  4896 + <repeat_num>1</repeat_num>
  4897 + <template>otamanho%</template>
  4898 + <from>1</from>
  4899 + <to>100</to>
  4900 + <increment>1</increment>
  4901 + <select>otamanho1</select>
  4902 + <select>otamanho2</select>
  4903 + <select>otamanho3</select>
  4904 + <select>otamanho4</select>
  4905 + <modified_values>
  4906 + </modified_values>
  4907 + </data_def>
  4908 + </data_def_list>
  4909 + </repeat_test_data>
  4910 + </table_test_data>
4077 </test_data> 4911 </test_data>
4078 </test_data_list> 4912 </test_data_list>
4079 <sequence_set> 4913 <sequence_set>
pacotes/kmlmapserver/classes/layerserver.class.php
  Diff comments   View file @a21dbce
@@ -123,7 +123,7 @@ class LayerServer { @@ -123,7 +123,7 @@ class LayerServer {
123 * 123 *
124 */ 124 */
125 function LayerServer(){ 125 function LayerServer(){
126 - $this->errors = array(); 126 + $this->errors = array();
127 // Load request parameters 127 // Load request parameters
128 $this->get_request(); 128 $this->get_request();
129 129
@@ -131,7 +131,7 @@ class LayerServer { @@ -131,7 +131,7 @@ class LayerServer {
131 131
132 // Load map 132 // Load map
133 if(!$this->has_error()) { 133 if(!$this->has_error()) {
134 - $this->load_map(); 134 + $this->load_map();
135 } 135 }
136 136
137 } 137 }
@@ -157,7 +157,23 @@ class LayerServer { @@ -157,7 +157,23 @@ class LayerServer {
157 } else { 157 } else {
158 $this->_networklink = false; 158 $this->_networklink = false;
159 } 159 }
160 - $this->_xml = new SimpleXMLElement('<kml xmlns="http://earth.google.com/kml/2.0"><Document ></Document></kml>'); 160 +
  161 + $imageObj = $this->map_object->drawlegend();
  162 + $url = $imageObj->saveWebImage();
  163 + $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
  164 + $url = strtolower($protocolo[0]."://".$_SERVER['HTTP_HOST']).$url;
  165 +
  166 + $legenda = " <ScreenOverlay>" . PHP_EOL
  167 + . " <name>Legenda</name>" . PHP_EOL
  168 + . " <Icon>" . PHP_EOL
  169 + . " <href>".$url."</href>" . PHP_EOL
  170 + . " </Icon>" . PHP_EOL
  171 + . " <overlayXY x='0.01' y='0.14' xunits='fraction' yunits='fraction'/>" . PHP_EOL
  172 + . " <screenXY x='0.01' y='0.14' xunits='fraction' yunits='fraction'/>" . PHP_EOL
  173 + . " <size x='-1' y='-1' xunits='pixels' yunits='pixels'/>" . PHP_EOL
  174 + . " </ScreenOverlay>" . PHP_EOL;
  175 +
  176 + $this->_xml = new SimpleXMLElement('<kml xmlns="http://earth.google.com/kml/2.0"><Document >'.$legenda.'</Document></kml>');
161 // Prepare projection 177 // Prepare projection
162 $this->in_proj = ms_newProjectionObj($this->map_object->getProjection()); 178 $this->in_proj = ms_newProjectionObj($this->map_object->getProjection());
163 // Set projection to GOOGLE earth's projection 179 // Set projection to GOOGLE earth's projection
@@ -174,6 +190,7 @@ class LayerServer { @@ -174,6 +190,7 @@ class LayerServer {
174 if($this->has_error()){ 190 if($this->has_error()){
175 $this->add_errors(); 191 $this->add_errors();
176 } 192 }
  193 +
177 return $this->send_stream($this->get_kml()); 194 return $this->send_stream($this->get_kml());
178 } 195 }
179 196
@@ -239,7 +256,8 @@ class LayerServer { @@ -239,7 +256,8 @@ class LayerServer {
239 } 256 }
240 } else { 257 } else {
241 foreach($layers as $layer){ 258 foreach($layers as $layer){
242 - $this->process_layer_request($layer); 259 + //echo "Oi";exit;
  260 + $this->process_layer_request($layer);
243 } 261 }
244 } 262 }
245 } 263 }
@@ -264,12 +282,10 @@ class LayerServer { @@ -264,12 +282,10 @@ class LayerServer {
264 */ 282 */
265 function process_layer_request(&$layer_name){ 283 function process_layer_request(&$layer_name){
266 error_reporting(0); 284 error_reporting(0);
267 -  
268 $v = "5.0.0"; 285 $v = "5.0.0";
269 $vs = explode(" ",ms_GetVersion()); 286 $vs = explode(" ",ms_GetVersion());
270 $cvs = count($vs); 287 $cvs = count($vs);
271 - for ($i=0;$i<$cvs;++$i)  
272 - { 288 + for ($i=0;$i<$cvs;++$i) {
273 if(trim(strtolower($vs[$i])) == "version") 289 if(trim(strtolower($vs[$i])) == "version")
274 {$v = $vs[$i+1];} 290 {$v = $vs[$i+1];}
275 } 291 }
@@ -283,16 +299,12 @@ class LayerServer { @@ -283,16 +299,12 @@ class LayerServer {
283 $this->set_error('Nenhum layer com esse nome foi encontrado no mapfile ' . $layer_name, $layer_name); 299 $this->set_error('Nenhum layer com esse nome foi encontrado no mapfile ' . $layer_name, $layer_name);
284 return false; 300 return false;
285 } 301 }
286 -  
287 // Add to layer list 302 // Add to layer list
288 $this->layers[$layer_name] =& $layer; 303 $this->layers[$layer_name] =& $layer;
289 -  
290 // Get custom template if any 304 // Get custom template if any
291 $description_template = $layer->getMetadata('DESCRIPTION_TEMPLATE'); 305 $description_template = $layer->getMetadata('DESCRIPTION_TEMPLATE');
292 -  
293 // Set on 306 // Set on
294 $layer->set( 'status', MS_DEFAULT ); 307 $layer->set( 'status', MS_DEFAULT );
295 -  
296 // Set kml title from layer description (default to layer name) 308 // Set kml title from layer description (default to layer name)
297 $layer_desc = $this->get_layer_description($layer); 309 $layer_desc = $this->get_layer_description($layer);
298 310
@@ -318,10 +330,10 @@ class LayerServer { @@ -318,10 +330,10 @@ class LayerServer {
318 //simplexml_addChild($parent, $name, $value='') 330 //simplexml_addChild($parent, $name, $value='')
319 //$folder->addChild('description', $this->get_layer_description($layer)); 331 //$folder->addChild('description', $this->get_layer_description($layer));
320 $this->simplexml_addChild($folder,'name',$layer_desc); 332 $this->simplexml_addChild($folder,'name',$layer_desc);
  333 +
321 //$folder->addChild('name', $layer_desc); 334 //$folder->addChild('name', $layer_desc);
322 $this->add_wms_link($folder, $layer, $wms_link); 335 $this->add_wms_link($folder, $layer, $wms_link);
323 } else { 336 } else {
324 -  
325 // Apply filter 337 // Apply filter
326 if($this->filter){ 338 if($this->filter){
327 // Try loading as XML 339 // Try loading as XML
@@ -389,12 +401,15 @@ class LayerServer { @@ -389,12 +401,15 @@ class LayerServer {
389 { 401 {
390 // get next shape row 402 // get next shape row
391 if($versao == 6) 403 if($versao == 6)
392 - {$shape = $layer->getShape($layer->getResult($j));} 404 + {
  405 + $result = $layer->getResult($j);
  406 + $shape = $layer->getShape($result);
  407 + }
393 else{ 408 else{
394 $result = $layer->getResult($j); 409 $result = $layer->getResult($j);
395 $shape = $layer->getFeature($result->shapeindex,$result->tileindex); 410 $shape = $layer->getFeature($result->shapeindex,$result->tileindex);
396 } 411 }
397 - $shape->classindex = $result->classindex; 412 + $shape->classindex = $result->classindex;
398 $this->process_shape($layer, $shape, $class_list, $folder, $namecol); 413 $this->process_shape($layer, $shape, $class_list, $folder, $namecol);
399 } 414 }
400 if($n == 0) { 415 if($n == 0) {
@@ -422,7 +437,7 @@ class LayerServer { @@ -422,7 +437,7 @@ class LayerServer {
422 $shape->project($this->in_proj, $this->out_proj); 437 $shape->project($this->in_proj, $this->out_proj);
423 // Assign style 438 // Assign style
424 if($layer->classitem){ 439 if($layer->classitem){
425 - $style_id = $this->get_shape_class($layer->classitem, $shape->values, $class_list); 440 + //$style_id = $this->get_shape_class($layer->classitem, $shape->values, $class_list);
426 } 441 }
427 if(!isset($style_id)){ 442 if(!isset($style_id)){
428 // Get first class 443 // Get first class
@@ -572,7 +587,7 @@ class LayerServer { @@ -572,7 +587,7 @@ class LayerServer {
572 587
573 /** 588 /**
574 * Add a multipolygon 589 * Add a multipolygon
575 - * FIXME: untested, should take holes into account 590 + * fixme: untested, should take holes into account
576 */ 591 */
577 function add_multipolygon(&$wkt, &$element, $featurename){ 592 function add_multipolygon(&$wkt, &$element, $featurename){
578 $ml = $element->addChild('MultiGeometry'); 593 $ml = $element->addChild('MultiGeometry');
@@ -664,7 +679,7 @@ class LayerServer { @@ -664,7 +679,7 @@ class LayerServer {
664 679
665 /** 680 /**
666 * Return a CSV list of all layer names in the mapfile 681 * Return a CSV list of all layer names in the mapfile
667 - * FIXME: filter out ANNOTATIONS and other "strange" layers 682 + * fixme: filter out ANNOTATIONS and other "strange" layers
668 */ 683 */
669 function get_layer_list(){ 684 function get_layer_list(){
670 $layer_list = array(); 685 $layer_list = array();
@@ -700,13 +715,13 @@ class LayerServer { @@ -700,13 +715,13 @@ class LayerServer {
700 */ 715 */
701 function add_style(&$layer, &$folder, $style_id, &$style_data){ 716 function add_style(&$layer, &$folder, $style_id, &$style_data){
702 // Calculare style URL 717 // Calculare style URL
703 - 718 +
704 if($style_data['description_template']){ 719 if($style_data['description_template']){
705 $this->style_counter++; 720 $this->style_counter++;
706 $style_id .= '_'.$this->style_counter; 721 $style_id .= '_'.$this->style_counter;
707 $balloon_data = $this->get_feature_description($attributes[$namecol], $attributes, $style_data['description_template']); 722 $balloon_data = $this->get_feature_description($attributes[$namecol], $attributes, $style_data['description_template']);
708 } 723 }
709 - 724 +
710 // Check if the style already exists 725 // Check if the style already exists
711 $expr = '//*[@id=\''.$style_id.'\']'; 726 $expr = '//*[@id=\''.$style_id.'\']';
712 if($folder->xpath($expr)) { 727 if($folder->xpath($expr)) {
@@ -759,13 +774,20 @@ class LayerServer { @@ -759,13 +774,20 @@ class LayerServer {
759 if($style_data['icon']){ 774 if($style_data['icon']){
760 $st =& $new_style->addChild('IconStyle'); 775 $st =& $new_style->addChild('IconStyle');
761 if($style_data['width'] && $style_data['icon_width'] != 32){ 776 if($style_data['width'] && $style_data['icon_width'] != 32){
762 - $st->addChild('scale', $style_data['icon_width'] / 32); 777 + /**
  778 + * TODO
  779 + */
  780 + //$st->addChild('scale', $style_data['icon_width'] / 32);
  781 + $st->addChild('scale', 1);
763 } 782 }
764 else 783 else
765 {$st->addChild('scale', 1);} 784 {$st->addChild('scale', 1);}
766 $icon =& $st->addChild('Icon'); 785 $icon =& $st->addChild('Icon');
767 $icon->addChild('href', htmlentities($style_data['icon'])); 786 $icon->addChild('href', htmlentities($style_data['icon']));
  787 +
768 } 788 }
  789 + $ls =& $new_style->addChild('LabelStyle');
  790 + $ls->addChild('scale', $style_data['label_size'] / 32);
769 // Add the balloon style if description_template is set 791 // Add the balloon style if description_template is set
770 /* 792 /*
771 if($style_data['description_template']){ 793 if($style_data['description_template']){
@@ -837,12 +859,18 @@ class LayerServer { @@ -837,12 +859,18 @@ class LayerServer {
837 $classe = $layer->getclass($classindex); 859 $classe = $layer->getclass($classindex);
838 $estilo = $classe->getstyle(0); 860 $estilo = $classe->getstyle(0);
839 $url = ""; 861 $url = "";
840 - $imageObj = $classe->createLegendIcon($estilo->size, $estilo->size); 862 + $imageObj = $classe->createLegendIcon(30,30);
841 if($imageObj) 863 if($imageObj)
842 { 864 {
843 $url = $imageObj->saveWebImage(); 865 $url = $imageObj->saveWebImage();
844 $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); 866 $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
845 $url = strtolower($protocolo[0]."://".$_SERVER['HTTP_HOST']).$url; 867 $url = strtolower($protocolo[0]."://".$_SERVER['HTTP_HOST']).$url;
  868 + $nome = $imageObj->imagepath . basename($url);
  869 +
  870 + $img = imagecreatefrompng($nome);
  871 + $index = imagecolorexact($img, 255, 255, 255);
  872 + imagecolortransparent($img, $index);
  873 + imagepng($img, $nome);
846 } 874 }
847 return $url; //$this->endpoint . '?service=icon&map=' . $this->map . '&typename=' . urlencode($layer->name) . '&classname=' . urlencode($classname); 875 return $url; //$this->endpoint . '?service=icon&map=' . $this->map . '&typename=' . urlencode($layer->name) . '&classname=' . urlencode($classname);
848 } 876 }
@@ -867,6 +895,7 @@ class LayerServer { @@ -867,6 +895,7 @@ class LayerServer {
867 if(!$description){ 895 if(!$description){
868 $description = $layer->name; 896 $description = $layer->name;
869 } 897 }
  898 + $description = mb_convert_encoding($description,"UTF-8",mb_detect_encoding($description,"UTF-8,ISO-8859-1"));
870 return $description; 899 return $description;
871 } 900 }
872 901
@@ -917,14 +946,14 @@ class LayerServer { @@ -917,14 +946,14 @@ class LayerServer {
917 $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); 946 $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
918 $servidor = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST']; 947 $servidor = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST'];
919 $temp = $this->map; 948 $temp = $this->map;
920 - if(!file_exists($this->map))  
921 - {  
922 - if(file_exists("ms_configura.php"))  
923 - {include("ms_configura.php");}  
924 - else  
925 - {include("../../ms_configura.php");} 949 + if(file_exists(__DIR__."/ms_configura.php")){
  950 + include(__DIR__."/ms_configura.php");
  951 + }
  952 + else{
  953 + include("../../ms_configura.php");
  954 + }
  955 + if(!file_exists($this->map)){
926 $maptemp = ms_newMapObj($locaplic."/temas/".$this->map.".map"); 956 $maptemp = ms_newMapObj($locaplic."/temas/".$this->map.".map");
927 -  
928 //if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) 957 //if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
929 //{$this->map = $locaplic."/aplicmap/geral1windows.map";} 958 //{$this->map = $locaplic."/aplicmap/geral1windows.map";}
930 //else 959 //else
@@ -952,10 +981,12 @@ class LayerServer { @@ -952,10 +981,12 @@ class LayerServer {
952 } 981 }
953 } 982 }
954 $this->map = $base; 983 $this->map = $base;
955 - 984 +
956 $this->map_object = ms_newMapObj($this->map); 985 $this->map_object = ms_newMapObj($this->map);
957 - if(!$this->_zipped)  
958 - $this->map_object->setmetadata('wms_onlineresource',$servidor.":80/i3geo/ogc.php?tema=".$temp."&width=1500&height=1500&"); 986 + if(!$this->_zipped){
  987 + $this->map_object->setmetadata('wms_onlineresource',$servidor.":80/i3geo/ogc.php?tema=".$temp."&width=1500&height=1500&");
  988 + $this->map_object->setmetadata("ows_enable_request","*");
  989 + }
959 $n = $this->map_object->numlayers; 990 $n = $this->map_object->numlayers;
960 for ($i=0;$i < $n;$i++) 991 for ($i=0;$i < $n;$i++)
961 { 992 {
@@ -971,19 +1002,17 @@ class LayerServer { @@ -971,19 +1002,17 @@ class LayerServer {
971 { 1002 {
972 $l->set("type",MS_LAYER_RASTER); 1003 $l->set("type",MS_LAYER_RASTER);
973 $l->setmetadata('wms_onlineresource',"../../ogc.php?tema=".$temp."&width=500&height=500&"); 1004 $l->setmetadata('wms_onlineresource',"../../ogc.php?tema=".$temp."&width=500&height=500&");
  1005 + $l->setmetadata("ows_enable_request","*");
974 } 1006 }
975 ms_newLayerObj($this->map_object, $l); 1007 ms_newLayerObj($this->map_object, $l);
976 } 1008 }
977 } 1009 }
978 - else  
979 - { 1010 + else{
980 $this->map_object = ms_newMapObj($this->map); 1011 $this->map_object = ms_newMapObj($this->map);
981 - if(file_exists("ms_configura.php"))  
982 - {include("ms_configura.php");}  
983 - else  
984 - {include("../../ms_configura.php");}  
985 - if(!$this->_zipped)  
986 - $this->map_object->setmetadata('wms_onlineresource',$servidor.":80".$locmapserv."?map=".$temp."&width=1500&height=1500&"); 1012 + if(!$this->_zipped){
  1013 + $this->map_object->setmetadata('wms_onlineresource',$servidor.":80".$locmapserv."?map=".$temp."&width=1500&height=1500&");
  1014 + $this->map_object->setmetadata("ows_enable_request","*");
  1015 + }
987 $n = $this->map_object->numlayers; 1016 $n = $this->map_object->numlayers;
988 for ($i=0;$i < $n;$i++) 1017 for ($i=0;$i < $n;$i++)
989 { 1018 {
@@ -1037,7 +1066,8 @@ class LayerServer { @@ -1037,7 +1066,8 @@ class LayerServer {
1037 * Send header 1066 * Send header
1038 */ 1067 */
1039 function send_header(){ 1068 function send_header(){
1040 - header('Content-type: application/vnd.google-earth.km'.($this->_zipped ? 'z' : 'l').'+XML'); 1069 + header('Content-Disposition: attachment; filename=kml.km'.($this->_zipped ? 'z' : 'l'));
  1070 + header('Content-type: application/vnd.google-earth.km'.($this->_zipped ? 'z' : 'l').'+XML');
1041 } 1071 }
1042 1072
1043 /** 1073 /**
@@ -1052,7 +1082,7 @@ class LayerServer { @@ -1052,7 +1082,7 @@ class LayerServer {
1052 if($k != ""){ 1082 if($k != ""){
1053 return $k; 1083 return $k;
1054 } 1084 }
1055 - include("../../ms_configura.php"); 1085 + include(__DIR__."/../../ms_configura.php");
1056 return $dir_tmp.'/'. md5($_SERVER['QUERY_STRING']) . ($this->_zipped ? '.kmz' : '.kml'); 1086 return $dir_tmp.'/'. md5($_SERVER['QUERY_STRING']) . ($this->_zipped ? '.kmz' : '.kml');
1057 } 1087 }
1058 1088
@@ -1062,12 +1092,14 @@ class LayerServer { @@ -1062,12 +1092,14 @@ class LayerServer {
1062 function send_stream($data){ 1092 function send_stream($data){
1063 $this->send_header(); 1093 $this->send_header();
1064 // Compress data 1094 // Compress data
  1095 +
1065 if($this->_zipped){ 1096 if($this->_zipped){
1066 include("zip.class.php"); 1097 include("zip.class.php");
1067 $ziper = new zipfile(); 1098 $ziper = new zipfile();
1068 $ziper->addFile($data, 'doc.kml'); 1099 $ziper->addFile($data, 'doc.kml');
1069 $data = $ziper->file(); 1100 $data = $ziper->file();
1070 } 1101 }
  1102 +
1071 // Create cache if needed 1103 // Create cache if needed
1072 if(ENABLE_CACHE && count($this->layers) == 1) { 1104 if(ENABLE_CACHE && count($this->layers) == 1) {
1073 //error_log( 'creating cache ' . $this->get_cache_file_name() ); 1105 //error_log( 'creating cache ' . $this->get_cache_file_name() );
pacotes/tme/TME_i3geo.php
  Diff comments   View file @a21dbce
@@ -24,10 +24,9 @@ @@ -24,10 +24,9 @@
24 24
25 25
26 // Can be changed to another data connector class 26 // Can be changed to another data connector class
27 -require_once ('TME_i3geo_DataConnector.php');  
28 - 27 +require_once (__DIR__.'/TME_i3geo_DataConnector.php');
29 // Include engine class 28 // Include engine class
30 -require_once ('TME_Engine.php'); 29 +require_once (__DIR__.'/TME_Engine.php');
31 if(!isset($_GET["sid"])) 30 if(!isset($_GET["sid"]))
32 {echo "Erro. Acesso não permitido";exit;} 31 {echo "Erro. Acesso não permitido";exit;}
33 $dataConnector = new DataConnector($_GET["sid"]); 32 $dataConnector = new DataConnector($_GET["sid"]);
@@ -42,7 +41,7 @@ if(count($colunas) == 1){ @@ -42,7 +41,7 @@ if(count($colunas) == 1){
42 $tipo = "year"; 41 $tipo = "year";
43 } 42 }
44 if(!isset($dir_tmp)){ 43 if(!isset($dir_tmp)){
45 - include("../../ms_configura.php"); 44 + include(__DIR__."/../../ms_configura.php");
46 } 45 }
47 $parameters = array( 'mapType' => 'bar', 46 $parameters = array( 'mapType' => 'bar',
48 'indicator' => 'valores', 47 'indicator' => 'valores',
@@ -57,9 +56,8 @@ $parameters = array( &#39;mapType&#39; =&gt; &#39;bar&#39;, @@ -57,9 +56,8 @@ $parameters = array( &#39;mapType&#39; =&gt; &#39;bar&#39;,
57 $map = new ThematicMap($dataStore, $parameters); 56 $map = new ThematicMap($dataStore, $parameters);
58 $file = $map->getKML($dataConnector->url); 57 $file = $map->getKML($dataConnector->url);
59 if(!function_exists("cpjson")) 58 if(!function_exists("cpjson"))
60 -{require("../../classesphp/funcoes_gerais.php");} 59 +{require(__DIR__."/../../classesphp/funcoes_gerais.php");}
61 60
62 cpjson(array('url' => $file)); 61 cpjson(array('url' => $file));
63 //echo "<p><a href='$file'>$file</a>"; 62 //echo "<p><a href='$file'>$file</a>";
64 -  
65 ?> 63 ?>
66 \ No newline at end of file 64 \ No newline at end of file
pacotes/tme/TME_i3geo_DataConnector.php
  Diff comments   View file @a21dbce
@@ -51,7 +51,7 @@ class DataConnector @@ -51,7 +51,7 @@ class DataConnector
51 else 51 else
52 {dl('php_mapscript.so');} 52 {dl('php_mapscript.so');}
53 } 53 }
54 - include("../../classesphp/carrega_ext.php"); 54 + //include("../../classesphp/carrega_ext.php");
55 //verificação de segurança 55 //verificação de segurança
56 $_SESSION = array(); 56 $_SESSION = array();
57 session_name("i3GeoPHP"); 57 session_name("i3GeoPHP");
@@ -110,9 +110,9 @@ class DataConnector @@ -110,9 +110,9 @@ class DataConnector
110 110
111 // Make data store 111 // Make data store
112 function getDataStore($nomelayer,$colunasvalor,$colunanomeregiao,$titulo,$descricao,$ext=""){ //$indicatorID, $year, $region){ 112 function getDataStore($nomelayer,$colunasvalor,$colunanomeregiao,$titulo,$descricao,$ext=""){ //$indicatorID, $year, $region){
113 - include("../../classesphp/funcoes_gerais.php"); 113 + include(__DIR__."/../../classesphp/funcoes_gerais.php");
114 $versao = versao(); 114 $versao = versao();
115 - $versao = $versao["principal"]; 115 + $versao = $versao["principal"];
116 $mapa = ms_newMapObj($this->map_file); 116 $mapa = ms_newMapObj($this->map_file);
117 if($ext == "") 117 if($ext == "")
118 {$mapa = extPadrao($mapa);} 118 {$mapa = extPadrao($mapa);}
@@ -120,7 +120,7 @@ class DataConnector @@ -120,7 +120,7 @@ class DataConnector
120 $e = str_replace(","," ",$ext); 120 $e = str_replace(","," ",$ext);
121 $e = explode(" ",$ext); 121 $e = explode(" ",$ext);
122 $extatual = $mapa->extent; 122 $extatual = $mapa->extent;
123 - $extatual->setextent((min($e[0],$e[2])),(min($e[1],$e[3])),(max($e[0],$e[2])),(max($e[1],$e[3]))); 123 + $extatual->setextent((min($e[0],$e[2])),(min($e[1],$e[3])),(max($e[0],$e[2])),(max($e[1],$e[3])));
124 } 124 }
125 $layer = $mapa->getlayerbyname($nomelayer); 125 $layer = $mapa->getlayerbyname($nomelayer);
126 $layer->set("template","none.html"); 126 $layer->set("template","none.html");
@@ -160,7 +160,7 @@ class DataConnector @@ -160,7 +160,7 @@ class DataConnector
160 $valitem = array(); 160 $valitem = array();
161 if($versao == 6) 161 if($versao == 6)
162 {$shape = $layer->getShape($layer->getResult($i));} 162 {$shape = $layer->getShape($layer->getResult($i));}
163 - else{$shape = $layer->getFeature($layer->getResult($i)->shapeindex);} 163 + else{$shape = $layer->getFeature($layer->getResult($i)->shapeindex);}
164 $pt = $shape->getCentroid(); 164 $pt = $shape->getCentroid();
165 $dataStore['features'][$i] = array( 165 $dataStore['features'][$i] = array(
166 "featureID"=>$i, 166 "featureID"=>$i,
@@ -172,7 +172,7 @@ class DataConnector @@ -172,7 +172,7 @@ class DataConnector
172 //[0] é o ano 172 //[0] é o ano
173 foreach($colunasvalor as $colunavalor){ 173 foreach($colunasvalor as $colunavalor){
174 $valor = $shape->values[$colunavalor]; 174 $valor = $shape->values[$colunavalor];
175 - 175 +
176 settype($valor,"float"); 176 settype($valor,"float");
177 //echo $valor; 177 //echo $valor;
178 if(is_numeric($valor)){ 178 if(is_numeric($valor)){