Download as
Browse Code »

Commit a750af3551bb59674c311ab401ea0b1c13976533

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

Inclusão da coluna TIPO na tabela de i3geoestat_parametro_medida para permitir a… 

… elaboração de filtro por período
Showing 8 changed files with 786 additions and 698 deletions   Show diff stats
admin/admin.db
View file @a750af3
No preview for this file type
admin/js/estat_variavel.js
  Diff comments   View file @a750af3
... ... @@ -541,12 +541,20 @@ i3GEOadmin.variaveis = {
541 541 {titulo:"Nome:",id:"Enome",size:"50",value:i.nome,tipo:"text",div:""},
542 542 {titulo:"Descrição:",id:"Edescricao",size:"50",value:i.descricao,tipo:"text",div:""},
543 543 {titulo:"Coluna:",id:"Ecoluna",size:"50",value:i.coluna,tipo:"text",div:""},
544   - {titulo:"id_pai:",id:"Eid_pai",size:"50",value:i.id_pai,tipo:"text",div:""}
  544 + {titulo:"id_pai:",id:"Eid_pai",size:"50",value:i.id_pai,tipo:"text",div:""},
  545 + {titulo:"Tipo:",id:"",size:"50",value:i.tipo,tipo:"text",div:"<div id=Ctipo_parametro ></div>"}
545 546 ]
546 547 };
547 548 ins += core_geraLinhas(param);
548 549 ins += "<br><br><br>";
549 550 $i("editor_bd").innerHTML = ins;
  551 + //para saber a lista de tipos, veja a descricao da tabela de parametros no MER do banco de dados
  552 + if($i("Ctipo_parametro")){
  553 + temp = "<select id='Etipo' >";
  554 + temp += core_comboObjeto(i3GEOadmin.variaveis.dadosAuxiliares.tiposDeParametros,"id","valor",i.tipo);
  555 + temp += "</select>";
  556 + $i("Ctipo_parametro").innerHTML = temp;
  557 + }
550 558 }
551 559 },
552 560 link: {
... ... @@ -1024,7 +1032,7 @@ i3GEOadmin.variaveis = {
1024 1032 prog = i3GEO.configura.locaplic+"/admin/php/metaestat.php?funcao=alteraMedidaVariavel";
1025 1033 }
1026 1034 if(tipo == "parametroMedida"){
1027   - campos = new Array("nome","descricao","coluna","id_pai");
  1035 + campos = new Array("nome","descricao","coluna","id_pai","tipo");
1028 1036 par = "&id_parametro_medida="+id;
1029 1037 prog = i3GEO.configura.locaplic+"/admin/php/metaestat.php?funcao=alteraParametroMedida";
1030 1038 }
... ... @@ -1160,6 +1168,13 @@ i3GEOadmin.variaveis = {
1160 1168 success:function(o){
1161 1169 try {
1162 1170 i3GEOadmin.variaveis.dadosAuxiliares = YAHOO.lang.JSON.parse(o.responseText);
  1171 + i3GEOadmin.variaveis.dadosAuxiliares["tiposDeParametros"] = [
  1172 + {"id":"0","valor":"Nao definido"},
  1173 + {"id":"1","valor":"Ano"},
  1174 + {"id":"2","valor":"Mes"},
  1175 + {"id":"3","valor":"Dia"},
  1176 + {"id":"4","valor":"Hora"}
  1177 + ];
1163 1178 }
1164 1179 catch(e){core_handleFailure(e,o.responseText);}
1165 1180 },
... ...
admin/php/classe_metaestat.php
  Diff comments   View file @a750af3
... ... @@ -860,7 +860,7 @@ class Metaestat{
860 860  
861 861 Altera uma parametro de uma medida ou cria uma nova
862 862 */
863   - function alteraParametroMedida($id_medida_variavel,$id_parametro_medida="",$nome,$descricao,$coluna,$id_pai){
  863 + function alteraParametroMedida($id_medida_variavel,$id_parametro_medida="",$nome,$descricao,$coluna,$id_pai,$tipo="0"){
864 864 try {
865 865 if($id_parametro_medida != ""){
866 866 if($this->convUTF){
... ... @@ -868,7 +868,7 @@ class Metaestat{
868 868 $descricao = utf8_encode($descricao);
869 869 }
870 870 //echo "UPDATE ".$this->esquemaadmin."i3geoestat_parametro_medida SET nomeparametro = '$nomeparametro',descricao = '$descricao',coluna = '$coluna',agregavalores = '$agregavalores' WHERE id_parametro_medida = $id_parametro_medida";exit;
871   - $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_parametro_medida SET nome = '$nome',descricao = '$descricao',coluna = '$coluna',id_pai = '$id_pai' WHERE id_parametro_medida = $id_parametro_medida");
  871 + $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_parametro_medida SET nome = '$nome',descricao = '$descricao',coluna = '$coluna',id_pai = '$id_pai', tipo = '$tipo' WHERE id_parametro_medida = $id_parametro_medida");
872 872 $retorna = $id_parametro_medida;
873 873 }
874 874 else{
... ...
admin/php/metaestat.php
  Diff comments   View file @a750af3
... ... @@ -291,26 +291,26 @@ switch (strtoupper($funcao))
291 291 $id_pai = 0;
292 292 //anual
293 293 if($codigo_tipo_periodo >= 1){
294   - $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel,"","","","","");
295   - $m->alteraParametroMedida($id_medida_variavel,$id_parametro_medida,"Ano","","ano",$id_pai);
  294 + $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel,"","","","","","");
  295 + $m->alteraParametroMedida($id_medida_variavel,$id_parametro_medida,"Ano","","ano",$id_pai,1);
296 296 $id_pai = $id_parametro_medida;
297 297 }
298 298 //mensal
299 299 if($codigo_tipo_periodo >= 2){
300   - $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel,"","","","","");
301   - $m->alteraParametroMedida($id_medida_variavel,$id_parametro_medida,"Mes","","mes",$id_pai);
  300 + $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel,"","","","","","");
  301 + $m->alteraParametroMedida($id_medida_variavel,$id_parametro_medida,"Mes","","mes",$id_pai,2);
302 302 $id_pai = $id_parametro_medida;
303 303 }
304 304 //diario
305 305 if($codigo_tipo_periodo >= 3){
306   - $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel,"","","","","");
307   - $m->alteraParametroMedida($id_medida_variavel,$id_parametro_medida,"Dia","","dia",$id_pai);
  306 + $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel,"","","","","","");
  307 + $m->alteraParametroMedida($id_medida_variavel,$id_parametro_medida,"Dia","","dia",$id_pai,3);
308 308 $id_pai = $id_parametro_medida;
309 309 }
310 310 //horario
311 311 if($codigo_tipo_periodo == 4){
312   - $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel,"","","","","");
313   - $m->alteraParametroMedida($id_medida_variavel,$id_parametro_medida,"Hora","","hora",$id_pai);
  312 + $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel,"","","","","","");
  313 + $m->alteraParametroMedida($id_medida_variavel,$id_parametro_medida,"Hora","","hora",$id_pai,4);
314 314 }
315 315 }
316 316 retornaJSON($m->listaMedidaVariavel("",$id_medida_variavel));
... ... @@ -332,7 +332,7 @@ switch (strtoupper($funcao))
332 332 $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel);
333 333 }
334 334 else{
335   - $m->alteraParametroMedida("",$id_parametro_medida,$nome,$descricao,$coluna,$id_pai);
  335 + $m->alteraParametroMedida("",$id_parametro_medida,$nome,$descricao,$coluna,$id_pai,$tipo);
336 336 }
337 337 retornaJSON($m->listaParametro($id_medida_variavel,$id_parametro_medida));
338 338 exit;
... ...
admin/sql/metaestat.sql
  Diff comments   View file @a750af3
... ... @@ -80,10 +80,10 @@ create table i3geoestat_agregaregiao
80 80 );
81 81  
82 82  
83   --- tabela com o nome e descrição de uma variável variável
84   -create table i3geoestat_variavel
  83 +-- lista controlada de tipos de período de tempo
  84 +create table i3geoestat_tipo_periodo
85 85 (
86   - codigo_variavel integer not null unique primary key autoincrement,
  86 + codigo_tipo_periodo integer not null unique primary key autoincrement,
87 87 nome text,
88 88 descricao text
89 89 );
... ... @@ -101,10 +101,10 @@ create table i3geoestat_unidade_medida
101 101 );
102 102  
103 103  
104   --- lista controlada de tipos de período de tempo
105   -create table i3geoestat_tipo_periodo
  104 +-- tabela com o nome e descrição de uma variável variável
  105 +create table i3geoestat_variavel
106 106 (
107   - codigo_tipo_periodo integer not null unique primary key autoincrement,
  107 + codigo_variavel integer not null unique primary key autoincrement,
108 108 nome text,
109 109 descricao text
110 110 );
... ... @@ -133,16 +133,16 @@ create table i3geoestat_medida_variavel
133 133 nomemedida text,
134 134 -- nome da coluna da tabela que contem os dados e que é um identificador único de cada registro
135 135 colunaidunico text,
136   - foreign key (codigo_variavel)
137   - references i3geoestat_variavel (codigo_variavel),
138 136 foreign key (codigo_tipo_regiao)
139 137 references i3geoestat_tipo_regiao (codigo_tipo_regiao),
140   - foreign key (codigo_unidade_medida)
141   - references i3geoestat_unidade_medida (codigo_unidade_medida),
  138 + foreign key (codigo_estat_conexao)
  139 + references i3geoestat_conexao (codigo_estat_conexao),
142 140 foreign key (codigo_tipo_periodo)
143 141 references i3geoestat_tipo_periodo (codigo_tipo_periodo),
144   - foreign key (codigo_estat_conexao)
145   - references i3geoestat_conexao (codigo_estat_conexao)
  142 + foreign key (codigo_unidade_medida)
  143 + references i3geoestat_unidade_medida (codigo_unidade_medida),
  144 + foreign key (codigo_variavel)
  145 + references i3geoestat_variavel (codigo_variavel)
146 146 );
147 147  
148 148  
... ... @@ -204,10 +204,10 @@ create table i3geoestat_fonteinfo_medida
204 204 (
205 205 id_medida_variavel integer not null,
206 206 id_fonteinfo integer not null,
207   - foreign key (id_fonteinfo)
208   - references i3geoestat_fonteinfo (id_fonteinfo),
209 207 foreign key (id_medida_variavel)
210   - references i3geoestat_medida_variavel (id_medida_variavel)
  208 + references i3geoestat_medida_variavel (id_medida_variavel),
  209 + foreign key (id_fonteinfo)
  210 + references i3geoestat_fonteinfo (id_fonteinfo)
211 211 );
212 212  
213 213  
... ... @@ -231,6 +231,14 @@ create table i3geoestat_parametro_medida
231 231 -- (0 ou 1) indica se a coluna de valores da variável deve ser agregada ou não (soma dos valores ou média) conforme o tipo de unidade de medida
232 232 id_pai integer default 0,
233 233 id_medida_variavel integer,
  234 + -- tipo de parâmetro, podendo ser:
  235 + -- 0 - não definido
  236 + -- 1 - ano
  237 + -- 2 - mês
  238 + -- 3 - dia
  239 + -- 4 - hora
  240 + -- 5 - lista de opção
  241 + tipo integer default 0,
234 242 foreign key (id_medida_variavel)
235 243 references i3geoestat_medida_variavel (id_medida_variavel)
236 244 );
... ...
admin/sql/metaestat_basededados.sql
  Diff comments   View file @a750af3
... ... @@ -25,7 +25,7 @@ INSERT INTO i3geoestat_medida_variavel (id_medida_variavel, codigo_unidade_medid
25 25  
26 26  
27 27 -- i3geoestat_parametro_medida
28   -INSERT INTO i3geoestat_parametro_medida (id_parametro_medida, coluna, nome, descricao, id_pai, id_medida_variavel) VALUES ('1', 'nu_ano', 'ano', '', '0', '1');
  28 +INSERT INTO i3geoestat_parametro_medida (id_parametro_medida, coluna, nome, descricao, id_pai, id_medida_variavel, tipo) VALUES ('1', 'nu_ano', 'ano', '', '0', '1', '1');
29 29  
30 30  
31 31 -- i3geoestat_variavel
... ...
documentacao/diagramas/metaestat.erm
  Diff comments   View file @a750af3
... ... @@ -11,8 +11,8 @@
11 11 </page_setting>
12 12 <category_index>0</category_index>
13 13 <zoom>1.0</zoom>
14   - <x>-372</x>
15   - <y>51</y>
  14 + <x>171</x>
  15 + <y>208</y>
16 16 <default_color>
17 17 <r>255</r>
18 18 <g>128</g>
... ... @@ -110,7 +110,7 @@
110 110 </connections>
111 111 <display>false</display>
112 112 <creation_date>2012-07-17 15:03:53</creation_date>
113   - <updated_date>2012-10-23 08:35:27</updated_date>
  113 + <updated_date>2012-10-26 18:48:54</updated_date>
114 114 <model_property>
115 115 <name>Project Name</name>
116 116 <value></value>
... ... @@ -944,13 +944,26 @@
944 944 <array_dimension>null</array_dimension>
945 945 <unsigned>false</unsigned>
946 946 <args></args>
  947 + <description>Tipo de parâmetro, podendo ser:&#x0A;0 - Não definido&#x0A;1 - Ano&#x0A;2 - Mês&#x0A;3 - Dia&#x0A;4 - Hora&#x0A;5 - Lista de opção</description>
  948 + <logical_name>tipo</logical_name>
  949 + <physical_name>tipo</physical_name>
  950 + <type>integer</type>
  951 + </word>
  952 + <word>
  953 + <id>62</id>
  954 + <length>null</length>
  955 + <decimal>null</decimal>
  956 + <array>false</array>
  957 + <array_dimension>null</array_dimension>
  958 + <unsigned>false</unsigned>
  959 + <args></args>
947 960 <description>Título completo da fonte, devendo conter o ano quando for o caso</description>
948 961 <logical_name>titulo</logical_name>
949 962 <physical_name>titulo</physical_name>
950 963 <type>text</type>
951 964 </word>
952 965 <word>
953   - <id>62</id>
  966 + <id>63</id>
954 967 <length>null</length>
955 968 <decimal>null</decimal>
956 969 <array>false</array>
... ... @@ -963,7 +976,7 @@
963 976 <type>text</type>
964 977 </word>
965 978 <word>
966   - <id>63</id>
  979 + <id>64</id>
967 980 <length>null</length>
968 981 <decimal>null</decimal>
969 982 <array>false</array>
... ... @@ -976,7 +989,7 @@
976 989 <type>text</type>
977 990 </word>
978 991 <word>
979   - <id>64</id>
  992 + <id>65</id>
980 993 <length>null</length>
981 994 <decimal>null</decimal>
982 995 <array>false</array>
... ... @@ -989,7 +1002,7 @@
989 1002 <type>text</type>
990 1003 </word>
991 1004 <word>
992   - <id>65</id>
  1005 + <id>66</id>
993 1006 <length>null</length>
994 1007 <decimal>null</decimal>
995 1008 <array>false</array>
... ... @@ -1285,7 +1298,7 @@
1285 1298 </sequence>
1286 1299 </normal_column>
1287 1300 <normal_column>
1288   - <word_id>39</word_id>
  1301 + <word_id>38</word_id>
1289 1302 <id>6</id>
1290 1303 <description></description>
1291 1304 <unique_key_name></unique_key_name>
... ... @@ -1317,7 +1330,7 @@
1317 1330 </sequence>
1318 1331 </normal_column>
1319 1332 <normal_column>
1320   - <word_id>19</word_id>
  1333 + <word_id>20</word_id>
1321 1334 <id>7</id>
1322 1335 <description></description>
1323 1336 <unique_key_name></unique_key_name>
... ... @@ -1412,7 +1425,7 @@
1412 1425 </sequence>
1413 1426 </normal_column>
1414 1427 <normal_column>
1415   - <word_id>38</word_id>
  1428 + <word_id>42</word_id>
1416 1429 <id>9</id>
1417 1430 <description></description>
1418 1431 <unique_key_name></unique_key_name>
... ... @@ -1500,7 +1513,7 @@
1500 1513 <connections>
1501 1514 <relation>
1502 1515 <id>0</id>
1503   - <source>12</source>
  1516 + <source>10</source>
1504 1517 <target>5</target>
1505 1518 <child_cardinality>1..n</child_cardinality>
1506 1519 <parent_cardinality>1</parent_cardinality>
... ... @@ -1556,7 +1569,7 @@
1556 1569 </sequence>
1557 1570 </normal_column>
1558 1571 <normal_column>
1559   - <word_id>43</word_id>
  1572 + <word_id>39</word_id>
1560 1573 <id>12</id>
1561 1574 <description></description>
1562 1575 <unique_key_name></unique_key_name>
... ... @@ -1589,7 +1602,7 @@
1589 1602 </normal_column>
1590 1603 <normal_column>
1591 1604 <id>13</id>
1592   - <referenced_column>49</referenced_column>
  1605 + <referenced_column>39</referenced_column>
1593 1606 <relation>0</relation>
1594 1607 <description></description>
1595 1608 <unique_key_name></unique_key_name>
... ... @@ -1765,7 +1778,7 @@
1765 1778 </sequence>
1766 1779 </normal_column>
1767 1780 <normal_column>
1768   - <word_id>62</word_id>
  1781 + <word_id>63</word_id>
1769 1782 <id>17</id>
1770 1783 <description></description>
1771 1784 <unique_key_name></unique_key_name>
... ... @@ -1797,7 +1810,7 @@
1797 1810 </sequence>
1798 1811 </normal_column>
1799 1812 <normal_column>
1800   - <word_id>65</word_id>
  1813 + <word_id>66</word_id>
1801 1814 <id>18</id>
1802 1815 <description></description>
1803 1816 <unique_key_name></unique_key_name>
... ... @@ -1829,7 +1842,7 @@
1829 1842 </sequence>
1830 1843 </normal_column>
1831 1844 <normal_column>
1832   - <word_id>64</word_id>
  1845 + <word_id>65</word_id>
1833 1846 <id>19</id>
1834 1847 <description></description>
1835 1848 <unique_key_name></unique_key_name>
... ... @@ -2181,7 +2194,7 @@
2181 2194 </sequence>
2182 2195 </normal_column>
2183 2196 <normal_column>
2184   - <word_id>61</word_id>
  2197 + <word_id>62</word_id>
2185 2198 <id>29</id>
2186 2199 <description></description>
2187 2200 <unique_key_name></unique_key_name>
... ... @@ -2213,7 +2226,7 @@
2213 2226 </sequence>
2214 2227 </normal_column>
2215 2228 <normal_column>
2216   - <word_id>37</word_id>
  2229 + <word_id>36</word_id>
2217 2230 <id>30</id>
2218 2231 <description></description>
2219 2232 <unique_key_name></unique_key_name>
... ... @@ -2255,21 +2268,38 @@
2255 2268 </table>
2256 2269 <table>
2257 2270 <id>8</id>
2258   - <height>128</height>
  2271 + <height>86</height>
2259 2272 <width>269</width>
2260 2273 <font_name>Ubuntu</font_name>
2261 2274 <font_size>9</font_size>
2262   - <x>753</x>
2263   - <y>442</y>
  2275 + <x>705</x>
  2276 + <y>152</y>
2264 2277 <color>
2265   - <r>230</r>
2266   - <g>230</g>
2267   - <b>250</b>
  2278 + <r>144</r>
  2279 + <g>238</g>
  2280 + <b>144</b>
2268 2281 </color>
2269 2282 <connections>
2270 2283 <relation>
2271 2284 <id>2</id>
2272   - <source>12</source>
  2285 + <source>10</source>
  2286 + <target>8</target>
  2287 + <child_cardinality>1..n</child_cardinality>
  2288 + <parent_cardinality>1</parent_cardinality>
  2289 + <reference_for_pk>true</reference_for_pk>
  2290 + <name></name>
  2291 + <on_delete_action>RESTRICT</on_delete_action>
  2292 + <on_update_action>RESTRICT</on_update_action>
  2293 + <source_xp>-1</source_xp>
  2294 + <source_yp>-1</source_yp>
  2295 + <target_xp>-1</target_xp>
  2296 + <target_yp>-1</target_yp>
  2297 + <referenced_column>null</referenced_column>
  2298 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2299 + </relation>
  2300 + <relation>
  2301 + <id>3</id>
  2302 + <source>7</source>
2273 2303 <target>8</target>
2274 2304 <child_cardinality>1..n</child_cardinality>
2275 2305 <parent_cardinality>1</parent_cardinality>
... ... @@ -2285,26 +2315,27 @@
2285 2315 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2286 2316 </relation>
2287 2317 </connections>
2288   - <physical_name>i3geoestat_medida_variavel_link</physical_name>
2289   - <logical_name>i3geoestat_medida_variavel_link</logical_name>
  2318 + <physical_name>i3geoestat_fonteinfo_medida</physical_name>
  2319 + <logical_name>i3geoestat_fonteinfo_medida</logical_name>
2290 2320 <description></description>
2291 2321 <constraint></constraint>
2292 2322 <primary_key_name></primary_key_name>
2293 2323 <option></option>
2294 2324 <columns>
2295 2325 <normal_column>
2296   - <word_id>36</word_id>
2297 2326 <id>31</id>
  2327 + <referenced_column>39</referenced_column>
  2328 + <relation>2</relation>
2298 2329 <description></description>
2299 2330 <unique_key_name></unique_key_name>
2300 2331 <logical_name></logical_name>
2301 2332 <physical_name></physical_name>
2302   - <type>text</type>
  2333 + <type>integer</type>
2303 2334 <constraint></constraint>
2304 2335 <default_value></default_value>
2305 2336 <auto_increment>false</auto_increment>
2306   - <foreign_key>false</foreign_key>
2307   - <not_null>false</not_null>
  2337 + <foreign_key>true</foreign_key>
  2338 + <not_null>true</not_null>
2308 2339 <primary_key>false</primary_key>
2309 2340 <unique_key>false</unique_key>
2310 2341 <character_set></character_set>
... ... @@ -2326,8 +2357,8 @@
2326 2357 </normal_column>
2327 2358 <normal_column>
2328 2359 <id>32</id>
2329   - <referenced_column>49</referenced_column>
2330   - <relation>2</relation>
  2360 + <referenced_column>28</referenced_column>
  2361 + <relation>3</relation>
2331 2362 <description></description>
2332 2363 <unique_key_name></unique_key_name>
2333 2364 <logical_name></logical_name>
... ... @@ -2337,7 +2368,7 @@
2337 2368 <default_value></default_value>
2338 2369 <auto_increment>false</auto_increment>
2339 2370 <foreign_key>true</foreign_key>
2340   - <not_null>false</not_null>
  2371 + <not_null>true</not_null>
2341 2372 <primary_key>false</primary_key>
2342 2373 <unique_key>false</unique_key>
2343 2374 <character_set></character_set>
... ... @@ -2357,13 +2388,76 @@
2357 2388 <decimal_size>0</decimal_size>
2358 2389 </sequence>
2359 2390 </normal_column>
  2391 + </columns>
  2392 + <indexes>
  2393 + </indexes>
  2394 + <complex_unique_key_list>
  2395 + </complex_unique_key_list>
  2396 + <table_properties>
  2397 + <schema></schema>
  2398 + </table_properties>
  2399 + </table>
  2400 + <table>
  2401 + <id>9</id>
  2402 + <height>170</height>
  2403 + <width>292</width>
  2404 + <font_name>Ubuntu</font_name>
  2405 + <font_size>9</font_size>
  2406 + <x>8</x>
  2407 + <y>499</y>
  2408 + <color>
  2409 + <r>255</r>
  2410 + <g>165</g>
  2411 + <b>0</b>
  2412 + </color>
  2413 + <connections>
  2414 + </connections>
  2415 + <physical_name>i3geoestat_conexao</physical_name>
  2416 + <logical_name>i3geoestat_conexao</logical_name>
  2417 + <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados&#x0A;Código 0 indica que será utilizada a conexão padrão</description>
  2418 + <constraint></constraint>
  2419 + <primary_key_name></primary_key_name>
  2420 + <option></option>
  2421 + <columns>
2360 2422 <normal_column>
2361   - <word_id>42</word_id>
  2423 + <word_id>2</word_id>
2362 2424 <id>33</id>
2363 2425 <description></description>
2364 2426 <unique_key_name></unique_key_name>
2365 2427 <logical_name></logical_name>
2366 2428 <physical_name></physical_name>
  2429 + <type>integer</type>
  2430 + <constraint></constraint>
  2431 + <default_value></default_value>
  2432 + <auto_increment>true</auto_increment>
  2433 + <foreign_key>false</foreign_key>
  2434 + <not_null>true</not_null>
  2435 + <primary_key>true</primary_key>
  2436 + <unique_key>true</unique_key>
  2437 + <character_set></character_set>
  2438 + <collation></collation>
  2439 + <sequence>
  2440 + <name></name>
  2441 + <schema></schema>
  2442 + <increment></increment>
  2443 + <min_value></min_value>
  2444 + <max_value></max_value>
  2445 + <start></start>
  2446 + <cache></cache>
  2447 + <cycle>false</cycle>
  2448 + <order>false</order>
  2449 + <description></description>
  2450 + <data_type></data_type>
  2451 + <decimal_size>0</decimal_size>
  2452 + </sequence>
  2453 + </normal_column>
  2454 + <normal_column>
  2455 + <word_id>1</word_id>
  2456 + <id>34</id>
  2457 + <description></description>
  2458 + <unique_key_name></unique_key_name>
  2459 + <logical_name></logical_name>
  2460 + <physical_name></physical_name>
2367 2461 <type>text</type>
2368 2462 <constraint></constraint>
2369 2463 <default_value></default_value>
... ... @@ -2390,20 +2484,20 @@
2390 2484 </sequence>
2391 2485 </normal_column>
2392 2486 <normal_column>
2393   - <word_id>32</word_id>
2394   - <id>34</id>
  2487 + <word_id>26</word_id>
  2488 + <id>35</id>
2395 2489 <description></description>
2396 2490 <unique_key_name></unique_key_name>
2397 2491 <logical_name></logical_name>
2398 2492 <physical_name></physical_name>
2399   - <type>integer</type>
  2493 + <type>text</type>
2400 2494 <constraint></constraint>
2401 2495 <default_value></default_value>
2402   - <auto_increment>true</auto_increment>
  2496 + <auto_increment>false</auto_increment>
2403 2497 <foreign_key>false</foreign_key>
2404   - <not_null>true</not_null>
2405   - <primary_key>true</primary_key>
2406   - <unique_key>true</unique_key>
  2498 + <not_null>false</not_null>
  2499 + <primary_key>false</primary_key>
  2500 + <unique_key>false</unique_key>
2407 2501 <character_set></character_set>
2408 2502 <collation></collation>
2409 2503 <sequence>
... ... @@ -2421,85 +2515,19 @@
2421 2515 <decimal_size>0</decimal_size>
2422 2516 </sequence>
2423 2517 </normal_column>
2424   - </columns>
2425   - <indexes>
2426   - </indexes>
2427   - <complex_unique_key_list>
2428   - </complex_unique_key_list>
2429   - <table_properties>
2430   - <schema></schema>
2431   - </table_properties>
2432   - </table>
2433   - <table>
2434   - <id>9</id>
2435   - <height>86</height>
2436   - <width>269</width>
2437   - <font_name>Ubuntu</font_name>
2438   - <font_size>9</font_size>
2439   - <x>705</x>
2440   - <y>152</y>
2441   - <color>
2442   - <r>144</r>
2443   - <g>238</g>
2444   - <b>144</b>
2445   - </color>
2446   - <connections>
2447   - <relation>
2448   - <id>3</id>
2449   - <source>7</source>
2450   - <target>9</target>
2451   - <child_cardinality>1..n</child_cardinality>
2452   - <parent_cardinality>1</parent_cardinality>
2453   - <reference_for_pk>true</reference_for_pk>
2454   - <name></name>
2455   - <on_delete_action>RESTRICT</on_delete_action>
2456   - <on_update_action>RESTRICT</on_update_action>
2457   - <source_xp>-1</source_xp>
2458   - <source_yp>-1</source_yp>
2459   - <target_xp>-1</target_xp>
2460   - <target_yp>-1</target_yp>
2461   - <referenced_column>null</referenced_column>
2462   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
2463   - </relation>
2464   - <relation>
2465   - <id>4</id>
2466   - <source>12</source>
2467   - <target>9</target>
2468   - <child_cardinality>1..n</child_cardinality>
2469   - <parent_cardinality>1</parent_cardinality>
2470   - <reference_for_pk>true</reference_for_pk>
2471   - <name></name>
2472   - <on_delete_action>RESTRICT</on_delete_action>
2473   - <on_update_action>RESTRICT</on_update_action>
2474   - <source_xp>-1</source_xp>
2475   - <source_yp>-1</source_yp>
2476   - <target_xp>-1</target_xp>
2477   - <target_yp>-1</target_yp>
2478   - <referenced_column>null</referenced_column>
2479   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
2480   - </relation>
2481   - </connections>
2482   - <physical_name>i3geoestat_fonteinfo_medida</physical_name>
2483   - <logical_name>i3geoestat_fonteinfo_medida</logical_name>
2484   - <description></description>
2485   - <constraint></constraint>
2486   - <primary_key_name></primary_key_name>
2487   - <option></option>
2488   - <columns>
2489 2518 <normal_column>
2490   - <id>35</id>
2491   - <referenced_column>49</referenced_column>
2492   - <relation>4</relation>
  2519 + <word_id>53</word_id>
  2520 + <id>36</id>
2493 2521 <description></description>
2494 2522 <unique_key_name></unique_key_name>
2495 2523 <logical_name></logical_name>
2496 2524 <physical_name></physical_name>
2497   - <type>integer</type>
  2525 + <type>text</type>
2498 2526 <constraint></constraint>
2499 2527 <default_value></default_value>
2500 2528 <auto_increment>false</auto_increment>
2501   - <foreign_key>true</foreign_key>
2502   - <not_null>true</not_null>
  2529 + <foreign_key>false</foreign_key>
  2530 + <not_null>false</not_null>
2503 2531 <primary_key>false</primary_key>
2504 2532 <unique_key>false</unique_key>
2505 2533 <character_set></character_set>
... ... @@ -2520,19 +2548,18 @@
2520 2548 </sequence>
2521 2549 </normal_column>
2522 2550 <normal_column>
2523   - <id>36</id>
2524   - <referenced_column>28</referenced_column>
2525   - <relation>3</relation>
  2551 + <word_id>64</word_id>
  2552 + <id>37</id>
2526 2553 <description></description>
2527 2554 <unique_key_name></unique_key_name>
2528 2555 <logical_name></logical_name>
2529 2556 <physical_name></physical_name>
2530   - <type>integer</type>
  2557 + <type>text</type>
2531 2558 <constraint></constraint>
2532 2559 <default_value></default_value>
2533 2560 <auto_increment>false</auto_increment>
2534   - <foreign_key>true</foreign_key>
2535   - <not_null>true</not_null>
  2561 + <foreign_key>false</foreign_key>
  2562 + <not_null>false</not_null>
2536 2563 <primary_key>false</primary_key>
2537 2564 <unique_key>false</unique_key>
2538 2565 <character_set></character_set>
... ... @@ -2552,23 +2579,55 @@
2552 2579 <decimal_size>0</decimal_size>
2553 2580 </sequence>
2554 2581 </normal_column>
2555   - </columns>
2556   - <indexes>
2557   - </indexes>
2558   - <complex_unique_key_list>
2559   - </complex_unique_key_list>
2560   - <table_properties>
2561   - <schema></schema>
2562   - </table_properties>
2563   - </table>
2564   - <table>
2565   - <id>10</id>
2566   - <height>170</height>
2567   - <width>292</width>
  2582 + <normal_column>
  2583 + <word_id>54</word_id>
  2584 + <id>38</id>
  2585 + <description></description>
  2586 + <unique_key_name></unique_key_name>
  2587 + <logical_name></logical_name>
  2588 + <physical_name></physical_name>
  2589 + <type>text</type>
  2590 + <constraint></constraint>
  2591 + <default_value></default_value>
  2592 + <auto_increment>false</auto_increment>
  2593 + <foreign_key>false</foreign_key>
  2594 + <not_null>false</not_null>
  2595 + <primary_key>false</primary_key>
  2596 + <unique_key>false</unique_key>
  2597 + <character_set></character_set>
  2598 + <collation></collation>
  2599 + <sequence>
  2600 + <name></name>
  2601 + <schema></schema>
  2602 + <increment></increment>
  2603 + <min_value></min_value>
  2604 + <max_value></max_value>
  2605 + <start></start>
  2606 + <cache></cache>
  2607 + <cycle>false</cycle>
  2608 + <order>false</order>
  2609 + <description></description>
  2610 + <data_type></data_type>
  2611 + <decimal_size>0</decimal_size>
  2612 + </sequence>
  2613 + </normal_column>
  2614 + </columns>
  2615 + <indexes>
  2616 + </indexes>
  2617 + <complex_unique_key_list>
  2618 + </complex_unique_key_list>
  2619 + <table_properties>
  2620 + <schema></schema>
  2621 + </table_properties>
  2622 + </table>
  2623 + <table>
  2624 + <id>10</id>
  2625 + <height>339</height>
  2626 + <width>292</width>
2568 2627 <font_name>Ubuntu</font_name>
2569 2628 <font_size>9</font_size>
2570   - <x>387</x>
2571   - <y>533</y>
  2629 + <x>353</x>
  2630 + <y>155</y>
2572 2631 <color>
2573 2632 <r>160</r>
2574 2633 <g>32</g>
... ... @@ -2576,7 +2635,7 @@
2576 2635 </color>
2577 2636 <connections>
2578 2637 <relation>
2579   - <id>5</id>
  2638 + <id>4</id>
2580 2639 <source>12</source>
2581 2640 <target>10</target>
2582 2641 <child_cardinality>1..n</child_cardinality>
... ... @@ -2592,17 +2651,85 @@
2592 2651 <referenced_column>null</referenced_column>
2593 2652 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2594 2653 </relation>
  2654 + <relation>
  2655 + <id>5</id>
  2656 + <source>9</source>
  2657 + <target>10</target>
  2658 + <child_cardinality>1..n</child_cardinality>
  2659 + <parent_cardinality>1</parent_cardinality>
  2660 + <reference_for_pk>true</reference_for_pk>
  2661 + <name></name>
  2662 + <on_delete_action>RESTRICT</on_delete_action>
  2663 + <on_update_action>RESTRICT</on_update_action>
  2664 + <source_xp>-1</source_xp>
  2665 + <source_yp>-1</source_yp>
  2666 + <target_xp>-1</target_xp>
  2667 + <target_yp>-1</target_yp>
  2668 + <referenced_column>null</referenced_column>
  2669 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2670 + </relation>
  2671 + <relation>
  2672 + <id>6</id>
  2673 + <source>3</source>
  2674 + <target>10</target>
  2675 + <child_cardinality>1..n</child_cardinality>
  2676 + <parent_cardinality>1</parent_cardinality>
  2677 + <reference_for_pk>true</reference_for_pk>
  2678 + <name></name>
  2679 + <on_delete_action>RESTRICT</on_delete_action>
  2680 + <on_update_action>RESTRICT</on_update_action>
  2681 + <source_xp>-1</source_xp>
  2682 + <source_yp>-1</source_yp>
  2683 + <target_xp>-1</target_xp>
  2684 + <target_yp>-1</target_yp>
  2685 + <referenced_column>null</referenced_column>
  2686 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2687 + </relation>
  2688 + <relation>
  2689 + <id>7</id>
  2690 + <source>2</source>
  2691 + <target>10</target>
  2692 + <child_cardinality>1..n</child_cardinality>
  2693 + <parent_cardinality>1</parent_cardinality>
  2694 + <reference_for_pk>true</reference_for_pk>
  2695 + <name></name>
  2696 + <on_delete_action>RESTRICT</on_delete_action>
  2697 + <on_update_action>RESTRICT</on_update_action>
  2698 + <source_xp>-1</source_xp>
  2699 + <source_yp>-1</source_yp>
  2700 + <target_xp>-1</target_xp>
  2701 + <target_yp>-1</target_yp>
  2702 + <referenced_column>null</referenced_column>
  2703 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2704 + </relation>
  2705 + <relation>
  2706 + <id>8</id>
  2707 + <source>4</source>
  2708 + <target>10</target>
  2709 + <child_cardinality>1..n</child_cardinality>
  2710 + <parent_cardinality>1</parent_cardinality>
  2711 + <reference_for_pk>true</reference_for_pk>
  2712 + <name></name>
  2713 + <on_delete_action>RESTRICT</on_delete_action>
  2714 + <on_update_action>RESTRICT</on_update_action>
  2715 + <source_xp>-1</source_xp>
  2716 + <source_yp>-1</source_yp>
  2717 + <target_xp>-1</target_xp>
  2718 + <target_yp>-1</target_yp>
  2719 + <referenced_column>null</referenced_column>
  2720 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2721 + </relation>
2595 2722 </connections>
2596   - <physical_name>i3geoestat_parametro_medida</physical_name>
2597   - <logical_name>i3geoestat_parametro_medida</logical_name>
2598   - <description></description>
  2723 + <physical_name>i3geoestat_medida_variavel</physical_name>
  2724 + <logical_name>i3geoestat_medida_variavel</logical_name>
  2725 + <description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description>
2599 2726 <constraint></constraint>
2600 2727 <primary_key_name></primary_key_name>
2601 2728 <option></option>
2602 2729 <columns>
2603 2730 <normal_column>
2604   - <word_id>35</word_id>
2605   - <id>37</id>
  2731 + <word_id>33</word_id>
  2732 + <id>39</id>
2606 2733 <description></description>
2607 2734 <unique_key_name></unique_key_name>
2608 2735 <logical_name></logical_name>
... ... @@ -2633,17 +2760,18 @@
2633 2760 </sequence>
2634 2761 </normal_column>
2635 2762 <normal_column>
2636   - <word_id>8</word_id>
2637   - <id>38</id>
  2763 + <id>40</id>
  2764 + <referenced_column>0</referenced_column>
  2765 + <relation>7</relation>
2638 2766 <description></description>
2639 2767 <unique_key_name></unique_key_name>
2640 2768 <logical_name></logical_name>
2641 2769 <physical_name></physical_name>
2642   - <type>text</type>
  2770 + <type>integer</type>
2643 2771 <constraint></constraint>
2644 2772 <default_value></default_value>
2645 2773 <auto_increment>false</auto_increment>
2646   - <foreign_key>false</foreign_key>
  2774 + <foreign_key>true</foreign_key>
2647 2775 <not_null>false</not_null>
2648 2776 <primary_key>false</primary_key>
2649 2777 <unique_key>false</unique_key>
... ... @@ -2665,17 +2793,18 @@
2665 2793 </sequence>
2666 2794 </normal_column>
2667 2795 <normal_column>
2668   - <word_id>41</word_id>
2669   - <id>39</id>
  2796 + <id>41</id>
  2797 + <referenced_column>5</referenced_column>
  2798 + <relation>6</relation>
2670 2799 <description></description>
2671 2800 <unique_key_name></unique_key_name>
2672 2801 <logical_name></logical_name>
2673 2802 <physical_name></physical_name>
2674   - <type>text</type>
  2803 + <type>integer</type>
2675 2804 <constraint></constraint>
2676 2805 <default_value></default_value>
2677 2806 <auto_increment>false</auto_increment>
2678   - <foreign_key>false</foreign_key>
  2807 + <foreign_key>true</foreign_key>
2679 2808 <not_null>false</not_null>
2680 2809 <primary_key>false</primary_key>
2681 2810 <unique_key>false</unique_key>
... ... @@ -2697,17 +2826,18 @@
2697 2826 </sequence>
2698 2827 </normal_column>
2699 2828 <normal_column>
2700   - <word_id>20</word_id>
2701   - <id>40</id>
  2829 + <id>42</id>
  2830 + <referenced_column>8</referenced_column>
  2831 + <relation>8</relation>
2702 2832 <description></description>
2703 2833 <unique_key_name></unique_key_name>
2704 2834 <logical_name></logical_name>
2705 2835 <physical_name></physical_name>
2706   - <type>text</type>
  2836 + <type>integer</type>
2707 2837 <constraint></constraint>
2708 2838 <default_value></default_value>
2709 2839 <auto_increment>false</auto_increment>
2710   - <foreign_key>false</foreign_key>
  2840 + <foreign_key>true</foreign_key>
2711 2841 <not_null>false</not_null>
2712 2842 <primary_key>false</primary_key>
2713 2843 <unique_key>false</unique_key>
... ... @@ -2729,17 +2859,18 @@
2729 2859 </sequence>
2730 2860 </normal_column>
2731 2861 <normal_column>
2732   - <word_id>34</word_id>
2733   - <id>41</id>
  2862 + <id>43</id>
  2863 + <referenced_column>56</referenced_column>
  2864 + <relation>4</relation>
2734 2865 <description></description>
2735 2866 <unique_key_name></unique_key_name>
2736 2867 <logical_name></logical_name>
2737 2868 <physical_name></physical_name>
2738 2869 <type>integer</type>
2739 2870 <constraint></constraint>
2740   - <default_value>0</default_value>
  2871 + <default_value></default_value>
2741 2872 <auto_increment>false</auto_increment>
2742   - <foreign_key>false</foreign_key>
  2873 + <foreign_key>true</foreign_key>
2743 2874 <not_null>false</not_null>
2744 2875 <primary_key>false</primary_key>
2745 2876 <unique_key>false</unique_key>
... ... @@ -2761,8 +2892,8 @@
2761 2892 </sequence>
2762 2893 </normal_column>
2763 2894 <normal_column>
2764   - <id>42</id>
2765   - <referenced_column>49</referenced_column>
  2895 + <id>44</id>
  2896 + <referenced_column>33</referenced_column>
2766 2897 <relation>5</relation>
2767 2898 <description></description>
2768 2899 <unique_key_name></unique_key_name>
... ... @@ -2793,52 +2924,21 @@
2793 2924 <decimal_size>0</decimal_size>
2794 2925 </sequence>
2795 2926 </normal_column>
2796   - </columns>
2797   - <indexes>
2798   - </indexes>
2799   - <complex_unique_key_list>
2800   - </complex_unique_key_list>
2801   - <table_properties>
2802   - <schema></schema>
2803   - </table_properties>
2804   - </table>
2805   - <table>
2806   - <id>11</id>
2807   - <height>170</height>
2808   - <width>292</width>
2809   - <font_name>Ubuntu</font_name>
2810   - <font_size>9</font_size>
2811   - <x>8</x>
2812   - <y>499</y>
2813   - <color>
2814   - <r>255</r>
2815   - <g>165</g>
2816   - <b>0</b>
2817   - </color>
2818   - <connections>
2819   - </connections>
2820   - <physical_name>i3geoestat_conexao</physical_name>
2821   - <logical_name>i3geoestat_conexao</logical_name>
2822   - <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados&#x0A;Código 0 indica que será utilizada a conexão padrão</description>
2823   - <constraint></constraint>
2824   - <primary_key_name></primary_key_name>
2825   - <option></option>
2826   - <columns>
2827 2927 <normal_column>
2828   - <word_id>2</word_id>
2829   - <id>43</id>
  2928 + <word_id>22</word_id>
  2929 + <id>45</id>
2830 2930 <description></description>
2831 2931 <unique_key_name></unique_key_name>
2832 2932 <logical_name></logical_name>
2833 2933 <physical_name></physical_name>
2834   - <type>integer</type>
  2934 + <type>text</type>
2835 2935 <constraint></constraint>
2836 2936 <default_value></default_value>
2837   - <auto_increment>true</auto_increment>
  2937 + <auto_increment>false</auto_increment>
2838 2938 <foreign_key>false</foreign_key>
2839   - <not_null>true</not_null>
2840   - <primary_key>true</primary_key>
2841   - <unique_key>true</unique_key>
  2939 + <not_null>false</not_null>
  2940 + <primary_key>false</primary_key>
  2941 + <unique_key>false</unique_key>
2842 2942 <character_set></character_set>
2843 2943 <collation></collation>
2844 2944 <sequence>
... ... @@ -2857,8 +2957,8 @@
2857 2957 </sequence>
2858 2958 </normal_column>
2859 2959 <normal_column>
2860   - <word_id>1</word_id>
2861   - <id>44</id>
  2960 + <word_id>58</word_id>
  2961 + <id>46</id>
2862 2962 <description></description>
2863 2963 <unique_key_name></unique_key_name>
2864 2964 <logical_name></logical_name>
... ... @@ -2889,8 +2989,8 @@
2889 2989 </sequence>
2890 2990 </normal_column>
2891 2991 <normal_column>
2892   - <word_id>26</word_id>
2893   - <id>45</id>
  2992 + <word_id>16</word_id>
  2993 + <id>47</id>
2894 2994 <description></description>
2895 2995 <unique_key_name></unique_key_name>
2896 2996 <logical_name></logical_name>
... ... @@ -2921,8 +3021,8 @@
2921 3021 </sequence>
2922 3022 </normal_column>
2923 3023 <normal_column>
2924   - <word_id>53</word_id>
2925   - <id>46</id>
  3024 + <word_id>11</word_id>
  3025 + <id>48</id>
2926 3026 <description></description>
2927 3027 <unique_key_name></unique_key_name>
2928 3028 <logical_name></logical_name>
... ... @@ -2953,8 +3053,8 @@
2953 3053 </sequence>
2954 3054 </normal_column>
2955 3055 <normal_column>
2956   - <word_id>63</word_id>
2957   - <id>47</id>
  3056 + <word_id>25</word_id>
  3057 + <id>49</id>
2958 3058 <description></description>
2959 3059 <unique_key_name></unique_key_name>
2960 3060 <logical_name></logical_name>
... ... @@ -2985,8 +3085,8 @@
2985 3085 </sequence>
2986 3086 </normal_column>
2987 3087 <normal_column>
2988   - <word_id>54</word_id>
2989   - <id>48</id>
  3088 + <word_id>44</word_id>
  3089 + <id>50</id>
2990 3090 <description></description>
2991 3091 <unique_key_name></unique_key_name>
2992 3092 <logical_name></logical_name>
... ... @@ -3016,101 +3116,65 @@
3016 3116 <decimal_size>0</decimal_size>
3017 3117 </sequence>
3018 3118 </normal_column>
3019   - </columns>
3020   - <indexes>
3021   - </indexes>
3022   - <complex_unique_key_list>
3023   - </complex_unique_key_list>
3024   - <table_properties>
3025   - <schema></schema>
3026   - </table_properties>
3027   - </table>
3028   - <table>
3029   - <id>12</id>
3030   - <height>339</height>
3031   - <width>292</width>
3032   - <font_name>Ubuntu</font_name>
3033   - <font_size>9</font_size>
3034   - <x>353</x>
3035   - <y>155</y>
3036   - <color>
3037   - <r>160</r>
3038   - <g>32</g>
3039   - <b>240</b>
3040   - </color>
3041   - <connections>
3042   - <relation>
3043   - <id>6</id>
3044   - <source>4</source>
3045   - <target>12</target>
3046   - <child_cardinality>1..n</child_cardinality>
3047   - <parent_cardinality>1</parent_cardinality>
3048   - <reference_for_pk>true</reference_for_pk>
3049   - <name></name>
3050   - <on_delete_action>RESTRICT</on_delete_action>
3051   - <on_update_action>RESTRICT</on_update_action>
3052   - <source_xp>-1</source_xp>
3053   - <source_yp>-1</source_yp>
3054   - <target_xp>-1</target_xp>
3055   - <target_yp>-1</target_yp>
3056   - <referenced_column>null</referenced_column>
3057   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
3058   - </relation>
3059   - <relation>
3060   - <id>7</id>
3061   - <source>14</source>
3062   - <target>12</target>
3063   - <child_cardinality>1..n</child_cardinality>
3064   - <parent_cardinality>1</parent_cardinality>
3065   - <reference_for_pk>true</reference_for_pk>
3066   - <name></name>
3067   - <on_delete_action>RESTRICT</on_delete_action>
3068   - <on_update_action>RESTRICT</on_update_action>
3069   - <source_xp>-1</source_xp>
3070   - <source_yp>-1</source_yp>
3071   - <target_xp>-1</target_xp>
3072   - <target_yp>-1</target_yp>
3073   - <referenced_column>null</referenced_column>
3074   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
3075   - </relation>
3076   - <relation>
3077   - <id>8</id>
3078   - <source>2</source>
3079   - <target>12</target>
3080   - <child_cardinality>1..n</child_cardinality>
3081   - <parent_cardinality>1</parent_cardinality>
3082   - <reference_for_pk>true</reference_for_pk>
3083   - <name></name>
3084   - <on_delete_action>RESTRICT</on_delete_action>
3085   - <on_update_action>RESTRICT</on_update_action>
3086   - <source_xp>-1</source_xp>
3087   - <source_yp>-1</source_yp>
3088   - <target_xp>-1</target_xp>
3089   - <target_yp>-1</target_yp>
3090   - <referenced_column>null</referenced_column>
3091   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
3092   - </relation>
  3119 + <normal_column>
  3120 + <word_id>12</word_id>
  3121 + <id>51</id>
  3122 + <description></description>
  3123 + <unique_key_name></unique_key_name>
  3124 + <logical_name></logical_name>
  3125 + <physical_name></physical_name>
  3126 + <type>text</type>
  3127 + <constraint></constraint>
  3128 + <default_value></default_value>
  3129 + <auto_increment>false</auto_increment>
  3130 + <foreign_key>false</foreign_key>
  3131 + <not_null>false</not_null>
  3132 + <primary_key>false</primary_key>
  3133 + <unique_key>false</unique_key>
  3134 + <character_set></character_set>
  3135 + <collation></collation>
  3136 + <sequence>
  3137 + <name></name>
  3138 + <schema></schema>
  3139 + <increment></increment>
  3140 + <min_value></min_value>
  3141 + <max_value></max_value>
  3142 + <start></start>
  3143 + <cache></cache>
  3144 + <cycle>false</cycle>
  3145 + <order>false</order>
  3146 + <description></description>
  3147 + <data_type></data_type>
  3148 + <decimal_size>0</decimal_size>
  3149 + </sequence>
  3150 + </normal_column>
  3151 + </columns>
  3152 + <indexes>
  3153 + </indexes>
  3154 + <complex_unique_key_list>
  3155 + </complex_unique_key_list>
  3156 + <table_properties>
  3157 + <schema></schema>
  3158 + </table_properties>
  3159 + </table>
  3160 + <table>
  3161 + <id>11</id>
  3162 + <height>128</height>
  3163 + <width>270</width>
  3164 + <font_name>Ubuntu</font_name>
  3165 + <font_size>9</font_size>
  3166 + <x>-372</x>
  3167 + <y>596</y>
  3168 + <color>
  3169 + <r>255</r>
  3170 + <g>128</g>
  3171 + <b>255</b>
  3172 + </color>
  3173 + <connections>
3093 3174 <relation>
3094 3175 <id>9</id>
3095   - <source>3</source>
3096   - <target>12</target>
3097   - <child_cardinality>1..n</child_cardinality>
3098   - <parent_cardinality>1</parent_cardinality>
3099   - <reference_for_pk>true</reference_for_pk>
3100   - <name></name>
3101   - <on_delete_action>RESTRICT</on_delete_action>
3102   - <on_update_action>RESTRICT</on_update_action>
3103   - <source_xp>-1</source_xp>
3104   - <source_yp>-1</source_yp>
3105   - <target_xp>-1</target_xp>
3106   - <target_yp>-1</target_yp>
3107   - <referenced_column>null</referenced_column>
3108   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
3109   - </relation>
3110   - <relation>
3111   - <id>10</id>
3112   - <source>11</source>
3113   - <target>12</target>
  3176 + <source>12</source>
  3177 + <target>11</target>
3114 3178 <child_cardinality>1..n</child_cardinality>
3115 3179 <parent_cardinality>1</parent_cardinality>
3116 3180 <reference_for_pk>true</reference_for_pk>
... ... @@ -3125,16 +3189,16 @@
3125 3189 <referenced_complex_unique_key>null</referenced_complex_unique_key>
3126 3190 </relation>
3127 3191 </connections>
3128   - <physical_name>i3geoestat_medida_variavel</physical_name>
3129   - <logical_name>i3geoestat_medida_variavel</logical_name>
3130   - <description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description>
  3192 + <physical_name>i3geoestat_agregaregiao</physical_name>
  3193 + <logical_name>i3geoestat_agregaregiao</logical_name>
  3194 + <description></description>
3131 3195 <constraint></constraint>
3132 3196 <primary_key_name></primary_key_name>
3133 3197 <option></option>
3134 3198 <columns>
3135 3199 <normal_column>
3136   - <word_id>33</word_id>
3137   - <id>49</id>
  3200 + <word_id>28</word_id>
  3201 + <id>52</id>
3138 3202 <description></description>
3139 3203 <unique_key_name></unique_key_name>
3140 3204 <logical_name></logical_name>
... ... @@ -3165,9 +3229,9 @@
3165 3229 </sequence>
3166 3230 </normal_column>
3167 3231 <normal_column>
3168   - <id>50</id>
3169   - <referenced_column>0</referenced_column>
3170   - <relation>8</relation>
  3232 + <id>53</id>
  3233 + <referenced_column>56</referenced_column>
  3234 + <relation>9</relation>
3171 3235 <description></description>
3172 3236 <unique_key_name></unique_key_name>
3173 3237 <logical_name></logical_name>
... ... @@ -3198,9 +3262,8 @@
3198 3262 </sequence>
3199 3263 </normal_column>
3200 3264 <normal_column>
3201   - <id>51</id>
3202   - <referenced_column>5</referenced_column>
3203   - <relation>9</relation>
  3265 + <word_id>5</word_id>
  3266 + <id>54</id>
3204 3267 <description></description>
3205 3268 <unique_key_name></unique_key_name>
3206 3269 <logical_name></logical_name>
... ... @@ -3209,7 +3272,7 @@
3209 3272 <constraint></constraint>
3210 3273 <default_value></default_value>
3211 3274 <auto_increment>false</auto_increment>
3212   - <foreign_key>true</foreign_key>
  3275 + <foreign_key>false</foreign_key>
3213 3276 <not_null>false</not_null>
3214 3277 <primary_key>false</primary_key>
3215 3278 <unique_key>false</unique_key>
... ... @@ -3231,18 +3294,17 @@
3231 3294 </sequence>
3232 3295 </normal_column>
3233 3296 <normal_column>
3234   - <id>52</id>
3235   - <referenced_column>8</referenced_column>
3236   - <relation>6</relation>
  3297 + <word_id>13</word_id>
  3298 + <id>55</id>
3237 3299 <description></description>
3238 3300 <unique_key_name></unique_key_name>
3239 3301 <logical_name></logical_name>
3240 3302 <physical_name></physical_name>
3241   - <type>integer</type>
  3303 + <type>text</type>
3242 3304 <constraint></constraint>
3243 3305 <default_value></default_value>
3244 3306 <auto_increment>false</auto_increment>
3245   - <foreign_key>true</foreign_key>
  3307 + <foreign_key>false</foreign_key>
3246 3308 <not_null>false</not_null>
3247 3309 <primary_key>false</primary_key>
3248 3310 <unique_key>false</unique_key>
... ... @@ -3263,10 +3325,57 @@
3263 3325 <decimal_size>0</decimal_size>
3264 3326 </sequence>
3265 3327 </normal_column>
  3328 + </columns>
  3329 + <indexes>
  3330 + </indexes>
  3331 + <complex_unique_key_list>
  3332 + </complex_unique_key_list>
  3333 + <table_properties>
  3334 + <schema></schema>
  3335 + </table_properties>
  3336 + </table>
  3337 + <table>
  3338 + <id>12</id>
  3339 + <height>275</height>
  3340 + <width>292</width>
  3341 + <font_name>Ubuntu</font_name>
  3342 + <font_size>9</font_size>
  3343 + <x>-336</x>
  3344 + <y>236</y>
  3345 + <color>
  3346 + <r>255</r>
  3347 + <g>128</g>
  3348 + <b>255</b>
  3349 + </color>
  3350 + <connections>
  3351 + <relation>
  3352 + <id>10</id>
  3353 + <source>9</source>
  3354 + <target>12</target>
  3355 + <child_cardinality>1..n</child_cardinality>
  3356 + <parent_cardinality>1</parent_cardinality>
  3357 + <reference_for_pk>true</reference_for_pk>
  3358 + <name></name>
  3359 + <on_delete_action>RESTRICT</on_delete_action>
  3360 + <on_update_action>RESTRICT</on_update_action>
  3361 + <source_xp>-1</source_xp>
  3362 + <source_yp>-1</source_yp>
  3363 + <target_xp>-1</target_xp>
  3364 + <target_yp>-1</target_yp>
  3365 + <referenced_column>null</referenced_column>
  3366 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3367 + </relation>
  3368 + </connections>
  3369 + <physical_name>i3geoestat_tipo_regiao</physical_name>
  3370 + <logical_name>i3geoestat_tipo_regiao</logical_name>
  3371 + <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description>
  3372 + <constraint></constraint>
  3373 + <primary_key_name></primary_key_name>
  3374 + <option></option>
  3375 + <columns>
3266 3376 <normal_column>
3267   - <id>53</id>
3268   - <referenced_column>66</referenced_column>
3269   - <relation>7</relation>
  3377 + <word_id>4</word_id>
  3378 + <id>56</id>
3270 3379 <description></description>
3271 3380 <unique_key_name></unique_key_name>
3272 3381 <logical_name></logical_name>
... ... @@ -3274,11 +3383,11 @@
3274 3383 <type>integer</type>
3275 3384 <constraint></constraint>
3276 3385 <default_value></default_value>
3277   - <auto_increment>false</auto_increment>
3278   - <foreign_key>true</foreign_key>
3279   - <not_null>false</not_null>
3280   - <primary_key>false</primary_key>
3281   - <unique_key>false</unique_key>
  3386 + <auto_increment>true</auto_increment>
  3387 + <foreign_key>false</foreign_key>
  3388 + <not_null>true</not_null>
  3389 + <primary_key>true</primary_key>
  3390 + <unique_key>true</unique_key>
3282 3391 <character_set></character_set>
3283 3392 <collation></collation>
3284 3393 <sequence>
... ... @@ -3297,18 +3406,17 @@
3297 3406 </sequence>
3298 3407 </normal_column>
3299 3408 <normal_column>
3300   - <id>54</id>
3301   - <referenced_column>43</referenced_column>
3302   - <relation>10</relation>
  3409 + <word_id>45</word_id>
  3410 + <id>57</id>
3303 3411 <description></description>
3304 3412 <unique_key_name></unique_key_name>
3305 3413 <logical_name></logical_name>
3306 3414 <physical_name></physical_name>
3307   - <type>integer</type>
  3415 + <type>text</type>
3308 3416 <constraint></constraint>
3309 3417 <default_value></default_value>
3310 3418 <auto_increment>false</auto_increment>
3311   - <foreign_key>true</foreign_key>
  3419 + <foreign_key>false</foreign_key>
3312 3420 <not_null>false</not_null>
3313 3421 <primary_key>false</primary_key>
3314 3422 <unique_key>false</unique_key>
... ... @@ -3330,8 +3438,8 @@
3330 3438 </sequence>
3331 3439 </normal_column>
3332 3440 <normal_column>
3333   - <word_id>22</word_id>
3334   - <id>55</id>
  3441 + <word_id>21</word_id>
  3442 + <id>58</id>
3335 3443 <description></description>
3336 3444 <unique_key_name></unique_key_name>
3337 3445 <logical_name></logical_name>
... ... @@ -3362,17 +3470,18 @@
3362 3470 </sequence>
3363 3471 </normal_column>
3364 3472 <normal_column>
3365   - <word_id>58</word_id>
3366   - <id>56</id>
  3473 + <id>59</id>
  3474 + <referenced_column>33</referenced_column>
  3475 + <relation>10</relation>
3367 3476 <description></description>
3368 3477 <unique_key_name></unique_key_name>
3369 3478 <logical_name></logical_name>
3370 3479 <physical_name></physical_name>
3371   - <type>text</type>
  3480 + <type>integer</type>
3372 3481 <constraint></constraint>
3373 3482 <default_value></default_value>
3374 3483 <auto_increment>false</auto_increment>
3375   - <foreign_key>false</foreign_key>
  3484 + <foreign_key>true</foreign_key>
3376 3485 <not_null>false</not_null>
3377 3486 <primary_key>false</primary_key>
3378 3487 <unique_key>false</unique_key>
... ... @@ -3394,8 +3503,8 @@
3394 3503 </sequence>
3395 3504 </normal_column>
3396 3505 <normal_column>
3397   - <word_id>16</word_id>
3398   - <id>57</id>
  3506 + <word_id>23</word_id>
  3507 + <id>60</id>
3399 3508 <description></description>
3400 3509 <unique_key_name></unique_key_name>
3401 3510 <logical_name></logical_name>
... ... @@ -3426,8 +3535,8 @@
3426 3535 </sequence>
3427 3536 </normal_column>
3428 3537 <normal_column>
3429   - <word_id>11</word_id>
3430   - <id>58</id>
  3538 + <word_id>59</word_id>
  3539 + <id>61</id>
3431 3540 <description></description>
3432 3541 <unique_key_name></unique_key_name>
3433 3542 <logical_name></logical_name>
... ... @@ -3458,8 +3567,8 @@
3458 3567 </sequence>
3459 3568 </normal_column>
3460 3569 <normal_column>
3461   - <word_id>25</word_id>
3462   - <id>59</id>
  3570 + <word_id>10</word_id>
  3571 + <id>62</id>
3463 3572 <description></description>
3464 3573 <unique_key_name></unique_key_name>
3465 3574 <logical_name></logical_name>
... ... @@ -3490,8 +3599,8 @@
3490 3599 </sequence>
3491 3600 </normal_column>
3492 3601 <normal_column>
3493   - <word_id>44</word_id>
3494   - <id>60</id>
  3602 + <word_id>17</word_id>
  3603 + <id>63</id>
3495 3604 <description></description>
3496 3605 <unique_key_name></unique_key_name>
3497 3606 <logical_name></logical_name>
... ... @@ -3522,13 +3631,13 @@
3522 3631 </sequence>
3523 3632 </normal_column>
3524 3633 <normal_column>
3525   - <word_id>12</word_id>
3526   - <id>61</id>
  3634 + <word_id>27</word_id>
  3635 + <id>64</id>
3527 3636 <description></description>
3528 3637 <unique_key_name></unique_key_name>
3529 3638 <logical_name></logical_name>
3530 3639 <physical_name></physical_name>
3531   - <type>text</type>
  3640 + <type>integer</type>
3532 3641 <constraint></constraint>
3533 3642 <default_value></default_value>
3534 3643 <auto_increment>false</auto_increment>
... ... @@ -3553,69 +3662,21 @@
3553 3662 <decimal_size>0</decimal_size>
3554 3663 </sequence>
3555 3664 </normal_column>
3556   - </columns>
3557   - <indexes>
3558   - </indexes>
3559   - <complex_unique_key_list>
3560   - </complex_unique_key_list>
3561   - <table_properties>
3562   - <schema></schema>
3563   - </table_properties>
3564   - </table>
3565   - <table>
3566   - <id>13</id>
3567   - <height>128</height>
3568   - <width>270</width>
3569   - <font_name>Ubuntu</font_name>
3570   - <font_size>9</font_size>
3571   - <x>-372</x>
3572   - <y>596</y>
3573   - <color>
3574   - <r>255</r>
3575   - <g>128</g>
3576   - <b>255</b>
3577   - </color>
3578   - <connections>
3579   - <relation>
3580   - <id>11</id>
3581   - <source>14</source>
3582   - <target>13</target>
3583   - <child_cardinality>1..n</child_cardinality>
3584   - <parent_cardinality>1</parent_cardinality>
3585   - <reference_for_pk>true</reference_for_pk>
3586   - <name></name>
3587   - <on_delete_action>RESTRICT</on_delete_action>
3588   - <on_update_action>RESTRICT</on_update_action>
3589   - <source_xp>-1</source_xp>
3590   - <source_yp>-1</source_yp>
3591   - <target_xp>-1</target_xp>
3592   - <target_yp>-1</target_yp>
3593   - <referenced_column>null</referenced_column>
3594   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
3595   - </relation>
3596   - </connections>
3597   - <physical_name>i3geoestat_agregaregiao</physical_name>
3598   - <logical_name>i3geoestat_agregaregiao</logical_name>
3599   - <description></description>
3600   - <constraint></constraint>
3601   - <primary_key_name></primary_key_name>
3602   - <option></option>
3603   - <columns>
3604 3665 <normal_column>
3605   - <word_id>28</word_id>
3606   - <id>62</id>
  3666 + <word_id>14</word_id>
  3667 + <id>65</id>
3607 3668 <description></description>
3608 3669 <unique_key_name></unique_key_name>
3609 3670 <logical_name></logical_name>
3610 3671 <physical_name></physical_name>
3611   - <type>integer</type>
  3672 + <type>text</type>
3612 3673 <constraint></constraint>
3613 3674 <default_value></default_value>
3614   - <auto_increment>true</auto_increment>
  3675 + <auto_increment>false</auto_increment>
3615 3676 <foreign_key>false</foreign_key>
3616   - <not_null>true</not_null>
3617   - <primary_key>true</primary_key>
3618   - <unique_key>true</unique_key>
  3677 + <not_null>false</not_null>
  3678 + <primary_key>false</primary_key>
  3679 + <unique_key>false</unique_key>
3619 3680 <character_set></character_set>
3620 3681 <collation></collation>
3621 3682 <sequence>
... ... @@ -3634,18 +3695,17 @@
3634 3695 </sequence>
3635 3696 </normal_column>
3636 3697 <normal_column>
3637   - <id>63</id>
3638   - <referenced_column>66</referenced_column>
3639   - <relation>11</relation>
  3698 + <word_id>57</word_id>
  3699 + <id>66</id>
3640 3700 <description></description>
3641 3701 <unique_key_name></unique_key_name>
3642 3702 <logical_name></logical_name>
3643 3703 <physical_name></physical_name>
3644   - <type>integer</type>
  3704 + <type>text</type>
3645 3705 <constraint></constraint>
3646   - <default_value></default_value>
  3706 + <default_value>4326</default_value>
3647 3707 <auto_increment>false</auto_increment>
3648   - <foreign_key>true</foreign_key>
  3708 + <foreign_key>false</foreign_key>
3649 3709 <not_null>false</not_null>
3650 3710 <primary_key>false</primary_key>
3651 3711 <unique_key>false</unique_key>
... ... @@ -3667,13 +3727,13 @@
3667 3727 </sequence>
3668 3728 </normal_column>
3669 3729 <normal_column>
3670   - <word_id>5</word_id>
3671   - <id>64</id>
  3730 + <word_id>9</word_id>
  3731 + <id>67</id>
3672 3732 <description></description>
3673 3733 <unique_key_name></unique_key_name>
3674 3734 <logical_name></logical_name>
3675 3735 <physical_name></physical_name>
3676   - <type>integer</type>
  3736 + <type>text</type>
3677 3737 <constraint></constraint>
3678 3738 <default_value></default_value>
3679 3739 <auto_increment>false</auto_increment>
... ... @@ -3699,8 +3759,8 @@
3699 3759 </sequence>
3700 3760 </normal_column>
3701 3761 <normal_column>
3702   - <word_id>13</word_id>
3703   - <id>65</id>
  3762 + <word_id>15</word_id>
  3763 + <id>68</id>
3704 3764 <description></description>
3705 3765 <unique_key_name></unique_key_name>
3706 3766 <logical_name></logical_name>
... ... @@ -3740,23 +3800,23 @@
3740 3800 </table_properties>
3741 3801 </table>
3742 3802 <table>
3743   - <id>14</id>
3744   - <height>275</height>
3745   - <width>292</width>
  3803 + <id>13</id>
  3804 + <height>128</height>
  3805 + <width>269</width>
3746 3806 <font_name>Ubuntu</font_name>
3747 3807 <font_size>9</font_size>
3748   - <x>-336</x>
3749   - <y>236</y>
  3808 + <x>810</x>
  3809 + <y>466</y>
3750 3810 <color>
3751   - <r>255</r>
3752   - <g>128</g>
3753   - <b>255</b>
  3811 + <r>230</r>
  3812 + <g>230</g>
  3813 + <b>250</b>
3754 3814 </color>
3755 3815 <connections>
3756 3816 <relation>
3757   - <id>12</id>
3758   - <source>11</source>
3759   - <target>14</target>
  3817 + <id>11</id>
  3818 + <source>10</source>
  3819 + <target>13</target>
3760 3820 <child_cardinality>1..n</child_cardinality>
3761 3821 <parent_cardinality>1</parent_cardinality>
3762 3822 <reference_for_pk>true</reference_for_pk>
... ... @@ -3771,80 +3831,16 @@
3771 3831 <referenced_complex_unique_key>null</referenced_complex_unique_key>
3772 3832 </relation>
3773 3833 </connections>
3774   - <physical_name>i3geoestat_tipo_regiao</physical_name>
3775   - <logical_name>i3geoestat_tipo_regiao</logical_name>
3776   - <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description>
  3834 + <physical_name>i3geoestat_medida_variavel_link</physical_name>
  3835 + <logical_name>i3geoestat_medida_variavel_link</logical_name>
  3836 + <description></description>
3777 3837 <constraint></constraint>
3778 3838 <primary_key_name></primary_key_name>
3779 3839 <option></option>
3780 3840 <columns>
3781 3841 <normal_column>
3782   - <word_id>4</word_id>
3783   - <id>66</id>
3784   - <description></description>
3785   - <unique_key_name></unique_key_name>
3786   - <logical_name></logical_name>
3787   - <physical_name></physical_name>
3788   - <type>integer</type>
3789   - <constraint></constraint>
3790   - <default_value></default_value>
3791   - <auto_increment>true</auto_increment>
3792   - <foreign_key>false</foreign_key>
3793   - <not_null>true</not_null>
3794   - <primary_key>true</primary_key>
3795   - <unique_key>true</unique_key>
3796   - <character_set></character_set>
3797   - <collation></collation>
3798   - <sequence>
3799   - <name></name>
3800   - <schema></schema>
3801   - <increment></increment>
3802   - <min_value></min_value>
3803   - <max_value></max_value>
3804   - <start></start>
3805   - <cache></cache>
3806   - <cycle>false</cycle>
3807   - <order>false</order>
3808   - <description></description>
3809   - <data_type></data_type>
3810   - <decimal_size>0</decimal_size>
3811   - </sequence>
3812   - </normal_column>
3813   - <normal_column>
3814   - <word_id>45</word_id>
3815   - <id>67</id>
3816   - <description></description>
3817   - <unique_key_name></unique_key_name>
3818   - <logical_name></logical_name>
3819   - <physical_name></physical_name>
3820   - <type>text</type>
3821   - <constraint></constraint>
3822   - <default_value></default_value>
3823   - <auto_increment>false</auto_increment>
3824   - <foreign_key>false</foreign_key>
3825   - <not_null>false</not_null>
3826   - <primary_key>false</primary_key>
3827   - <unique_key>false</unique_key>
3828   - <character_set></character_set>
3829   - <collation></collation>
3830   - <sequence>
3831   - <name></name>
3832   - <schema></schema>
3833   - <increment></increment>
3834   - <min_value></min_value>
3835   - <max_value></max_value>
3836   - <start></start>
3837   - <cache></cache>
3838   - <cycle>false</cycle>
3839   - <order>false</order>
3840   - <description></description>
3841   - <data_type></data_type>
3842   - <decimal_size>0</decimal_size>
3843   - </sequence>
3844   - </normal_column>
3845   - <normal_column>
3846   - <word_id>21</word_id>
3847   - <id>68</id>
  3842 + <word_id>37</word_id>
  3843 + <id>69</id>
3848 3844 <description></description>
3849 3845 <unique_key_name></unique_key_name>
3850 3846 <logical_name></logical_name>
... ... @@ -3875,9 +3871,9 @@
3875 3871 </sequence>
3876 3872 </normal_column>
3877 3873 <normal_column>
3878   - <id>69</id>
3879   - <referenced_column>43</referenced_column>
3880   - <relation>12</relation>
  3874 + <id>70</id>
  3875 + <referenced_column>39</referenced_column>
  3876 + <relation>11</relation>
3881 3877 <description></description>
3882 3878 <unique_key_name></unique_key_name>
3883 3879 <logical_name></logical_name>
... ... @@ -3908,8 +3904,8 @@
3908 3904 </sequence>
3909 3905 </normal_column>
3910 3906 <normal_column>
3911   - <word_id>23</word_id>
3912   - <id>70</id>
  3907 + <word_id>41</word_id>
  3908 + <id>71</id>
3913 3909 <description></description>
3914 3910 <unique_key_name></unique_key_name>
3915 3911 <logical_name></logical_name>
... ... @@ -3940,20 +3936,20 @@
3940 3936 </sequence>
3941 3937 </normal_column>
3942 3938 <normal_column>
3943   - <word_id>59</word_id>
3944   - <id>71</id>
  3939 + <word_id>32</word_id>
  3940 + <id>72</id>
3945 3941 <description></description>
3946 3942 <unique_key_name></unique_key_name>
3947 3943 <logical_name></logical_name>
3948 3944 <physical_name></physical_name>
3949   - <type>text</type>
  3945 + <type>integer</type>
3950 3946 <constraint></constraint>
3951 3947 <default_value></default_value>
3952   - <auto_increment>false</auto_increment>
  3948 + <auto_increment>true</auto_increment>
3953 3949 <foreign_key>false</foreign_key>
3954   - <not_null>false</not_null>
3955   - <primary_key>false</primary_key>
3956   - <unique_key>false</unique_key>
  3950 + <not_null>true</not_null>
  3951 + <primary_key>true</primary_key>
  3952 + <unique_key>true</unique_key>
3957 3953 <character_set></character_set>
3958 3954 <collation></collation>
3959 3955 <sequence>
... ... @@ -3971,21 +3967,69 @@
3971 3967 <decimal_size>0</decimal_size>
3972 3968 </sequence>
3973 3969 </normal_column>
  3970 + </columns>
  3971 + <indexes>
  3972 + </indexes>
  3973 + <complex_unique_key_list>
  3974 + </complex_unique_key_list>
  3975 + <table_properties>
  3976 + <schema></schema>
  3977 + </table_properties>
  3978 + </table>
  3979 + <table>
  3980 + <id>14</id>
  3981 + <height>170</height>
  3982 + <width>292</width>
  3983 + <font_name>Ubuntu</font_name>
  3984 + <font_size>9</font_size>
  3985 + <x>350</x>
  3986 + <y>539</y>
  3987 + <color>
  3988 + <r>160</r>
  3989 + <g>32</g>
  3990 + <b>240</b>
  3991 + </color>
  3992 + <connections>
  3993 + <relation>
  3994 + <id>12</id>
  3995 + <source>10</source>
  3996 + <target>14</target>
  3997 + <child_cardinality>1..n</child_cardinality>
  3998 + <parent_cardinality>1</parent_cardinality>
  3999 + <reference_for_pk>true</reference_for_pk>
  4000 + <name></name>
  4001 + <on_delete_action>RESTRICT</on_delete_action>
  4002 + <on_update_action>RESTRICT</on_update_action>
  4003 + <source_xp>-1</source_xp>
  4004 + <source_yp>-1</source_yp>
  4005 + <target_xp>-1</target_xp>
  4006 + <target_yp>-1</target_yp>
  4007 + <referenced_column>null</referenced_column>
  4008 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  4009 + </relation>
  4010 + </connections>
  4011 + <physical_name>i3geoestat_parametro_medida</physical_name>
  4012 + <logical_name>i3geoestat_parametro_medida</logical_name>
  4013 + <description></description>
  4014 + <constraint></constraint>
  4015 + <primary_key_name></primary_key_name>
  4016 + <option></option>
  4017 + <columns>
3974 4018 <normal_column>
3975   - <word_id>10</word_id>
3976   - <id>72</id>
  4019 + <word_id>35</word_id>
  4020 + <id>73</id>
3977 4021 <description></description>
3978 4022 <unique_key_name></unique_key_name>
3979 4023 <logical_name></logical_name>
3980 4024 <physical_name></physical_name>
3981   - <type>text</type>
  4025 + <type>integer</type>
3982 4026 <constraint></constraint>
3983 4027 <default_value></default_value>
3984   - <auto_increment>false</auto_increment>
  4028 + <auto_increment>true</auto_increment>
3985 4029 <foreign_key>false</foreign_key>
3986   - <not_null>false</not_null>
3987   - <primary_key>false</primary_key>
3988   - <unique_key>false</unique_key>
  4030 + <not_null>true</not_null>
  4031 + <primary_key>true</primary_key>
  4032 + <unique_key>true</unique_key>
3989 4033 <character_set></character_set>
3990 4034 <collation></collation>
3991 4035 <sequence>
... ... @@ -4004,8 +4048,8 @@
4004 4048 </sequence>
4005 4049 </normal_column>
4006 4050 <normal_column>
4007   - <word_id>17</word_id>
4008   - <id>73</id>
  4051 + <word_id>8</word_id>
  4052 + <id>74</id>
4009 4053 <description></description>
4010 4054 <unique_key_name></unique_key_name>
4011 4055 <logical_name></logical_name>
... ... @@ -4036,13 +4080,13 @@
4036 4080 </sequence>
4037 4081 </normal_column>
4038 4082 <normal_column>
4039   - <word_id>27</word_id>
4040   - <id>74</id>
  4083 + <word_id>43</word_id>
  4084 + <id>75</id>
4041 4085 <description></description>
4042 4086 <unique_key_name></unique_key_name>
4043 4087 <logical_name></logical_name>
4044 4088 <physical_name></physical_name>
4045   - <type>integer</type>
  4089 + <type>text</type>
4046 4090 <constraint></constraint>
4047 4091 <default_value></default_value>
4048 4092 <auto_increment>false</auto_increment>
... ... @@ -4068,8 +4112,8 @@
4068 4112 </sequence>
4069 4113 </normal_column>
4070 4114 <normal_column>
4071   - <word_id>14</word_id>
4072   - <id>75</id>
  4115 + <word_id>19</word_id>
  4116 + <id>76</id>
4073 4117 <description></description>
4074 4118 <unique_key_name></unique_key_name>
4075 4119 <logical_name></logical_name>
... ... @@ -4100,15 +4144,15 @@
4100 4144 </sequence>
4101 4145 </normal_column>
4102 4146 <normal_column>
4103   - <word_id>57</word_id>
4104   - <id>76</id>
  4147 + <word_id>34</word_id>
  4148 + <id>77</id>
4105 4149 <description></description>
4106 4150 <unique_key_name></unique_key_name>
4107 4151 <logical_name></logical_name>
4108 4152 <physical_name></physical_name>
4109   - <type>text</type>
  4153 + <type>integer</type>
4110 4154 <constraint></constraint>
4111   - <default_value>4326</default_value>
  4155 + <default_value>0</default_value>
4112 4156 <auto_increment>false</auto_increment>
4113 4157 <foreign_key>false</foreign_key>
4114 4158 <not_null>false</not_null>
... ... @@ -4132,17 +4176,18 @@
4132 4176 </sequence>
4133 4177 </normal_column>
4134 4178 <normal_column>
4135   - <word_id>9</word_id>
4136   - <id>77</id>
  4179 + <id>78</id>
  4180 + <referenced_column>39</referenced_column>
  4181 + <relation>12</relation>
4137 4182 <description></description>
4138 4183 <unique_key_name></unique_key_name>
4139 4184 <logical_name></logical_name>
4140 4185 <physical_name></physical_name>
4141   - <type>text</type>
  4186 + <type>integer</type>
4142 4187 <constraint></constraint>
4143 4188 <default_value></default_value>
4144 4189 <auto_increment>false</auto_increment>
4145   - <foreign_key>false</foreign_key>
  4190 + <foreign_key>true</foreign_key>
4146 4191 <not_null>false</not_null>
4147 4192 <primary_key>false</primary_key>
4148 4193 <unique_key>false</unique_key>
... ... @@ -4164,15 +4209,15 @@
4164 4209 </sequence>
4165 4210 </normal_column>
4166 4211 <normal_column>
4167   - <word_id>15</word_id>
4168   - <id>78</id>
  4212 + <word_id>61</word_id>
  4213 + <id>79</id>
4169 4214 <description></description>
4170 4215 <unique_key_name></unique_key_name>
4171 4216 <logical_name></logical_name>
4172 4217 <physical_name></physical_name>
4173   - <type>text</type>
  4218 + <type>integer</type>
4174 4219 <constraint></constraint>
4175   - <default_value></default_value>
  4220 + <default_value>0</default_value>
4176 4221 <auto_increment>false</auto_increment>
4177 4222 <foreign_key>false</foreign_key>
4178 4223 <not_null>false</not_null>
... ... @@ -4212,57 +4257,57 @@
4212 4257 <name>metaestat_basededados</name>
4213 4258 <export_order>0</export_order>
4214 4259 <table_test_data>
4215   - <table_id>11</table_id>
  4260 + <table_id>9</table_id>
4216 4261 <direct_test_data>
4217 4262 <data>
4218 4263 <column_data>
4219   - <column_id>43</column_id>
  4264 + <column_id>33</column_id>
4220 4265 <value>1</value>
4221 4266 </column_data>
4222 4267 <column_data>
4223   - <column_id>44</column_id>
  4268 + <column_id>34</column_id>
4224 4269 <value>geosaude</value>
4225 4270 </column_data>
4226 4271 <column_data>
4227   - <column_id>45</column_id>
  4272 + <column_id>35</column_id>
4228 4273 <value>localhost</value>
4229 4274 </column_data>
4230 4275 <column_data>
4231   - <column_id>46</column_id>
  4276 + <column_id>36</column_id>
4232 4277 <value>5432</value>
4233 4278 </column_data>
4234 4279 <column_data>
4235   - <column_id>47</column_id>
  4280 + <column_id>37</column_id>
4236 4281 <value>postgres</value>
4237 4282 </column_data>
4238 4283 <column_data>
4239   - <column_id>48</column_id>
  4284 + <column_id>38</column_id>
4240 4285 <value>postgres</value>
4241 4286 </column_data>
4242 4287 </data>
4243 4288 <data>
4244 4289 <column_data>
4245   - <column_id>43</column_id>
  4290 + <column_id>33</column_id>
4246 4291 <value>0</value>
4247 4292 </column_data>
4248 4293 <column_data>
4249   - <column_id>44</column_id>
  4294 + <column_id>34</column_id>
4250 4295 <value>i3geo_metaestat</value>
4251 4296 </column_data>
4252 4297 <column_data>
4253   - <column_id>45</column_id>
  4298 + <column_id>35</column_id>
4254 4299 <value>localhost</value>
4255 4300 </column_data>
4256 4301 <column_data>
4257   - <column_id>46</column_id>
  4302 + <column_id>36</column_id>
4258 4303 <value>5432</value>
4259 4304 </column_data>
4260 4305 <column_data>
4261   - <column_id>47</column_id>
  4306 + <column_id>37</column_id>
4262 4307 <value>postgres</value>
4263 4308 </column_data>
4264 4309 <column_data>
4265   - <column_id>48</column_id>
  4310 + <column_id>38</column_id>
4266 4311 <value>postgres</value>
4267 4312 </column_data>
4268 4313 </data>
... ... @@ -4271,7 +4316,7 @@
4271 4316 <test_data_num>0</test_data_num>
4272 4317 <data_def_list>
4273 4318 <data_def>
4274   - <column_id>43</column_id>
  4319 + <column_id>33</column_id>
4275 4320 <type>Format</type>
4276 4321 <repeat_num>1</repeat_num>
4277 4322 <template>%</template>
... ... @@ -4286,7 +4331,7 @@
4286 4331 </modified_values>
4287 4332 </data_def>
4288 4333 <data_def>
4289   - <column_id>44</column_id>
  4334 + <column_id>34</column_id>
4290 4335 <type>Format</type>
4291 4336 <repeat_num>1</repeat_num>
4292 4337 <template>database%</template>
... ... @@ -4301,7 +4346,7 @@
4301 4346 </modified_values>
4302 4347 </data_def>
4303 4348 <data_def>
4304   - <column_id>45</column_id>
  4349 + <column_id>35</column_id>
4305 4350 <type>Format</type>
4306 4351 <repeat_num>1</repeat_num>
4307 4352 <template>host%</template>
... ... @@ -4316,7 +4361,7 @@
4316 4361 </modified_values>
4317 4362 </data_def>
4318 4363 <data_def>
4319   - <column_id>46</column_id>
  4364 + <column_id>36</column_id>
4320 4365 <type>Format</type>
4321 4366 <repeat_num>1</repeat_num>
4322 4367 <template>porta%</template>
... ... @@ -4331,7 +4376,7 @@
4331 4376 </modified_values>
4332 4377 </data_def>
4333 4378 <data_def>
4334   - <column_id>47</column_id>
  4379 + <column_id>37</column_id>
4335 4380 <type>Format</type>
4336 4381 <repeat_num>1</repeat_num>
4337 4382 <template>usuario%</template>
... ... @@ -4346,7 +4391,7 @@
4346 4391 </modified_values>
4347 4392 </data_def>
4348 4393 <data_def>
4349   - <column_id>48</column_id>
  4394 + <column_id>38</column_id>
4350 4395 <type>Format</type>
4351 4396 <repeat_num>1</repeat_num>
4352 4397 <template>senha%</template>
... ... @@ -4475,167 +4520,167 @@
4475 4520 </repeat_test_data>
4476 4521 </table_test_data>
4477 4522 <table_test_data>
4478   - <table_id>14</table_id>
  4523 + <table_id>12</table_id>
4479 4524 <direct_test_data>
4480 4525 <data>
4481 4526 <column_data>
4482   - <column_id>66</column_id>
  4527 + <column_id>56</column_id>
4483 4528 <value>2</value>
4484 4529 </column_data>
4485 4530 <column_data>
4486   - <column_id>67</column_id>
  4531 + <column_id>57</column_id>
4487 4532 <value>Município</value>
4488 4533 </column_data>
4489 4534 <column_data>
4490   - <column_id>68</column_id>
  4535 + <column_id>58</column_id>
4491 4536 <value>Limites municipais</value>
4492 4537 </column_data>
4493 4538 <column_data>
4494   - <column_id>69</column_id>
  4539 + <column_id>59</column_id>
4495 4540 <value>1</value>
4496 4541 </column_data>
4497 4542 <column_data>
4498   - <column_id>70</column_id>
  4543 + <column_id>60</column_id>
4499 4544 <value>i3geo_metaestat</value>
4500 4545 </column_data>
4501 4546 <column_data>
4502   - <column_id>71</column_id>
  4547 + <column_id>61</column_id>
4503 4548 <value>municipios</value>
4504 4549 </column_data>
4505 4550 <column_data>
4506   - <column_id>72</column_id>
  4551 + <column_id>62</column_id>
4507 4552 <value>the_geom</value>
4508 4553 </column_data>
4509 4554 <column_data>
4510   - <column_id>73</column_id>
  4555 + <column_id>63</column_id>
4511 4556 <value>2010</value>
4512 4557 </column_data>
4513 4558 <column_data>
4514   - <column_id>74</column_id>
  4559 + <column_id>64</column_id>
4515 4560 <value>co_municipio</value>
4516 4561 </column_data>
4517 4562 <column_data>
4518   - <column_id>75</column_id>
  4563 + <column_id>65</column_id>
4519 4564 <value>no_cidade</value>
4520 4565 </column_data>
4521 4566 <column_data>
4522   - <column_id>76</column_id>
  4567 + <column_id>66</column_id>
4523 4568 <value>4326</value>
4524 4569 </column_data>
4525 4570 <column_data>
4526   - <column_id>77</column_id>
  4571 + <column_id>67</column_id>
4527 4572 <value>the_geom2</value>
4528 4573 </column_data>
4529 4574 <column_data>
4530   - <column_id>78</column_id>
  4575 + <column_id>68</column_id>
4531 4576 <value>co_municipio,no_cidade,co_uf,area_territorial,nu_ano_instalacao</value>
4532 4577 </column_data>
4533 4578 </data>
4534 4579 <data>
4535 4580 <column_data>
4536   - <column_id>66</column_id>
  4581 + <column_id>56</column_id>
4537 4582 <value>3</value>
4538 4583 </column_data>
4539 4584 <column_data>
4540   - <column_id>67</column_id>
  4585 + <column_id>57</column_id>
4541 4586 <value>Estado</value>
4542 4587 </column_data>
4543 4588 <column_data>
4544   - <column_id>68</column_id>
  4589 + <column_id>58</column_id>
4545 4590 <value>Limites estaduais</value>
4546 4591 </column_data>
4547 4592 <column_data>
4548   - <column_id>69</column_id>
  4593 + <column_id>59</column_id>
4549 4594 <value>1</value>
4550 4595 </column_data>
4551 4596 <column_data>
4552   - <column_id>70</column_id>
  4597 + <column_id>60</column_id>
4553 4598 <value>i3geo_metaestat</value>
4554 4599 </column_data>
4555 4600 <column_data>
4556   - <column_id>71</column_id>
  4601 + <column_id>61</column_id>
4557 4602 <value>uf</value>
4558 4603 </column_data>
4559 4604 <column_data>
4560   - <column_id>72</column_id>
  4605 + <column_id>62</column_id>
4561 4606 <value>the_geom</value>
4562 4607 </column_data>
4563 4608 <column_data>
4564   - <column_id>73</column_id>
  4609 + <column_id>63</column_id>
4565 4610 <value>2010</value>
4566 4611 </column_data>
4567 4612 <column_data>
4568   - <column_id>74</column_id>
  4613 + <column_id>64</column_id>
4569 4614 <value>co_uf</value>
4570 4615 </column_data>
4571 4616 <column_data>
4572   - <column_id>75</column_id>
  4617 + <column_id>65</column_id>
4573 4618 <value>no_uf</value>
4574 4619 </column_data>
4575 4620 <column_data>
4576   - <column_id>76</column_id>
  4621 + <column_id>66</column_id>
4577 4622 <value>4326</value>
4578 4623 </column_data>
4579 4624 <column_data>
4580   - <column_id>77</column_id>
  4625 + <column_id>67</column_id>
4581 4626 <value>the_geom</value>
4582 4627 </column_data>
4583 4628 <column_data>
4584   - <column_id>78</column_id>
  4629 + <column_id>68</column_id>
4585 4630 <value>co_uf,sg_uf,no_uf,no_regiao</value>
4586 4631 </column_data>
4587 4632 </data>
4588 4633 <data>
4589 4634 <column_data>
4590   - <column_id>66</column_id>
  4635 + <column_id>56</column_id>
4591 4636 <value>1</value>
4592 4637 </column_data>
4593 4638 <column_data>
4594   - <column_id>67</column_id>
  4639 + <column_id>57</column_id>
4595 4640 <value>Bairro</value>
4596 4641 </column_data>
4597 4642 <column_data>
4598   - <column_id>68</column_id>
  4643 + <column_id>58</column_id>
4599 4644 <value>Limites de bairros</value>
4600 4645 </column_data>
4601 4646 <column_data>
4602   - <column_id>69</column_id>
  4647 + <column_id>59</column_id>
4603 4648 <value>1</value>
4604 4649 </column_data>
4605 4650 <column_data>
4606   - <column_id>70</column_id>
  4651 + <column_id>60</column_id>
4607 4652 <value>i3geo_metaestat</value>
4608 4653 </column_data>
4609 4654 <column_data>
4610   - <column_id>71</column_id>
  4655 + <column_id>61</column_id>
4611 4656 <value>bairros</value>
4612 4657 </column_data>
4613 4658 <column_data>
4614   - <column_id>72</column_id>
  4659 + <column_id>62</column_id>
4615 4660 <value>the_geom</value>
4616 4661 </column_data>
4617 4662 <column_data>
4618   - <column_id>73</column_id>
  4663 + <column_id>63</column_id>
4619 4664 <value>2010</value>
4620 4665 </column_data>
4621 4666 <column_data>
4622   - <column_id>74</column_id>
  4667 + <column_id>64</column_id>
4623 4668 <value>co_bairro</value>
4624 4669 </column_data>
4625 4670 <column_data>
4626   - <column_id>75</column_id>
  4671 + <column_id>65</column_id>
4627 4672 <value>no_bairro</value>
4628 4673 </column_data>
4629 4674 <column_data>
4630   - <column_id>76</column_id>
  4675 + <column_id>66</column_id>
4631 4676 <value>4326</value>
4632 4677 </column_data>
4633 4678 <column_data>
4634   - <column_id>77</column_id>
  4679 + <column_id>67</column_id>
4635 4680 <value>the_geom</value>
4636 4681 </column_data>
4637 4682 <column_data>
4638   - <column_id>78</column_id>
  4683 + <column_id>68</column_id>
4639 4684 <value>co_bairro,no_bairro,no_distr,no_municip</value>
4640 4685 </column_data>
4641 4686 </data>
... ... @@ -4644,7 +4689,7 @@
4644 4689 <test_data_num>0</test_data_num>
4645 4690 <data_def_list>
4646 4691 <data_def>
4647   - <column_id>66</column_id>
  4692 + <column_id>56</column_id>
4648 4693 <type>Format</type>
4649 4694 <repeat_num>1</repeat_num>
4650 4695 <template>%</template>
... ... @@ -4659,7 +4704,7 @@
4659 4704 </modified_values>
4660 4705 </data_def>
4661 4706 <data_def>
4662   - <column_id>67</column_id>
  4707 + <column_id>57</column_id>
4663 4708 <type>Format</type>
4664 4709 <repeat_num>1</repeat_num>
4665 4710 <template>nome_tipo_regiao%</template>
... ... @@ -4674,7 +4719,7 @@
4674 4719 </modified_values>
4675 4720 </data_def>
4676 4721 <data_def>
4677   - <column_id>68</column_id>
  4722 + <column_id>58</column_id>
4678 4723 <type>Format</type>
4679 4724 <repeat_num>1</repeat_num>
4680 4725 <template>descricao_tipo_regiao%</template>
... ... @@ -4689,7 +4734,7 @@
4689 4734 </modified_values>
4690 4735 </data_def>
4691 4736 <data_def>
4692   - <column_id>69</column_id>
  4737 + <column_id>59</column_id>
4693 4738 <type>Foreign Key</type>
4694 4739 <repeat_num>1</repeat_num>
4695 4740 <template>%</template>
... ... @@ -4704,7 +4749,7 @@
4704 4749 </modified_values>
4705 4750 </data_def>
4706 4751 <data_def>
4707   - <column_id>70</column_id>
  4752 + <column_id>60</column_id>
4708 4753 <type>Format</type>
4709 4754 <repeat_num>1</repeat_num>
4710 4755 <template>esquemadb%</template>
... ... @@ -4719,7 +4764,7 @@
4719 4764 </modified_values>
4720 4765 </data_def>
4721 4766 <data_def>
4722   - <column_id>71</column_id>
  4767 + <column_id>61</column_id>
4723 4768 <type>Format</type>
4724 4769 <repeat_num>1</repeat_num>
4725 4770 <template>tabela%</template>
... ... @@ -4734,7 +4779,7 @@
4734 4779 </modified_values>
4735 4780 </data_def>
4736 4781 <data_def>
4737   - <column_id>72</column_id>
  4782 + <column_id>62</column_id>
4738 4783 <type>Format</type>
4739 4784 <repeat_num>1</repeat_num>
4740 4785 <template>colunageo%</template>
... ... @@ -4749,7 +4794,7 @@
4749 4794 </modified_values>
4750 4795 </data_def>
4751 4796 <data_def>
4752   - <column_id>73</column_id>
  4797 + <column_id>63</column_id>
4753 4798 <type>Format</type>
4754 4799 <repeat_num>1</repeat_num>
4755 4800 <template>data%</template>
... ... @@ -4764,7 +4809,7 @@
4764 4809 </modified_values>
4765 4810 </data_def>
4766 4811 <data_def>
4767   - <column_id>74</column_id>
  4812 + <column_id>64</column_id>
4768 4813 <type>Format</type>
4769 4814 <repeat_num>1</repeat_num>
4770 4815 <template>%</template>
... ... @@ -4779,7 +4824,7 @@
4779 4824 </modified_values>
4780 4825 </data_def>
4781 4826 <data_def>
4782   - <column_id>75</column_id>
  4827 + <column_id>65</column_id>
4783 4828 <type>Format</type>
4784 4829 <repeat_num>1</repeat_num>
4785 4830 <template>colunanomeregiao%</template>
... ... @@ -4794,7 +4839,7 @@
4794 4839 </modified_values>
4795 4840 </data_def>
4796 4841 <data_def>
4797   - <column_id>76</column_id>
  4842 + <column_id>66</column_id>
4798 4843 <type>Format</type>
4799 4844 <repeat_num>1</repeat_num>
4800 4845 <template>srid%</template>
... ... @@ -4809,7 +4854,7 @@
4809 4854 </modified_values>
4810 4855 </data_def>
4811 4856 <data_def>
4812   - <column_id>77</column_id>
  4857 + <column_id>67</column_id>
4813 4858 <type>Format</type>
4814 4859 <repeat_num>1</repeat_num>
4815 4860 <template>colunacentroide%</template>
... ... @@ -4824,7 +4869,7 @@
4824 4869 </modified_values>
4825 4870 </data_def>
4826 4871 <data_def>
4827   - <column_id>78</column_id>
  4872 + <column_id>68</column_id>
4828 4873 <type>Format</type>
4829 4874 <repeat_num>1</repeat_num>
4830 4875 <template>colunasvisiveis%</template>
... ... @@ -4949,59 +4994,59 @@
4949 4994 </repeat_test_data>
4950 4995 </table_test_data>
4951 4996 <table_test_data>
4952   - <table_id>12</table_id>
  4997 + <table_id>10</table_id>
4953 4998 <direct_test_data>
4954 4999 <data>
4955 5000 <column_data>
4956   - <column_id>49</column_id>
  5001 + <column_id>39</column_id>
4957 5002 <value>1</value>
4958 5003 </column_data>
4959 5004 <column_data>
4960   - <column_id>50</column_id>
  5005 + <column_id>40</column_id>
4961 5006 <value>1</value>
4962 5007 </column_data>
4963 5008 <column_data>
4964   - <column_id>51</column_id>
  5009 + <column_id>41</column_id>
4965 5010 <value>2</value>
4966 5011 </column_data>
4967 5012 <column_data>
4968   - <column_id>52</column_id>
  5013 + <column_id>42</column_id>
4969 5014 <value>1</value>
4970 5015 </column_data>
4971 5016 <column_data>
4972   - <column_id>53</column_id>
  5017 + <column_id>43</column_id>
4973 5018 <value>2</value>
4974 5019 </column_data>
4975 5020 <column_data>
4976   - <column_id>54</column_id>
  5021 + <column_id>44</column_id>
4977 5022 <value>1</value>
4978 5023 </column_data>
4979 5024 <column_data>
4980   - <column_id>55</column_id>
  5025 + <column_id>45</column_id>
4981 5026 <value>dbdemografia</value>
4982 5027 </column_data>
4983 5028 <column_data>
4984   - <column_id>56</column_id>
  5029 + <column_id>46</column_id>
4985 5030 <value>tb_demografia</value>
4986 5031 </column_data>
4987 5032 <column_data>
4988   - <column_id>57</column_id>
  5033 + <column_id>47</column_id>
4989 5034 <value>nu_populacao</value>
4990 5035 </column_data>
4991 5036 <column_data>
4992   - <column_id>58</column_id>
  5037 + <column_id>48</column_id>
4993 5038 <value>co_ibge</value>
4994 5039 </column_data>
4995 5040 <column_data>
4996   - <column_id>59</column_id>
  5041 + <column_id>49</column_id>
4997 5042 <value></value>
4998 5043 </column_data>
4999 5044 <column_data>
5000   - <column_id>60</column_id>
  5045 + <column_id>50</column_id>
5001 5046 <value>População residente</value>
5002 5047 </column_data>
5003 5048 <column_data>
5004   - <column_id>61</column_id>
  5049 + <column_id>51</column_id>
5005 5050 <value></value>
5006 5051 </column_data>
5007 5052 </data>
... ... @@ -5010,7 +5055,7 @@
5010 5055 <test_data_num>0</test_data_num>
5011 5056 <data_def_list>
5012 5057 <data_def>
5013   - <column_id>49</column_id>
  5058 + <column_id>39</column_id>
5014 5059 <type>Format</type>
5015 5060 <repeat_num>1</repeat_num>
5016 5061 <template>%</template>
... ... @@ -5025,7 +5070,7 @@
5025 5070 </modified_values>
5026 5071 </data_def>
5027 5072 <data_def>
5028   - <column_id>50</column_id>
  5073 + <column_id>40</column_id>
5029 5074 <type>Foreign Key</type>
5030 5075 <repeat_num>1</repeat_num>
5031 5076 <template>%</template>
... ... @@ -5040,7 +5085,7 @@
5040 5085 </modified_values>
5041 5086 </data_def>
5042 5087 <data_def>
5043   - <column_id>51</column_id>
  5088 + <column_id>41</column_id>
5044 5089 <type>Foreign Key</type>
5045 5090 <repeat_num>1</repeat_num>
5046 5091 <template>%</template>
... ... @@ -5055,7 +5100,7 @@
5055 5100 </modified_values>
5056 5101 </data_def>
5057 5102 <data_def>
5058   - <column_id>52</column_id>
  5103 + <column_id>42</column_id>
5059 5104 <type>Foreign Key</type>
5060 5105 <repeat_num>1</repeat_num>
5061 5106 <template>%</template>
... ... @@ -5070,7 +5115,7 @@
5070 5115 </modified_values>
5071 5116 </data_def>
5072 5117 <data_def>
5073   - <column_id>53</column_id>
  5118 + <column_id>43</column_id>
5074 5119 <type>Foreign Key</type>
5075 5120 <repeat_num>1</repeat_num>
5076 5121 <template>%</template>
... ... @@ -5085,7 +5130,7 @@
5085 5130 </modified_values>
5086 5131 </data_def>
5087 5132 <data_def>
5088   - <column_id>54</column_id>
  5133 + <column_id>44</column_id>
5089 5134 <type>Foreign Key</type>
5090 5135 <repeat_num>1</repeat_num>
5091 5136 <template>%</template>
... ... @@ -5100,7 +5145,7 @@
5100 5145 </modified_values>
5101 5146 </data_def>
5102 5147 <data_def>
5103   - <column_id>55</column_id>
  5148 + <column_id>45</column_id>
5104 5149 <type>Format</type>
5105 5150 <repeat_num>1</repeat_num>
5106 5151 <template>esquemadb%</template>
... ... @@ -5115,7 +5160,7 @@
5115 5160 </modified_values>
5116 5161 </data_def>
5117 5162 <data_def>
5118   - <column_id>56</column_id>
  5163 + <column_id>46</column_id>
5119 5164 <type>Format</type>
5120 5165 <repeat_num>1</repeat_num>
5121 5166 <template>tabela%</template>
... ... @@ -5130,7 +5175,7 @@
5130 5175 </modified_values>
5131 5176 </data_def>
5132 5177 <data_def>
5133   - <column_id>57</column_id>
  5178 + <column_id>47</column_id>
5134 5179 <type>Format</type>
5135 5180 <repeat_num>1</repeat_num>
5136 5181 <template>colunavalor%</template>
... ... @@ -5145,7 +5190,7 @@
5145 5190 </modified_values>
5146 5191 </data_def>
5147 5192 <data_def>
5148   - <column_id>58</column_id>
  5193 + <column_id>48</column_id>
5149 5194 <type>Format</type>
5150 5195 <repeat_num>1</repeat_num>
5151 5196 <template>colunaidgeo_%</template>
... ... @@ -5160,7 +5205,7 @@
5160 5205 </modified_values>
5161 5206 </data_def>
5162 5207 <data_def>
5163   - <column_id>59</column_id>
  5208 + <column_id>49</column_id>
5164 5209 <type>Format</type>
5165 5210 <repeat_num>1</repeat_num>
5166 5211 <template>filtro%</template>
... ... @@ -5175,7 +5220,7 @@
5175 5220 </modified_values>
5176 5221 </data_def>
5177 5222 <data_def>
5178   - <column_id>60</column_id>
  5223 + <column_id>50</column_id>
5179 5224 <type>Format</type>
5180 5225 <repeat_num>1</repeat_num>
5181 5226 <template>nomemedida_%</template>
... ... @@ -5190,7 +5235,7 @@
5190 5235 </modified_values>
5191 5236 </data_def>
5192 5237 <data_def>
5193   - <column_id>61</column_id>
  5238 + <column_id>51</column_id>
5194 5239 <type>Format</type>
5195 5240 <repeat_num>1</repeat_num>
5196 5241 <template>colunaidunico%</template>
... ... @@ -5208,31 +5253,35 @@
5208 5253 </repeat_test_data>
5209 5254 </table_test_data>
5210 5255 <table_test_data>
5211   - <table_id>10</table_id>
  5256 + <table_id>14</table_id>
5212 5257 <direct_test_data>
5213 5258 <data>
5214 5259 <column_data>
5215   - <column_id>37</column_id>
  5260 + <column_id>73</column_id>
5216 5261 <value>1</value>
5217 5262 </column_data>
5218 5263 <column_data>
5219   - <column_id>38</column_id>
  5264 + <column_id>74</column_id>
5220 5265 <value>nu_ano</value>
5221 5266 </column_data>
5222 5267 <column_data>
5223   - <column_id>39</column_id>
  5268 + <column_id>75</column_id>
5224 5269 <value>ano</value>
5225 5270 </column_data>
5226 5271 <column_data>
5227   - <column_id>40</column_id>
  5272 + <column_id>76</column_id>
5228 5273 <value></value>
5229 5274 </column_data>
5230 5275 <column_data>
5231   - <column_id>41</column_id>
  5276 + <column_id>77</column_id>
5232 5277 <value>0</value>
5233 5278 </column_data>
5234 5279 <column_data>
5235   - <column_id>42</column_id>
  5280 + <column_id>78</column_id>
  5281 + <value>1</value>
  5282 + </column_data>
  5283 + <column_data>
  5284 + <column_id>79</column_id>
5236 5285 <value>1</value>
5237 5286 </column_data>
5238 5287 </data>
... ... @@ -5241,7 +5290,7 @@
5241 5290 <test_data_num>0</test_data_num>
5242 5291 <data_def_list>
5243 5292 <data_def>
5244   - <column_id>37</column_id>
  5293 + <column_id>73</column_id>
5245 5294 <type>Format</type>
5246 5295 <repeat_num>1</repeat_num>
5247 5296 <template>%</template>
... ... @@ -5256,7 +5305,7 @@
5256 5305 </modified_values>
5257 5306 </data_def>
5258 5307 <data_def>
5259   - <column_id>38</column_id>
  5308 + <column_id>74</column_id>
5260 5309 <type>Format</type>
5261 5310 <repeat_num>1</repeat_num>
5262 5311 <template>coluna%</template>
... ... @@ -5271,7 +5320,7 @@
5271 5320 </modified_values>
5272 5321 </data_def>
5273 5322 <data_def>
5274   - <column_id>39</column_id>
  5323 + <column_id>75</column_id>
5275 5324 <type>Format</type>
5276 5325 <repeat_num>1</repeat_num>
5277 5326 <template>nomedimensao%</template>
... ... @@ -5286,7 +5335,7 @@
5286 5335 </modified_values>
5287 5336 </data_def>
5288 5337 <data_def>
5289   - <column_id>40</column_id>
  5338 + <column_id>76</column_id>
5290 5339 <type>Format</type>
5291 5340 <repeat_num>1</repeat_num>
5292 5341 <template>descricao%</template>
... ... @@ -5301,7 +5350,7 @@
5301 5350 </modified_values>
5302 5351 </data_def>
5303 5352 <data_def>
5304   - <column_id>41</column_id>
  5353 + <column_id>77</column_id>
5305 5354 <type>Format</type>
5306 5355 <repeat_num>1</repeat_num>
5307 5356 <template>%</template>
... ... @@ -5316,7 +5365,7 @@
5316 5365 </modified_values>
5317 5366 </data_def>
5318 5367 <data_def>
5319   - <column_id>42</column_id>
  5368 + <column_id>78</column_id>
5320 5369 <type>Foreign Key</type>
5321 5370 <repeat_num>1</repeat_num>
5322 5371 <template>%</template>
... ... @@ -5330,6 +5379,21 @@
5330 5379 <modified_values>
5331 5380 </modified_values>
5332 5381 </data_def>
  5382 + <data_def>
  5383 + <column_id>79</column_id>
  5384 + <type>Format</type>
  5385 + <repeat_num>1</repeat_num>
  5386 + <template>%</template>
  5387 + <from>1</from>
  5388 + <to>100</to>
  5389 + <increment>1</increment>
  5390 + <select>1</select>
  5391 + <select>2</select>
  5392 + <select>3</select>
  5393 + <select>4</select>
  5394 + <modified_values>
  5395 + </modified_values>
  5396 + </data_def>
5333 5397 </data_def_list>
5334 5398 </repeat_test_data>
5335 5399 </table_test_data>
... ... @@ -5912,23 +5976,23 @@
5912 5976 </repeat_test_data>
5913 5977 </table_test_data>
5914 5978 <table_test_data>
5915   - <table_id>8</table_id>
  5979 + <table_id>13</table_id>
5916 5980 <direct_test_data>
5917 5981 <data>
5918 5982 <column_data>
5919   - <column_id>31</column_id>
  5983 + <column_id>69</column_id>
5920 5984 <value>http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095</value>
5921 5985 </column_data>
5922 5986 <column_data>
5923   - <column_id>32</column_id>
  5987 + <column_id>70</column_id>
5924 5988 <value>1</value>
5925 5989 </column_data>
5926 5990 <column_data>
5927   - <column_id>33</column_id>
  5991 + <column_id>71</column_id>
5928 5992 <value>Site das Fármacias Populares</value>
5929 5993 </column_data>
5930 5994 <column_data>
5931   - <column_id>34</column_id>
  5995 + <column_id>72</column_id>
5932 5996 <value>1</value>
5933 5997 </column_data>
5934 5998 </data>
... ... @@ -5937,7 +6001,7 @@
5937 6001 <test_data_num>0</test_data_num>
5938 6002 <data_def_list>
5939 6003 <data_def>
5940   - <column_id>31</column_id>
  6004 + <column_id>69</column_id>
5941 6005 <type>Format</type>
5942 6006 <repeat_num>1</repeat_num>
5943 6007 <template>link%</template>
... ... @@ -5952,7 +6016,7 @@
5952 6016 </modified_values>
5953 6017 </data_def>
5954 6018 <data_def>
5955   - <column_id>32</column_id>
  6019 + <column_id>70</column_id>
5956 6020 <type>Foreign Key</type>
5957 6021 <repeat_num>1</repeat_num>
5958 6022 <template>%</template>
... ... @@ -5967,7 +6031,7 @@
5967 6031 </modified_values>
5968 6032 </data_def>
5969 6033 <data_def>
5970   - <column_id>33</column_id>
  6034 + <column_id>71</column_id>
5971 6035 <type>Format</type>
5972 6036 <repeat_num>1</repeat_num>
5973 6037 <template>nome%</template>
... ... @@ -5982,7 +6046,7 @@
5982 6046 </modified_values>
5983 6047 </data_def>
5984 6048 <data_def>
5985   - <column_id>34</column_id>
  6049 + <column_id>72</column_id>
5986 6050 <type>Format</type>
5987 6051 <repeat_num>1</repeat_num>
5988 6052 <template>%</template>
... ... @@ -6000,15 +6064,15 @@
6000 6064 </repeat_test_data>
6001 6065 </table_test_data>
6002 6066 <table_test_data>
6003   - <table_id>9</table_id>
  6067 + <table_id>8</table_id>
6004 6068 <direct_test_data>
6005 6069 <data>
6006 6070 <column_data>
6007   - <column_id>35</column_id>
  6071 + <column_id>31</column_id>
6008 6072 <value>1</value>
6009 6073 </column_data>
6010 6074 <column_data>
6011   - <column_id>36</column_id>
  6075 + <column_id>32</column_id>
6012 6076 <value>1</value>
6013 6077 </column_data>
6014 6078 </data>
... ... @@ -6017,7 +6081,7 @@
6017 6081 <test_data_num>0</test_data_num>
6018 6082 <data_def_list>
6019 6083 <data_def>
6020   - <column_id>35</column_id>
  6084 + <column_id>31</column_id>
6021 6085 <type>Foreign Key</type>
6022 6086 <repeat_num>1</repeat_num>
6023 6087 <template>%</template>
... ... @@ -6032,7 +6096,7 @@
6032 6096 </modified_values>
6033 6097 </data_def>
6034 6098 <data_def>
6035   - <column_id>36</column_id>
  6099 + <column_id>32</column_id>
6036 6100 <type>Foreign Key</type>
6037 6101 <repeat_num>1</repeat_num>
6038 6102 <template>%</template>
... ... @@ -6119,41 +6183,41 @@
6119 6183 </repeat_test_data>
6120 6184 </table_test_data>
6121 6185 <table_test_data>
6122   - <table_id>13</table_id>
  6186 + <table_id>11</table_id>
6123 6187 <direct_test_data>
6124 6188 <data>
6125 6189 <column_data>
6126   - <column_id>62</column_id>
  6190 + <column_id>52</column_id>
6127 6191 <value>1</value>
6128 6192 </column_data>
6129 6193 <column_data>
6130   - <column_id>63</column_id>
  6194 + <column_id>53</column_id>
6131 6195 <value>1</value>
6132 6196 </column_data>
6133 6197 <column_data>
6134   - <column_id>64</column_id>
  6198 + <column_id>54</column_id>
6135 6199 <value>2</value>
6136 6200 </column_data>
6137 6201 <column_data>
6138   - <column_id>65</column_id>
  6202 + <column_id>55</column_id>
6139 6203 <value>co_municipio</value>
6140 6204 </column_data>
6141 6205 </data>
6142 6206 <data>
6143 6207 <column_data>
6144   - <column_id>62</column_id>
  6208 + <column_id>52</column_id>
6145 6209 <value>2</value>
6146 6210 </column_data>
6147 6211 <column_data>
6148   - <column_id>63</column_id>
  6212 + <column_id>53</column_id>
6149 6213 <value>2</value>
6150 6214 </column_data>
6151 6215 <column_data>
6152   - <column_id>64</column_id>
  6216 + <column_id>54</column_id>
6153 6217 <value>3</value>
6154 6218 </column_data>
6155 6219 <column_data>
6156   - <column_id>65</column_id>
  6220 + <column_id>55</column_id>
6157 6221 <value>co_uf</value>
6158 6222 </column_data>
6159 6223 </data>
... ... @@ -6162,7 +6226,7 @@
6162 6226 <test_data_num>0</test_data_num>
6163 6227 <data_def_list>
6164 6228 <data_def>
6165   - <column_id>62</column_id>
  6229 + <column_id>52</column_id>
6166 6230 <type>Format</type>
6167 6231 <repeat_num>1</repeat_num>
6168 6232 <template>%</template>
... ... @@ -6177,7 +6241,7 @@
6177 6241 </modified_values>
6178 6242 </data_def>
6179 6243 <data_def>
6180   - <column_id>63</column_id>
  6244 + <column_id>53</column_id>
6181 6245 <type>Foreign Key</type>
6182 6246 <repeat_num>1</repeat_num>
6183 6247 <template>%</template>
... ... @@ -6192,7 +6256,7 @@
6192 6256 </modified_values>
6193 6257 </data_def>
6194 6258 <data_def>
6195   - <column_id>64</column_id>
  6259 + <column_id>54</column_id>
6196 6260 <type>Format</type>
6197 6261 <repeat_num>1</repeat_num>
6198 6262 <template>%</template>
... ... @@ -6207,7 +6271,7 @@
6207 6271 </modified_values>
6208 6272 </data_def>
6209 6273 <data_def>
6210   - <column_id>65</column_id>
  6274 + <column_id>55</column_id>
6211 6275 <type>Format</type>
6212 6276 <repeat_num>1</repeat_num>
6213 6277 <template>colunaligacao_regiaopai%</template>
... ...
ferramentas/metaestat/index.js
  Diff comments   View file @a750af3
... ... @@ -124,6 +124,7 @@ i3GEOF.metaestat = {
124 124 ' <button title="Anima&ccedil;&atilde;o" onclick="i3GEOF.metaestat.analise.ativaAnimacao()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/player-forward.png" /></button>' +
125 125 ' <button title="Alterar legenda" onclick="i3GEOF.metaestat.analise.alteraLegenda()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/calculator.png" /></button>' +
126 126 ' <button title="Alterar cores" onclick="i3GEOF.metaestat.analise.alteraCores()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/24-to-8-bits.png" /></button>' +
  127 + ' <button title="Cortina" onclick="i3GEO.tema.dialogo.cortina()"><img src="'+i3GEO.configura.locaplic+'/imagens/gisicons/mapset.png" /></button>' +
127 128 '</div>' +
128 129 '<input type=hidden value="" id="listaColourRampAnaliseMetaestat" onchange="i3GEOF.metaestat.analise.aplicaColourRamp()" />'; //utilizado pelo seletor de colourramp
129 130 return ins;
... ...