Download as
Browse Code »

Commit 835d1872893fb53bace6466bbfb72175554b2570

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

Correção no testamapfile que não estava fazendo o teste da tabela de atributos

Showing 2 changed files with 11 additions and 8 deletions   Show diff stats
temas/gridg.map 100644 → 100755
  Diff comments   View file @835d187
testamapfile.php
  Diff comments   View file @835d187
... ... @@ -64,7 +64,6 @@ if(isset($i3geoPermiteLogin) && $i3geoPermiteLogin == false){
64 64 exit ();
65 65 }
66 66 include("classesphp/funcoes_gerais.php");
67   -
68 67 //$i3geoPermiteLoginIp vem de ms_configura.php
69 68 if(isset($i3geoPermiteLoginIp)){
70 69 checaLoginIp($i3geoPermiteLoginIp);
... ... @@ -96,8 +95,6 @@ if ($tipo == "")
96 95 echo '<html><head><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">';
97 96 echo '<script src="classesjs/i3geo.js"></script>';
98 97 }
99   -$arqs = listaArquivos("temas");
100   -sort($arqs["arquivos"]);
101 98  
102 99 if ($tipo == "")
103 100 {
... ... @@ -111,7 +108,7 @@ if ($tipo == &quot;&quot;)
111 108 echo '</head>';
112 109 echo '<body class=" yui-skin-sam" style="background: white;"><center>';
113 110 echo '<div class="bordaSuperior" >&nbsp;</div>';
114   - echo '<div class="mascaraPrincipal" id="divGeral" style=display:none; >';
  111 + echo '<div class="mascaraPrincipal" id="divGeral" style=display:block; >';
115 112 echo '<div id=cabecalhoPrincipal></div>';
116 113 echo '<h1 style="background-color: white; color: black;" >Administra&ccedil;&atilde;o do i3geo - teste de mapfiles </h1>';
117 114 echo '<form action="testamapfile.php" method="post" id=f >';
... ... @@ -133,8 +130,12 @@ $map = $_GET[&quot;map&quot;];
133 130  
134 131 if (isset($map) && $map != "")
135 132 {
136   - if(!isset($solegenda) || $solegenda == ""){$solegenda = "nao";}
  133 + if(!isset($solegenda) || $solegenda == ""){
  134 + $solegenda = "nao";
  135 + }
137 136 if ($map == "todos"){
  137 + $arqs = listaArquivos("temas",true,array("map"));
  138 + sort($arqs["arquivos"]);
138 139 $tipo = "todos";
139 140 $conta = 0;
140 141 echo "<br>N&uacute;mero de mapas = ".(count($arqs["arquivos"]))." Faltam= ".(count($arqs["arquivos"])-$iniciar-10)."<br>";
... ... @@ -349,12 +350,14 @@ function verifica($map,$solegenda,$tabela,$cache=&quot;sim&quot;){
349 350 //pega simbolos locais e aplica no novo mapa
350 351 cloneInlineSymbol($layern,$nmapa,$mapa);
351 352 ms_newLayerObj($mapa, $layern);
  353 + /*
352 354 if ($layern->data == ""){
353 355 $dados = $layern->connection;
354 356 }
355 357 else{
356 358 $dados = $layern->data;
357 359 }
  360 + */
358 361 $pegarext = $layern->name;
359 362 }
360 363 zoomTema($pegarext,$mapa);
... ... @@ -397,10 +400,10 @@ function verifica($map,$solegenda,$tabela,$cache=&quot;sim&quot;){
397 400  
398 401 $mapa->save($destino);
399 402 validaAcessoTemas($destino,true);
400   -
401 403 //testa a tabela de atributos
402   - if(isset($tabela)){
  404 + if(isset($_GET["tabela"])){
403 405 include("classesphp/classe_atributos.php");
  406 +
404 407 $t = new Atributos($destino,$map);
405 408 restauraCon($destino,$postgis_mapa);
406 409 $r = $t->itensTexto();
... ... @@ -485,7 +488,7 @@ function verifica($map,$solegenda,$tabela,$cache=&quot;sim&quot;){
485 488 {echo "<img src=".$nomer." /><br>";}
486 489 echo "<img src=".$nomerl." />";
487 490 if($tipo == "todos"){
488   - echo "<br>".$dados."<br>";
  491 + //echo "<br>".$dados."<br>";
489 492 }
490 493 if($map != "todos"){
491 494 echo "<br><b>Tempo (s): ";
... ...