Download as
Browse Code »

Commit a118714ba8793a00e02ab09dbffdbd53b1a80cd0

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

Alteração na base de dados de testes dos metadados estatísticos

Showing 6 changed files with 173 additions and 141 deletions   Show diff stats
admin/admin.db
View file @a118714
No preview for this file type
admin/sql/metaestat.sql
  Diff comments   View file @a118714
@@ -78,10 +78,10 @@ create table i3geoestat_agregaregiao @@ -78,10 +78,10 @@ create table i3geoestat_agregaregiao
78 ); 78 );
79 79
80 80
81 --- lista controlada de tipos de período de tempo  
82 -create table i3geoestat_tipo_periodo 81 +-- tabela com o nome e descrição de uma variável variável
  82 +create table i3geoestat_variavel
83 ( 83 (
84 - codigo_tipo_periodo integer not null unique primary key autoincrement, 84 + codigo_variavel integer not null unique primary key autoincrement,
85 nome text, 85 nome text,
86 descricao text 86 descricao text
87 ); 87 );
@@ -99,10 +99,10 @@ create table i3geoestat_unidade_medida @@ -99,10 +99,10 @@ create table i3geoestat_unidade_medida
99 ); 99 );
100 100
101 101
102 --- tabela com o nome e descrição de uma variável variável  
103 -create table i3geoestat_variavel 102 +-- lista controlada de tipos de período de tempo
  103 +create table i3geoestat_tipo_periodo
104 ( 104 (
105 - codigo_variavel integer not null unique primary key autoincrement, 105 + codigo_tipo_periodo integer not null unique primary key autoincrement,
106 nome text, 106 nome text,
107 descricao text 107 descricao text
108 ); 108 );
@@ -129,16 +129,16 @@ create table i3geoestat_medida_variavel @@ -129,16 +129,16 @@ create table i3geoestat_medida_variavel
129 filtro text, 129 filtro text,
130 -- titulo da medida 130 -- titulo da medida
131 nomemedida text, 131 nomemedida text,
132 - foreign key (codigo_tipo_periodo)  
133 - references i3geoestat_tipo_periodo (codigo_tipo_periodo),  
134 - foreign key (codigo_estat_conexao)  
135 - references i3geoestat_conexao (codigo_estat_conexao), 132 + foreign key (codigo_variavel)
  133 + references i3geoestat_variavel (codigo_variavel),
136 foreign key (codigo_unidade_medida) 134 foreign key (codigo_unidade_medida)
137 references i3geoestat_unidade_medida (codigo_unidade_medida), 135 references i3geoestat_unidade_medida (codigo_unidade_medida),
138 foreign key (codigo_tipo_regiao) 136 foreign key (codigo_tipo_regiao)
139 references i3geoestat_tipo_regiao (codigo_tipo_regiao), 137 references i3geoestat_tipo_regiao (codigo_tipo_regiao),
140 - foreign key (codigo_variavel)  
141 - references i3geoestat_variavel (codigo_variavel) 138 + foreign key (codigo_estat_conexao)
  139 + references i3geoestat_conexao (codigo_estat_conexao),
  140 + foreign key (codigo_tipo_periodo)
  141 + references i3geoestat_tipo_periodo (codigo_tipo_periodo)
142 ); 142 );
143 143
144 144
admin/sql/metaestat_basededados.sql
  Diff comments   View file @a118714
1 -- i3geoestat_conexao 1 -- i3geoestat_conexao
2 -INSERT INTO i3geoestat_conexao (codigo_estat_conexao, bancodedados, host, porta, usuario, senha) VALUES ('1', 'dbspo', 'localhost', '5432', 'postgres', 'postgres');  
3 -INSERT INTO i3geoestat_conexao (codigo_estat_conexao, bancodedados, host, porta, usuario, senha) VALUES ('0', 'default', '', '', '', ''); 2 +INSERT INTO i3geoestat_conexao (codigo_estat_conexao, bancodedados, host, porta, usuario, senha) VALUES ('1', 'geosaude', 'localhost', '5432', 'postgres', 'postgres');
  3 +INSERT INTO i3geoestat_conexao (codigo_estat_conexao, bancodedados, host, porta, usuario, senha) VALUES ('0', 'i3geo_metaestat', 'localhost', '5432', 'postgres', 'postgres');
4 4
5 5
6 -- i3geoestat_tipo_periodo 6 -- i3geoestat_tipo_periodo
7 INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUES ('1', 'Anual', ''); 7 INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUES ('1', 'Anual', '');
8 INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUES ('2', 'Mensal', ''); 8 INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUES ('2', 'Mensal', '');
  9 +INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUES ('3', 'Diário', '');
  10 +INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUES ('4', 'Horário', '');
9 11
10 12
11 -- i3geoestat_tipo_regiao 13 -- i3geoestat_tipo_regiao
12 -INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('1', 'Município', 'Limites municipais', '1', 'public', 'tb_ibge', 'the_geom', '', 'ibge', 'no_cidade', '4326', 'the_geom2');  
13 -INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('3', 'Estados', 'Limites estaduais', '1', 'public', 'tb_ibge_estados', 'the_geom', '', 'co_ibge_uf', 'no_uf', '4326', 'the_geom'); 14 +INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('2', 'Município', 'Limites municipais', '1', 'i3geo_metaestat', 'municipios', 'the_geom', '2010', 'co_municipio', 'no_cidade', '4326', 'the_geom2');
  15 +INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('3', 'Estado', 'Limites estaduais', '1', 'i3geo_metaestat', 'uf', 'the_geom', '2010', 'co_uf', 'no_uf', '4326', 'the_geom');
  16 +INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('1', 'Bairro', 'Limites de bairros', '1', 'i3geo_metaestat', 'bairros', 'the_geom', '2010', 'co_bairro', 'no_bairro', '4326', 'the_geom');
14 17
15 18
16 -- i3geoestat_unidade_medida 19 -- i3geoestat_unidade_medida
17 -INSERT INTO i3geoestat_unidade_medida (codigo_unidade_medida, nome, sigla, permitesoma, permitemedia) VALUES ('1', 'Unidade', 'Un', '1', '1'); 20 +INSERT INTO i3geoestat_unidade_medida (codigo_unidade_medida, nome, sigla, permitesoma, permitemedia) VALUES ('1', 'Quantidade', 'Un', '1', '1');
18 21
19 22
20 -- i3geoestat_medida_variavel 23 -- i3geoestat_medida_variavel
21 -INSERT INTO i3geoestat_medida_variavel (id_medida_variavel, codigo_unidade_medida, codigo_tipo_periodo, codigo_variavel, codigo_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunavalor, colunaidgeo, filtro, nomemedida) VALUES ('1', '1', '2', '1', '1', '1', 'dbacoes_saude', 'tb_farmacia_pop', 'nu_farm_funcionando', 'co_ibge', '', 'Número de farmácias em funcionamento por mês e ano'); 24 +INSERT INTO i3geoestat_medida_variavel (id_medida_variavel, codigo_unidade_medida, codigo_tipo_periodo, codigo_variavel, codigo_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunavalor, colunaidgeo, filtro, nomemedida) VALUES ('1', '1', '2', '1', '2', '1', 'dbdemografia', 'tb_demografia', 'nu_populacao', 'co_ibge', '', 'População residente');
22 25
23 26
24 -- i3geoestat_parametro_medida 27 -- i3geoestat_parametro_medida
25 -INSERT INTO i3geoestat_parametro_medida (id_parametro_medida, coluna, nome, descricao, id_pai, id_medida_variavel) VALUES ('1', 'mes_farm_pop', 'mês', '', '2', '1');  
26 -INSERT INTO i3geoestat_parametro_medida (id_parametro_medida, coluna, nome, descricao, id_pai, id_medida_variavel) VALUES ('2', 'ano_farm', 'ano', '', '0', '1'); 28 +INSERT INTO i3geoestat_parametro_medida (id_parametro_medida, coluna, nome, descricao, id_pai, id_medida_variavel) VALUES ('1', 'nu_ano', 'ano', '', '0', '1');
27 29
28 30
29 -- i3geoestat_variavel 31 -- i3geoestat_variavel
30 -INSERT INTO i3geoestat_variavel (codigo_variavel, nome, descricao) VALUES ('1', 'Farmácias populares existentes', 'Quantidade de farmácias populares existentes'); 32 +INSERT INTO i3geoestat_variavel (codigo_variavel, nome, descricao) VALUES ('1', 'População', 'Caracterização da população');
31 33
32 34
33 -- i3geoestat_classificacao 35 -- i3geoestat_classificacao
34 -INSERT INTO i3geoestat_classificacao (id_classificacao, nome, id_medida_variavel, observacao) VALUES ('1', 'Pela média', '1', ''); 36 +INSERT INTO i3geoestat_classificacao (id_classificacao, nome, id_medida_variavel, observacao) VALUES ('1', 'Intervalos aleatórios', '1', '');
35 37
36 38
37 -- i3geoestat_classes 39 -- i3geoestat_classes
38 -INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('1', '([nu_farm_funcionando] < 1)', 'Nenhuma', '255', '0', '0', '1', '', '', '0', '0', '0', '');  
39 -INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('2', '([nu_farm_funcionando] = 1)', 'Uma', '0', '255', '0', '1', '', '', '', '', '', '');  
40 -INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('3', '([nu_farm_funcionando] > 1)', 'Mais de uma', '0', '0', '255', '1', '', '', '', '', '', ''); 40 +INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('1', '([nu_populacao]<=6379.5)', '<= 6379.5', '255', '250', '250', '1', '', '', '', '', '', '');
  41 +INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('2', '(([nu_populacao]>6379.5)and([nu_populacao]<=12157))', '> 6379.5 e <= 12157', '255', '230', '230', '1', '', '', '', '', '', '');
  42 +INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('3', '(([nu_populacao]>12157)and([nu_populacao]<=22861.5))', '> 12157 e <= 22861.5', '255', '150', '150', '1', '', '', '', '', '', '');
  43 +INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, azul, id_classificacao, tamanho, simbolo, overmelho, overde, oazul, otamanho) VALUES ('4', '([nu_populacao]>22861.5)', '> 22861.5', '255', '0', '0', '1', '', '', '', '', '', '');
41 44
42 45
43 -- i3geoestat_medida_variavel_link 46 -- i3geoestat_medida_variavel_link
documentacao/diagramas/metaestat.erm
  Diff comments   View file @a118714
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 </connections> 110 </connections>
111 <display>false</display> 111 <display>false</display>
112 <creation_date>2012-07-17 15:03:53</creation_date> 112 <creation_date>2012-07-17 15:03:53</creation_date>
113 - <updated_date>2012-10-03 10:48:05</updated_date> 113 + <updated_date>2012-10-03 16:13:35</updated_date>
114 <model_property> 114 <model_property>
115 <name>Project Name</name> 115 <name>Project Name</name>
116 <value></value> 116 <value></value>
@@ -1068,7 +1068,7 @@ @@ -1068,7 +1068,7 @@
1068 </sequence> 1068 </sequence>
1069 </normal_column> 1069 </normal_column>
1070 <normal_column> 1070 <normal_column>
1071 - <word_id>40</word_id> 1071 + <word_id>37</word_id>
1072 <id>1</id> 1072 <id>1</id>
1073 <description></description> 1073 <description></description>
1074 <unique_key_name></unique_key_name> 1074 <unique_key_name></unique_key_name>
@@ -1259,7 +1259,7 @@ @@ -1259,7 +1259,7 @@
1259 </sequence> 1259 </sequence>
1260 </normal_column> 1260 </normal_column>
1261 <normal_column> 1261 <normal_column>
1262 - <word_id>37</word_id> 1262 + <word_id>36</word_id>
1263 <id>6</id> 1263 <id>6</id>
1264 <description></description> 1264 <description></description>
1265 <unique_key_name></unique_key_name> 1265 <unique_key_name></unique_key_name>
@@ -1291,7 +1291,7 @@ @@ -1291,7 +1291,7 @@
1291 </sequence> 1291 </sequence>
1292 </normal_column> 1292 </normal_column>
1293 <normal_column> 1293 <normal_column>
1294 - <word_id>17</word_id> 1294 + <word_id>16</word_id>
1295 <id>7</id> 1295 <id>7</id>
1296 <description></description> 1296 <description></description>
1297 <unique_key_name></unique_key_name> 1297 <unique_key_name></unique_key_name>
@@ -1386,7 +1386,7 @@ @@ -1386,7 +1386,7 @@
1386 </sequence> 1386 </sequence>
1387 </normal_column> 1387 </normal_column>
1388 <normal_column> 1388 <normal_column>
1389 - <word_id>41</word_id> 1389 + <word_id>38</word_id>
1390 <id>9</id> 1390 <id>9</id>
1391 <description></description> 1391 <description></description>
1392 <unique_key_name></unique_key_name> 1392 <unique_key_name></unique_key_name>
@@ -1418,7 +1418,7 @@ @@ -1418,7 +1418,7 @@
1418 </sequence> 1418 </sequence>
1419 </normal_column> 1419 </normal_column>
1420 <normal_column> 1420 <normal_column>
1421 - <word_id>18</word_id> 1421 + <word_id>17</word_id>
1422 <id>10</id> 1422 <id>10</id>
1423 <description></description> 1423 <description></description>
1424 <unique_key_name></unique_key_name> 1424 <unique_key_name></unique_key_name>
@@ -1530,7 +1530,7 @@ @@ -1530,7 +1530,7 @@
1530 </sequence> 1530 </sequence>
1531 </normal_column> 1531 </normal_column>
1532 <normal_column> 1532 <normal_column>
1533 - <word_id>36</word_id> 1533 + <word_id>40</word_id>
1534 <id>12</id> 1534 <id>12</id>
1535 <description></description> 1535 <description></description>
1536 <unique_key_name></unique_key_name> 1536 <unique_key_name></unique_key_name>
@@ -2243,7 +2243,7 @@ @@ -2243,7 +2243,7 @@
2243 <connections> 2243 <connections>
2244 <relation> 2244 <relation>
2245 <id>2</id> 2245 <id>2</id>
2246 - <source>3</source> 2246 + <source>4</source>
2247 <target>8</target> 2247 <target>8</target>
2248 <child_cardinality>1..n</child_cardinality> 2248 <child_cardinality>1..n</child_cardinality>
2249 <parent_cardinality>1</parent_cardinality> 2249 <parent_cardinality>1</parent_cardinality>
@@ -2260,7 +2260,7 @@ @@ -2260,7 +2260,7 @@
2260 </relation> 2260 </relation>
2261 <relation> 2261 <relation>
2262 <id>3</id> 2262 <id>3</id>
2263 - <source>14</source> 2263 + <source>2</source>
2264 <target>8</target> 2264 <target>8</target>
2265 <child_cardinality>1..n</child_cardinality> 2265 <child_cardinality>1..n</child_cardinality>
2266 <parent_cardinality>1</parent_cardinality> 2266 <parent_cardinality>1</parent_cardinality>
@@ -2277,7 +2277,7 @@ @@ -2277,7 +2277,7 @@
2277 </relation> 2277 </relation>
2278 <relation> 2278 <relation>
2279 <id>4</id> 2279 <id>4</id>
2280 - <source>2</source> 2280 + <source>12</source>
2281 <target>8</target> 2281 <target>8</target>
2282 <child_cardinality>1..n</child_cardinality> 2282 <child_cardinality>1..n</child_cardinality>
2283 <parent_cardinality>1</parent_cardinality> 2283 <parent_cardinality>1</parent_cardinality>
@@ -2294,7 +2294,7 @@ @@ -2294,7 +2294,7 @@
2294 </relation> 2294 </relation>
2295 <relation> 2295 <relation>
2296 <id>5</id> 2296 <id>5</id>
2297 - <source>12</source> 2297 + <source>14</source>
2298 <target>8</target> 2298 <target>8</target>
2299 <child_cardinality>1..n</child_cardinality> 2299 <child_cardinality>1..n</child_cardinality>
2300 <parent_cardinality>1</parent_cardinality> 2300 <parent_cardinality>1</parent_cardinality>
@@ -2311,7 +2311,7 @@ @@ -2311,7 +2311,7 @@
2311 </relation> 2311 </relation>
2312 <relation> 2312 <relation>
2313 <id>6</id> 2313 <id>6</id>
2314 - <source>4</source> 2314 + <source>3</source>
2315 <target>8</target> 2315 <target>8</target>
2316 <child_cardinality>1..n</child_cardinality> 2316 <child_cardinality>1..n</child_cardinality>
2317 <parent_cardinality>1</parent_cardinality> 2317 <parent_cardinality>1</parent_cardinality>
@@ -2369,7 +2369,7 @@ @@ -2369,7 +2369,7 @@
2369 <normal_column> 2369 <normal_column>
2370 <id>32</id> 2370 <id>32</id>
2371 <referenced_column>0</referenced_column> 2371 <referenced_column>0</referenced_column>
2372 - <relation>4</relation> 2372 + <relation>3</relation>
2373 <description></description> 2373 <description></description>
2374 <unique_key_name></unique_key_name> 2374 <unique_key_name></unique_key_name>
2375 <logical_name></logical_name> 2375 <logical_name></logical_name>
@@ -2402,7 +2402,7 @@ @@ -2402,7 +2402,7 @@
2402 <normal_column> 2402 <normal_column>
2403 <id>33</id> 2403 <id>33</id>
2404 <referenced_column>5</referenced_column> 2404 <referenced_column>5</referenced_column>
2405 - <relation>2</relation> 2405 + <relation>6</relation>
2406 <description></description> 2406 <description></description>
2407 <unique_key_name></unique_key_name> 2407 <unique_key_name></unique_key_name>
2408 <logical_name></logical_name> 2408 <logical_name></logical_name>
@@ -2435,7 +2435,7 @@ @@ -2435,7 +2435,7 @@
2435 <normal_column> 2435 <normal_column>
2436 <id>34</id> 2436 <id>34</id>
2437 <referenced_column>8</referenced_column> 2437 <referenced_column>8</referenced_column>
2438 - <relation>6</relation> 2438 + <relation>2</relation>
2439 <description></description> 2439 <description></description>
2440 <unique_key_name></unique_key_name> 2440 <unique_key_name></unique_key_name>
2441 <logical_name></logical_name> 2441 <logical_name></logical_name>
@@ -2468,7 +2468,7 @@ @@ -2468,7 +2468,7 @@
2468 <normal_column> 2468 <normal_column>
2469 <id>35</id> 2469 <id>35</id>
2470 <referenced_column>55</referenced_column> 2470 <referenced_column>55</referenced_column>
2471 - <relation>5</relation> 2471 + <relation>4</relation>
2472 <description></description> 2472 <description></description>
2473 <unique_key_name></unique_key_name> 2473 <unique_key_name></unique_key_name>
2474 <logical_name></logical_name> 2474 <logical_name></logical_name>
@@ -2501,7 +2501,7 @@ @@ -2501,7 +2501,7 @@
2501 <normal_column> 2501 <normal_column>
2502 <id>36</id> 2502 <id>36</id>
2503 <referenced_column>71</referenced_column> 2503 <referenced_column>71</referenced_column>
2504 - <relation>3</relation> 2504 + <relation>5</relation>
2505 <description></description> 2505 <description></description>
2506 <unique_key_name></unique_key_name> 2506 <unique_key_name></unique_key_name>
2507 <logical_name></logical_name> 2507 <logical_name></logical_name>
@@ -3144,7 +3144,7 @@ @@ -3144,7 +3144,7 @@
3144 </sequence> 3144 </sequence>
3145 </normal_column> 3145 </normal_column>
3146 <normal_column> 3146 <normal_column>
3147 - <word_id>38</word_id> 3147 + <word_id>41</word_id>
3148 <id>51</id> 3148 <id>51</id>
3149 <description></description> 3149 <description></description>
3150 <unique_key_name></unique_key_name> 3150 <unique_key_name></unique_key_name>
@@ -3176,7 +3176,7 @@ @@ -3176,7 +3176,7 @@
3176 </sequence> 3176 </sequence>
3177 </normal_column> 3177 </normal_column>
3178 <normal_column> 3178 <normal_column>
3179 - <word_id>16</word_id> 3179 + <word_id>18</word_id>
3180 <id>52</id> 3180 <id>52</id>
3181 <description></description> 3181 <description></description>
3182 <unique_key_name></unique_key_name> 3182 <unique_key_name></unique_key_name>
@@ -4406,7 +4406,7 @@ @@ -4406,7 +4406,7 @@
4406 </column_data> 4406 </column_data>
4407 <column_data> 4407 <column_data>
4408 <column_id>59</column_id> 4408 <column_id>59</column_id>
4409 - <value>i3geo_mestaestat</value> 4409 + <value>i3geo_metaestat</value>
4410 </column_data> 4410 </column_data>
4411 <column_data> 4411 <column_data>
4412 <column_id>60</column_id> 4412 <column_id>60</column_id>
@@ -4456,7 +4456,7 @@ @@ -4456,7 +4456,7 @@
4456 </column_data> 4456 </column_data>
4457 <column_data> 4457 <column_data>
4458 <column_id>59</column_id> 4458 <column_id>59</column_id>
4459 - <value>i3geo_mestaestat</value> 4459 + <value>i3geo_metaestat</value>
4460 </column_data> 4460 </column_data>
4461 <column_data> 4461 <column_data>
4462 <column_id>60</column_id> 4462 <column_id>60</column_id>
@@ -4506,7 +4506,7 @@ @@ -4506,7 +4506,7 @@
4506 </column_data> 4506 </column_data>
4507 <column_data> 4507 <column_data>
4508 <column_id>59</column_id> 4508 <column_id>59</column_id>
4509 - <value>i3geo_mestaestat</value> 4509 + <value>i3geo_metaestat</value>
4510 </column_data> 4510 </column_data>
4511 <column_data> 4511 <column_data>
4512 <column_id>60</column_id> 4512 <column_id>60</column_id>
@@ -4734,7 +4734,7 @@ @@ -4734,7 +4734,7 @@
4734 </column_data> 4734 </column_data>
4735 <column_data> 4735 <column_data>
4736 <column_id>1</column_id> 4736 <column_id>1</column_id>
4737 - <value>Unidade</value> 4737 + <value>Quantidade</value>
4738 </column_data> 4738 </column_data>
4739 <column_data> 4739 <column_data>
4740 <column_id>2</column_id> 4740 <column_id>2</column_id>
@@ -4853,7 +4853,7 @@ @@ -4853,7 +4853,7 @@
4853 </column_data> 4853 </column_data>
4854 <column_data> 4854 <column_data>
4855 <column_id>35</column_id> 4855 <column_id>35</column_id>
4856 - <value>1</value> 4856 + <value>2</value>
4857 </column_data> 4857 </column_data>
4858 <column_data> 4858 <column_data>
4859 <column_id>36</column_id> 4859 <column_id>36</column_id>
@@ -4861,15 +4861,15 @@ @@ -4861,15 +4861,15 @@
4861 </column_data> 4861 </column_data>
4862 <column_data> 4862 <column_data>
4863 <column_id>37</column_id> 4863 <column_id>37</column_id>
4864 - <value>dbacoes_saude</value> 4864 + <value>dbdemografia</value>
4865 </column_data> 4865 </column_data>
4866 <column_data> 4866 <column_data>
4867 <column_id>38</column_id> 4867 <column_id>38</column_id>
4868 - <value>tb_farmacia_pop</value> 4868 + <value>tb_demografia</value>
4869 </column_data> 4869 </column_data>
4870 <column_data> 4870 <column_data>
4871 <column_id>39</column_id> 4871 <column_id>39</column_id>
4872 - <value>nu_farm_funcionando</value> 4872 + <value>nu_populacao</value>
4873 </column_data> 4873 </column_data>
4874 <column_data> 4874 <column_data>
4875 <column_id>40</column_id> 4875 <column_id>40</column_id>
@@ -4881,7 +4881,7 @@ @@ -4881,7 +4881,7 @@
4881 </column_data> 4881 </column_data>
4882 <column_data> 4882 <column_data>
4883 <column_id>42</column_id> 4883 <column_id>42</column_id>
4884 - <value>Número de farmácias em funcionamento por mês e ano</value> 4884 + <value>População residente</value>
4885 </column_data> 4885 </column_data>
4886 </data> 4886 </data>
4887 </direct_test_data> 4887 </direct_test_data>
@@ -5081,33 +5081,7 @@ @@ -5081,33 +5081,7 @@
5081 </column_data> 5081 </column_data>
5082 <column_data> 5082 <column_data>
5083 <column_id>50</column_id> 5083 <column_id>50</column_id>
5084 - <value>mes_farm_pop</value>  
5085 - </column_data>  
5086 - <column_data>  
5087 - <column_id>51</column_id>  
5088 - <value>mês</value>  
5089 - </column_data>  
5090 - <column_data>  
5091 - <column_id>52</column_id>  
5092 - <value></value>  
5093 - </column_data>  
5094 - <column_data>  
5095 - <column_id>53</column_id>  
5096 - <value>2</value>  
5097 - </column_data>  
5098 - <column_data>  
5099 - <column_id>54</column_id>  
5100 - <value>1</value>  
5101 - </column_data>  
5102 - </data>  
5103 - <data>  
5104 - <column_data>  
5105 - <column_id>49</column_id>  
5106 - <value>2</value>  
5107 - </column_data>  
5108 - <column_data>  
5109 - <column_id>50</column_id>  
5110 - <value>ano_farm</value> 5084 + <value>nu_ano</value>
5111 </column_data> 5085 </column_data>
5112 <column_data> 5086 <column_data>
5113 <column_id>51</column_id> 5087 <column_id>51</column_id>
@@ -5233,11 +5207,11 @@ @@ -5233,11 +5207,11 @@
5233 </column_data> 5207 </column_data>
5234 <column_data> 5208 <column_data>
5235 <column_id>9</column_id> 5209 <column_id>9</column_id>
5236 - <value>Farmácias populares existentes</value> 5210 + <value>População</value>
5237 </column_data> 5211 </column_data>
5238 <column_data> 5212 <column_data>
5239 <column_id>10</column_id> 5213 <column_id>10</column_id>
5240 - <value>Quantidade de farmácias populares existentes</value> 5214 + <value>Caracterização da população</value>
5241 </column_data> 5215 </column_data>
5242 </data> 5216 </data>
5243 </direct_test_data> 5217 </direct_test_data>
@@ -5302,7 +5276,7 @@ @@ -5302,7 +5276,7 @@
5302 </column_data> 5276 </column_data>
5303 <column_data> 5277 <column_data>
5304 <column_id>12</column_id> 5278 <column_id>12</column_id>
5305 - <value>Pela média</value> 5279 + <value>Intervalos aleatórios</value>
5306 </column_data> 5280 </column_data>
5307 <column_data> 5281 <column_data>
5308 <column_id>13</column_id> 5282 <column_id>13</column_id>
@@ -5390,11 +5364,11 @@ @@ -5390,11 +5364,11 @@
5390 </column_data> 5364 </column_data>
5391 <column_data> 5365 <column_data>
5392 <column_id>16</column_id> 5366 <column_id>16</column_id>
5393 - <value>([nu_farm_funcionando] &lt; 1)</value> 5367 + <value>([nu_populacao]&lt;=6379.5)</value>
5394 </column_data> 5368 </column_data>
5395 <column_data> 5369 <column_data>
5396 <column_id>17</column_id> 5370 <column_id>17</column_id>
5397 - <value>Nenhuma</value> 5371 + <value>&lt;= 6379.5</value>
5398 </column_data> 5372 </column_data>
5399 <column_data> 5373 <column_data>
5400 <column_id>18</column_id> 5374 <column_id>18</column_id>
@@ -5402,11 +5376,11 @@ @@ -5402,11 +5376,11 @@
5402 </column_data> 5376 </column_data>
5403 <column_data> 5377 <column_data>
5404 <column_id>19</column_id> 5378 <column_id>19</column_id>
5405 - <value>0</value> 5379 + <value>250</value>
5406 </column_data> 5380 </column_data>
5407 <column_data> 5381 <column_data>
5408 <column_id>20</column_id> 5382 <column_id>20</column_id>
5409 - <value>0</value> 5383 + <value>250</value>
5410 </column_data> 5384 </column_data>
5411 <column_data> 5385 <column_data>
5412 <column_id>21</column_id> 5386 <column_id>21</column_id>
@@ -5422,15 +5396,15 @@ @@ -5422,15 +5396,15 @@
5422 </column_data> 5396 </column_data>
5423 <column_data> 5397 <column_data>
5424 <column_id>24</column_id> 5398 <column_id>24</column_id>
5425 - <value>0</value> 5399 + <value></value>
5426 </column_data> 5400 </column_data>
5427 <column_data> 5401 <column_data>
5428 <column_id>25</column_id> 5402 <column_id>25</column_id>
5429 - <value>0</value> 5403 + <value></value>
5430 </column_data> 5404 </column_data>
5431 <column_data> 5405 <column_data>
5432 <column_id>26</column_id> 5406 <column_id>26</column_id>
5433 - <value>0</value> 5407 + <value></value>
5434 </column_data> 5408 </column_data>
5435 <column_data> 5409 <column_data>
5436 <column_id>27</column_id> 5410 <column_id>27</column_id>
@@ -5444,23 +5418,23 @@ @@ -5444,23 +5418,23 @@
5444 </column_data> 5418 </column_data>
5445 <column_data> 5419 <column_data>
5446 <column_id>16</column_id> 5420 <column_id>16</column_id>
5447 - <value>([nu_farm_funcionando] = 1)</value> 5421 + <value>(([nu_populacao]&gt;6379.5)and([nu_populacao]&lt;=12157))</value>
5448 </column_data> 5422 </column_data>
5449 <column_data> 5423 <column_data>
5450 <column_id>17</column_id> 5424 <column_id>17</column_id>
5451 - <value>Uma</value> 5425 + <value>&gt; 6379.5 e &lt;= 12157</value>
5452 </column_data> 5426 </column_data>
5453 <column_data> 5427 <column_data>
5454 <column_id>18</column_id> 5428 <column_id>18</column_id>
5455 - <value>0</value> 5429 + <value>255</value>
5456 </column_data> 5430 </column_data>
5457 <column_data> 5431 <column_data>
5458 <column_id>19</column_id> 5432 <column_id>19</column_id>
5459 - <value>255</value> 5433 + <value>230</value>
5460 </column_data> 5434 </column_data>
5461 <column_data> 5435 <column_data>
5462 <column_id>20</column_id> 5436 <column_id>20</column_id>
5463 - <value>0</value> 5437 + <value>230</value>
5464 </column_data> 5438 </column_data>
5465 <column_data> 5439 <column_data>
5466 <column_id>21</column_id> 5440 <column_id>21</column_id>
@@ -5498,25 +5472,79 @@ @@ -5498,25 +5472,79 @@
5498 </column_data> 5472 </column_data>
5499 <column_data> 5473 <column_data>
5500 <column_id>16</column_id> 5474 <column_id>16</column_id>
5501 - <value>([nu_farm_funcionando] &gt; 1)</value> 5475 + <value>(([nu_populacao]&gt;12157)and([nu_populacao]&lt;=22861.5))</value>
5502 </column_data> 5476 </column_data>
5503 <column_data> 5477 <column_data>
5504 <column_id>17</column_id> 5478 <column_id>17</column_id>
5505 - <value>Mais de uma</value> 5479 + <value>&gt; 12157 e &lt;= 22861.5</value>
5506 </column_data> 5480 </column_data>
5507 <column_data> 5481 <column_data>
5508 <column_id>18</column_id> 5482 <column_id>18</column_id>
5509 - <value>0</value> 5483 + <value>255</value>
5510 </column_data> 5484 </column_data>
5511 <column_data> 5485 <column_data>
5512 <column_id>19</column_id> 5486 <column_id>19</column_id>
5513 - <value>0</value> 5487 + <value>150</value>
5514 </column_data> 5488 </column_data>
5515 <column_data> 5489 <column_data>
5516 <column_id>20</column_id> 5490 <column_id>20</column_id>
  5491 + <value>150</value>
  5492 + </column_data>
  5493 + <column_data>
  5494 + <column_id>21</column_id>
  5495 + <value>1</value>
  5496 + </column_data>
  5497 + <column_data>
  5498 + <column_id>22</column_id>
  5499 + <value></value>
  5500 + </column_data>
  5501 + <column_data>
  5502 + <column_id>23</column_id>
  5503 + <value></value>
  5504 + </column_data>
  5505 + <column_data>
  5506 + <column_id>24</column_id>
  5507 + <value></value>
  5508 + </column_data>
  5509 + <column_data>
  5510 + <column_id>25</column_id>
  5511 + <value></value>
  5512 + </column_data>
  5513 + <column_data>
  5514 + <column_id>26</column_id>
  5515 + <value></value>
  5516 + </column_data>
  5517 + <column_data>
  5518 + <column_id>27</column_id>
  5519 + <value></value>
  5520 + </column_data>
  5521 + </data>
  5522 + <data>
  5523 + <column_data>
  5524 + <column_id>15</column_id>
  5525 + <value>4</value>
  5526 + </column_data>
  5527 + <column_data>
  5528 + <column_id>16</column_id>
  5529 + <value>([nu_populacao]&gt;22861.5)</value>
  5530 + </column_data>
  5531 + <column_data>
  5532 + <column_id>17</column_id>
  5533 + <value>&gt; 22861.5</value>
  5534 + </column_data>
  5535 + <column_data>
  5536 + <column_id>18</column_id>
5517 <value>255</value> 5537 <value>255</value>
5518 </column_data> 5538 </column_data>
5519 <column_data> 5539 <column_data>
  5540 + <column_id>19</column_id>
  5541 + <value>0</value>
  5542 + </column_data>
  5543 + <column_data>
  5544 + <column_id>20</column_id>
  5545 + <value>0</value>
  5546 + </column_data>
  5547 + <column_data>
5520 <column_id>21</column_id> 5548 <column_id>21</column_id>
5521 <value>1</value> 5549 <value>1</value>
5522 </column_data> 5550 </column_data>
ferramentas/metaestat/index.js
  Diff comments   View file @a118714
@@ -643,21 +643,21 @@ i3GEOF.metaestat = { @@ -643,21 +643,21 @@ i3GEOF.metaestat = {
643 **/ 643 **/
644 t0: function(){ 644 t0: function(){
645 var ins = "<p class='paragrafo' >" + $trad(2,i3GEOF.metaestat.dicionario1) + 645 var ins = "<p class='paragrafo' >" + $trad(2,i3GEOF.metaestat.dicionario1) +
646 - "<br><br><p><input id=i3GEOFmetaestatEditorBotao1 type='button' value='"+$trad(3,i3GEOF.metaestat.dicionario1)+"' />" +  
647 - "&nbsp<input id=i3GEOFmetaestatEditorBotao2 type='button' value='"+$trad(4,i3GEOF.metaestat.dicionario1)+"' />" +  
648 - "&nbsp<input id=i3GEOFmetaestatEditorBotao3 type='button' value='Upload' />"; 646 + "<br><br><p><input id=i3GEOFmetaestatEditorBotaot01 type='button' value='"+$trad(3,i3GEOF.metaestat.dicionario1)+"' />" +
  647 + "&nbsp<input id=i3GEOFmetaestatEditorBotaot02 type='button' value='"+$trad(4,i3GEOF.metaestat.dicionario1)+"' />" +
  648 + "&nbsp<input id=i3GEOFmetaestatEditorBotaot03 type='button' value='Upload' />";
649 i3GEO.util.proximoAnterior("","i3GEOF.metaestat.editor.t1()",ins,"i3GEOF.metaestat.editor.t0","i3GEOFmetaestatEditor"); 649 i3GEO.util.proximoAnterior("","i3GEOF.metaestat.editor.t1()",ins,"i3GEOF.metaestat.editor.t0","i3GEOFmetaestatEditor");
650 new YAHOO.widget.Button( 650 new YAHOO.widget.Button(
651 - "i3GEOFmetaestatEditorBotao1", 651 + "i3GEOFmetaestatEditorBotaot01",
652 {onclick:{fn: function(){window.open(i3GEO.configura.locaplic+"/admin/html/estat_variavel.html");}}} 652 {onclick:{fn: function(){window.open(i3GEO.configura.locaplic+"/admin/html/estat_variavel.html");}}}
653 ); 653 );
654 //TODO editor grafico 654 //TODO editor grafico
655 new YAHOO.widget.Button( 655 new YAHOO.widget.Button(
656 - "i3GEOFmetaestatEditorBotao2", 656 + "i3GEOFmetaestatEditorBotaot02",
657 {onclick:{fn: function(){alert("Oi");}}} 657 {onclick:{fn: function(){alert("Oi");}}}
658 ); 658 );
659 new YAHOO.widget.Button( 659 new YAHOO.widget.Button(
660 - "i3GEOFmetaestatEditorBotao3", 660 + "i3GEOFmetaestatEditorBotaot03",
661 {onclick:{fn: function(){ 661 {onclick:{fn: function(){
662 var cabecalho,minimiza,janela; 662 var cabecalho,minimiza,janela;
663 if (!$i("i3geoCartoUpload")){ 663 if (!$i("i3geoCartoUpload")){
temas/acidmap.map
  Diff comments   View file @a118714
1 -MAP  
2 -  
3 -  
4 - FONTSET "../symbols/fontes.txt"  
5 - SYMBOLSET "../symbols/simbolos.sym"  
6 - LAYER  
7 - CONNECTION "http://localhost:8080/geoserver/wms?VALUE_COLUMN=VALOR&SERVICE=AMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&FORMAT=image/png&EXCEPTIONS=application/vnd.ogc.se_inimage&TILED=true&TRANSPARENT=FALSE&VALUE_COLUMN=value&SIMPLIFY_METHOD=1&SIMPLIFY_SIZE=400&INTERVALS[]=10,20,45,70,100&INTERVALS_COLORS[]=0xffffff00,0xffb2,0xff00b2,0xffff00b2,0xff0000b2&RENDERER_TYPE=2&INTERPOLATION_STRATEGY=2&RADIUS=32"  
8 - CONNECTIONTYPE WMS  
9 - METADATA  
10 - "wms_srs" "EPSG:4326"  
11 - "tipooriginal" ""  
12 - "wms_exceptions_format" "application/vnd.ogc.se_xml"  
13 - "CLASSE" "SIM"  
14 - "wfs" "nao"  
15 - "permitekmz" "nao"  
16 - "wms_force_separate_request" "1"  
17 - "TEXTO" "NAO"  
18 - "formatosinfo" "text/plain,application/vnd.ogc.gml,text/html"  
19 - "wms_name" "i3geo:locali"  
20 - "nomeoriginal" "i3geo:locali"  
21 - "permitedownload" "sim"  
22 - "wms_format" "image/png"  
23 - "wms_formatlist" "image/png,application/atom xml,application/atom xml,application/openlayers,application/pdf,application/rss xml,application/rss xml,application/vnd.google-earth.kml,application/vnd.google-earth.kml xml,application/vnd.google-earth.kml xml,application/vnd.google-earth.kmz,application/vnd.google-earth.kmz xml,application/vnd.google-earth.kmz xml,atom,image/geotiff,image/geotiff8,image/gif,image/jpeg,image/png8,image/svg,image/svg xml,image/svg xml,image/tiff,image/tiff8,kml,kmz,openlayers,rss"  
24 - "permiteogc" "sim"  
25 - "permitekml" "sim"  
26 - "tema" "Acid Maps"  
27 - "wms_server_version" "1.1.1"  
28 - "wms_style" ""  
29 - END  
30 - NAME "acidmap"  
31 - OFFSITE 255 255 255  
32 - STATUS OFF  
33 - TYPE RASTER  
34 - UNITS METERS  
35 - END  
36 -END 1 +MAP
  2 + FONTSET "../symbols/fontes.txt"
  3 + SYMBOLSET "../symbols/simbolos.sym"
  4 + LAYER
  5 + CONNECTION "http://localhost:8080/geoserver/wms?VALUE_COLUMN=VALOR&SERVICE=AMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&FORMAT=image/png&EXCEPTIONS=application/vnd.ogc.se_inimage&TILED=true&TRANSPARENT=FALSE&VALUE_COLUMN=value&SIMPLIFY_METHOD=1&SIMPLIFY_SIZE=400&INTERVALS[]=10,20,45,70,100&INTERVALS_COLORS[]=0xffffff00,0xffb2,0xff00b2,0xffff00b2,0xff0000b2&RENDERER_TYPE=2&INTERPOLATION_STRATEGY=2&RADIUS=32"
  6 + CONNECTIONTYPE WMS
  7 + METADATA
  8 + "wms_srs" "EPSG:4326"
  9 + "tipooriginal" ""
  10 + "wms_exceptions_format" "application/vnd.ogc.se_xml"
  11 + "CLASSE" "SIM"
  12 + "wfs" "nao"
  13 + "permitekmz" "nao"
  14 + "wms_force_separate_request" "1"
  15 + "TEXTO" "NAO"
  16 + "formatosinfo" "text/plain,application/vnd.ogc.gml,text/html"
  17 + "wms_name" "i3geo:locali"
  18 + "nomeoriginal" "i3geo:locali"
  19 + "permitedownload" "sim"
  20 + "wms_format" "image/png"
  21 + "wms_formatlist" "image/png,application/atom xml,application/atom xml,application/openlayers,application/pdf,application/rss xml,application/rss xml,application/vnd.google-earth.kml,application/vnd.google-earth.kml xml,application/vnd.google-earth.kml xml,application/vnd.google-earth.kmz,application/vnd.google-earth.kmz xml,application/vnd.google-earth.kmz xml,atom,image/geotiff,image/geotiff8,image/gif,image/jpeg,image/png8,image/svg,image/svg xml,image/svg xml,image/tiff,image/tiff8,kml,kmz,openlayers,rss"
  22 + "permiteogc" "sim"
  23 + "permitekml" "sim"
  24 + "tema" "Acid Maps"
  25 + "wms_server_version" "1.1.1"
  26 + "wms_style" ""
  27 + END # METADATA
  28 + NAME "acidmap"
  29 + OFFSITE 255 255 255
  30 + STATUS OFF
  31 + TILEITEM "location"
  32 + TYPE RASTER
  33 + UNITS METERS
  34 + END # LAYER
  35 +
  36 +END # MAP
  37 +