Download as
Browse Code »

Commit d55729a90a05d001fd1070f4d47c8bfa04920570

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

--no commit message

Showing 4 changed files with 100 additions and 93 deletions   Show diff stats
admin/admin.db
View file @d55729a
No preview for this file type
admin/php/classe_metaestat.php
  Diff comments   View file @d55729a
@@ -375,7 +375,7 @@ class Metaestat{ @@ -375,7 +375,7 @@ class Metaestat{
375 $n = count($colunas); 375 $n = count($colunas);
376 for($i=0;$i<$n;$i++){ 376 for($i=0;$i<$n;$i++){
377 if($colunas[$i] === $dados["colunavalor"]){ 377 if($colunas[$i] === $dados["colunavalor"]){
378 - $alias[$i] = mb_convert_encoding($dados["nomemedida"],"ISO-8859-1",mb_detect_encoding($dados["nomemedida"])); 378 + $alias[$i] = "Valor";//mb_convert_encoding($dados["nomemedida"],"ISO-8859-1",mb_detect_encoding($dados["nomemedida"]));
379 } 379 }
380 } 380 }
381 $aliasvis = $dadosgeo["apelidos"]; 381 $aliasvis = $dadosgeo["apelidos"];
@@ -403,11 +403,15 @@ class Metaestat{ @@ -403,11 +403,15 @@ class Metaestat{
403 $tipoconta = ""; 403 $tipoconta = "";
404 if($dados["permitesoma"] == 1){ 404 if($dados["permitesoma"] == 1){
405 $tipoconta = "sum"; 405 $tipoconta = "sum";
406 - $titulo .= " - soma"; 406 + if($agregaregiao == true){
  407 + $titulo .= " - soma";
  408 + }
407 } 409 }
408 elseif($dados["permitemedia"] == 1){ 410 elseif($dados["permitemedia"] == 1){
409 $tipoconta = "avg"; 411 $tipoconta = "avg";
410 - $titulo .= " - media"; 412 + if($agregaregiao == true){
  413 + $titulo .= " - media";
  414 + }
411 } 415 }
412 $sqlagrupamento = ""; 416 $sqlagrupamento = "";
413 $dadosfiltro = ""; 417 $dadosfiltro = "";
@@ -544,7 +548,7 @@ class Metaestat{ @@ -544,7 +548,7 @@ class Metaestat{
544 else{ 548 else{
545 $titulolayer = mb_convert_encoding($sql["titulo"],"ISO-8859-1",mb_detect_encoding($sql["titulo"])); 549 $titulolayer = mb_convert_encoding($sql["titulo"],"ISO-8859-1",mb_detect_encoding($sql["titulo"]));
546 } 550 }
547 - 551 +
548 $dados[] = "MAP"; 552 $dados[] = "MAP";
549 $dados[] = 'SYMBOLSET "'.$this->locaplic.'/symbols/simbolosv6.sym"'; 553 $dados[] = 'SYMBOLSET "'.$this->locaplic.'/symbols/simbolosv6.sym"';
550 $dados[] = 'FONTSET "'.$this->locaplic.'/symbols/fontes.txt"'; 554 $dados[] = 'FONTSET "'.$this->locaplic.'/symbols/fontes.txt"';
admin/php/editortexto.php
  Diff comments   View file @d55729a
@@ -43,8 +43,9 @@ body { @@ -43,8 +43,9 @@ body {
43 { 43 {
44 echo "Arquivo $mapfile n&atilde;o existe.";exit; 44 echo "Arquivo $mapfile n&atilde;o existe.";exit;
45 } 45 }
46 - //remove o cache OGC  
47 - $nomeMapfileTmp = $dir_tmp."/ogc_".md5($mapfile).".map"; 46 + //remove o cache OGC
  47 + $agora = intval(time() / 1000);
  48 + $nomeMapfileTmp = $dir_tmp."/ogc_".md5($mapfile)."_".$agora.".map";
48 $nomeMapfileTmp = str_replace(",","",$nomeMapfileTmp); 49 $nomeMapfileTmp = str_replace(",","",$nomeMapfileTmp);
49 $nomeMapfileTmp = str_replace(" ","",$nomeMapfileTmp); 50 $nomeMapfileTmp = str_replace(" ","",$nomeMapfileTmp);
50 chmod($nomeMapfileTmp,0777); 51 chmod($nomeMapfileTmp,0777);
@@ -63,10 +64,12 @@ body { @@ -63,10 +64,12 @@ body {
63 echo file_get_contents($mapfile); 64 echo file_get_contents($mapfile);
64 echo "</TEXTAREA>"; 65 echo "</TEXTAREA>";
65 $mapfile = str_replace("\\","/",$mapfile); 66 $mapfile = str_replace("\\","/",$mapfile);
  67 + $mapa = ms_newMapObj($mapfile);
66 echo "<iframe id='mapaPreview' src='../../mashups/openlayers.php?controles=navigation,panzoombar,scaleline,mouseposition&botoes=identifica&largura=490&fundo=".$mapfile."&temas=".$mapfile."' cols=100 rows=20 style='position:relative;top:2px;overflow:hidden;width:500px;height:500px;border:1px solid gray;'>"; 68 echo "<iframe id='mapaPreview' src='../../mashups/openlayers.php?controles=navigation,panzoombar,scaleline,mouseposition&botoes=identifica&largura=490&fundo=".$mapfile."&temas=".$mapfile."' cols=100 rows=20 style='position:relative;top:2px;overflow:hidden;width:500px;height:500px;border:1px solid gray;'>";
67 echo "</iframe>"; 69 echo "</iframe>";
68 echo "<input type=hidden name=tipo value=gravar />"; 70 echo "<input type=hidden name=tipo value=gravar />";
69 - $mapa = ms_newMapObj($mapfile); 71 +
  72 +
70 $n = $mapa->numlayers; 73 $n = $mapa->numlayers;
71 echo "<br><br>Colunas dos layers:<br><br>"; 74 echo "<br><br>Colunas dos layers:<br><br>";
72 for($i=0;$i<$n;$i++){ 75 for($i=0;$i<$n;$i++){
temas/_lbiomashp.map
  Diff comments   View file @d55729a
1 -MAP  
2 - FONTSET "../symbols/fontes.txt"  
3 - SYMBOLSET "../symbols/simbolos.sym"  
4 - LAYER  
5 - CONNECTION ""  
6 - DATA "/var/www/i3geo/aplicmap/dados/biomas.shp"  
7 - METADATA  
8 - "METAESTAT_ID_MEDIDA_VARIAVEL" ""  
9 - "cache" "SIM"  
10 - "CLASSE" "SIM"  
11 - "permitekmz" "nao"  
12 - "METAESTAT_CODIGO_TIPO_REGIAO" ""  
13 - "permitedownload" "sim"  
14 - "metaestat" ""  
15 - "permiteogc" "sim"  
16 - "permitekml" "sim"  
17 - "convcaracter" ""  
18 - "TEMA" "Biomas shapefile (acentuação)"  
19 - END # METADATA  
20 - NAME "_lbiomashp"  
21 - PROCESSING "ITEMS=CD_LEGENDA"  
22 - STATUS OFF  
23 - TEMPLATE "none.htm"  
24 - MAXSCALEDENOM 5000000  
25 - TILEITEM "location"  
26 - OPACITY 50  
27 - TYPE POLYGON  
28 - UNITS METERS  
29 - CLASS  
30 - NAME "CAATINGA"  
31 - EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')  
32 - STYLE  
33 - ANGLE 0  
34 - COLOR 255 255 0  
35 - OFFSET 0 0  
36 - END # STYLE  
37 - END # CLASS  
38 - CLASS  
39 - NAME "PAMPA"  
40 - EXPRESSION ('[CD_LEGENDA]'eq'PAMPA')  
41 - STYLE  
42 - ANGLE 0  
43 - COLOR 225 189 199  
44 - OFFSET 0 0  
45 - END # STYLE  
46 - END # CLASS  
47 - CLASS  
48 - NAME "CERRADO"  
49 - EXPRESSION ('[CD_LEGENDA]'eq'CERRADO')  
50 - STYLE  
51 - ANGLE 0  
52 - COLOR 17 235 39  
53 - OFFSET 0 0  
54 - END # STYLE  
55 - END # CLASS  
56 - CLASS  
57 - NAME "PANTANAL"  
58 - EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL')  
59 - STYLE  
60 - ANGLE 0  
61 - COLOR 0 192 145  
62 - OFFSET 0 0  
63 - END # STYLE  
64 - END # CLASS  
65 - CLASS  
66 - NAME "AMAZONIA"  
67 - EXPRESSION ('[CD_LEGENDA]'eq'AMAZONIA')  
68 - STYLE  
69 - ANGLE 0  
70 - COLOR 149 120 37  
71 - OFFSET 0 0  
72 - END # STYLE  
73 - END # CLASS  
74 - CLASS  
75 - NAME "MATA ATLANTICA"  
76 - EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLANTICA')  
77 - STYLE  
78 - ANGLE 0  
79 - COLOR 208 160 125  
80 - OFFSET 0 0  
81 - END # STYLE  
82 - END # CLASS  
83 - END # LAYER  
84 -  
85 -END # MAP  
86 - 1 +MAP
  2 + FONTSET "../symbols/fontes.txt"
  3 + SYMBOLSET "../symbols/simbolos.sym"
  4 + LAYER
  5 + CONNECTION ""
  6 + DATA "/var/www/i3geo/aplicmap/dados/biomas.shp"
  7 + METADATA
  8 + "METAESTAT_ID_MEDIDA_VARIAVEL" ""
  9 + "cache" "SIM"
  10 + "CLASSE" "SIM"
  11 + "permitekmz" "nao"
  12 + "METAESTAT_CODIGO_TIPO_REGIAO" ""
  13 + "permitedownload" "sim"
  14 + "metaestat" ""
  15 + "permiteogc" "sim"
  16 + "permitekml" "sim"
  17 + "convcaracter" ""
  18 + "TEMA" "Biomas shapefile (acentuação)"
  19 + END # METADATA
  20 + NAME "_lbiomashp"
  21 + PROCESSING "ITEMS=CD_LEGENDA"
  22 + STATUS OFF
  23 + TEMPLATE "none.htm"
  24 + MAXSCALEDENOM 5000000
  25 + TILEITEM "location"
  26 + OPACITY 50
  27 + TYPE POLYGON
  28 + UNITS METERS
  29 + CLASS
  30 + NAME "CAATINGA"
  31 + EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')
  32 + STYLE
  33 + ANGLE 0
  34 + COLOR 100 0 0
  35 + OFFSET 0 0
  36 + END # STYLE
  37 + END # CLASS
  38 + CLASS
  39 + NAME "PAMPA"
  40 + EXPRESSION ('[CD_LEGENDA]'eq'PAMPA')
  41 + STYLE
  42 + ANGLE 0
  43 + COLOR 225 189 199
  44 + OFFSET 0 0
  45 + END # STYLE
  46 + END # CLASS
  47 + CLASS
  48 + NAME "CERRADO"
  49 + EXPRESSION ('[CD_LEGENDA]'eq'CERRADO')
  50 + STYLE
  51 + ANGLE 0
  52 + COLOR 17 235 39
  53 + OFFSET 0 0
  54 + END # STYLE
  55 + END # CLASS
  56 + CLASS
  57 + NAME "PANTANAL"
  58 + EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL')
  59 + STYLE
  60 + ANGLE 0
  61 + COLOR 0 192 145
  62 + OFFSET 0 0
  63 + END # STYLE
  64 + END # CLASS
  65 + CLASS
  66 + NAME "AMAZONIA"
  67 + EXPRESSION ('[CD_LEGENDA]'eq'AMAZONIA')
  68 + STYLE
  69 + ANGLE 0
  70 + COLOR 149 120 37
  71 + OFFSET 0 0
  72 + END # STYLE
  73 + END # CLASS
  74 + CLASS
  75 + NAME "MATA ATLANTICA"
  76 + EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLANTICA')
  77 + STYLE
  78 + ANGLE 0
  79 + COLOR 208 160 125
  80 + OFFSET 0 0
  81 + END # STYLE
  82 + END # CLASS
  83 + END # LAYER
  84 +
  85 +END # MAP
  86 +