Download as
Browse Code »

Commit e0a01d8a3595931c91013eb4320d38499861d079

Authored by Edmar Moretti
1 parent 343e7028
Exists in master

atualização do i3geo

Showing 8 changed files with 29 additions and 18 deletions   Show diff stats
classesphp/classe_alteraclasse.php
  Diff comments   View file @e0a01d8
... ... @@ -196,9 +196,9 @@ class Alteraclasse
196 196 function alteraclasses($ids,$nomes,$exps,$base64="nao",$minScales="",$maxScales="")
197 197 {
198 198 if($base64 == "sim"){
199   - $ids = base64_decode($ids);
200   - $nomes = base64_decode($nomes);
201   - $exps = base64_decode($exps);
  199 + //$ids = base64_decode($ids);
  200 + //$nomes = base64_decode($nomes);
  201 + //$exps = base64_decode($exps);
202 202 }
203 203 //prepara os arrays com os valores
204 204 $ids = explode(";",$ids);
... ...
classesphp/classe_temas.php
  Diff comments   View file @e0a01d8
... ... @@ -495,7 +495,7 @@ $testa - Testa o filtro e retorna uma imagem.
495 495 function insereFiltro($filtro,$testa="",$base64="nao")
496 496 {
497 497 if($base64 == "sim"){
498   - $filtro = base64_decode($filtro);
  498 + //$filtro = base64_decode($filtro);
499 499 }
500 500 foreach($this->indices as $indice){
501 501 $layer = $this->mapa->getlayer($indice);
... ...
ferramentas/etiqueta/exec.php
  Diff comments   View file @e0a01d8
... ... @@ -20,8 +20,10 @@ Ativa as etiquetas de um tema.
20 20 $m->layer->setmetadata("IDENTIFICA","");
21 21 $m->layer->setmetadata("TIP",$tips);
22 22 $m->layer->setmetadata("ITENS",$itens);
23   - $m->layer->setmetadata("ITENSDESC",base64_decode($itensdesc));
24   - $m->layer->setmetadata("ITENSLINK",base64_decode($itenslink));
  23 + //$m->layer->setmetadata("ITENSDESC",base64_decode($itensdesc));
  24 + //$m->layer->setmetadata("ITENSLINK",base64_decode($itenslink));
  25 + $m->layer->setmetadata("ITENSDESC",$itensdesc);
  26 + $m->layer->setmetadata("ITENSLINK",$itenslink);
25 27 $m->layer->setmetadata("itembuscarapida",$itembuscarapida);
26 28 $m->salva();
27 29 $_SESSION["contadorsalva"]++;
... ...
ferramentas/etiqueta/index.js
  Diff comments   View file @e0a01d8
... ... @@ -326,8 +326,10 @@ i3GEOF.etiqueta = {
326 326 + i3GEOF.etiqueta.tema
327 327 + "&tips="+lista[0].toString(",")
328 328 + "&itens="+lista[1].toString(",")
329   - + "&itensdesc="+i3GEO.util.base64encode(lista[2].toString(","))
330   - + "&itenslink="+i3GEO.util.base64encode(lista[3].toString(","))
  329 + //+ "&itensdesc="+i3GEO.util.base64encode(lista[2].toString(","))
  330 + //+ "&itenslink="+i3GEO.util.base64encode(lista[3].toString(","))
  331 + + "&itensdesc="+lista[2].toString(",")
  332 + + "&itenslink="+lista[3].toString(",")
331 333 + "&itembuscarapida="+lista[4];
332 334 cp.set_response_type("JSON");
333 335 cp.set_transfer_mode('POST');
... ...
ferramentas/filtro/index.js
  Diff comments   View file @e0a01d8
... ... @@ -178,8 +178,8 @@ i3GEOF.filtro = {
178 178 titulo = "<span class='i3GEOiconeFerramenta i3GEOiconeFiltro'></span><div id='i3GEOFfiltroComboCabeca' class='comboTemasCabecalho'> ------</div><div class='i3GeoTituloJanela'>"+$trad("t29")+"<a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=5&idajuda=38' ><b> </b></a></div>";
179 179 }
180 180 janela = i3GEO.janela.cria(
181   - "580px",
182   - "250px",
  181 + "600px",
  182 + "260px",
183 183 "",
184 184 "",
185 185 "",
... ...
ferramentas/legenda/exec.php
  Diff comments   View file @e0a01d8
... ... @@ -103,7 +103,7 @@ Acrescenta a contagem de elementos em cada classe.
103 103 $m = new Temas($map_file,$tema);
104 104 $l = $m->mapa->getlayerbyname($tema);
105 105 if($filter != ""){
106   - $filter = base64decode($filter);
  106 + //$filter = base64decode($filter);
107 107 }
108 108 $m->criaCluster($group,$filter,$maxdistance,$region,$buffer);
109 109 $m->salva();
... ...
ferramentas/legenda/index.js
  Diff comments   View file @e0a01d8
... ... @@ -436,7 +436,7 @@ i3GEOF.legenda =
436 436 + i3GEO.configura.locaplic
437 437 + "/ajuda_usuario.php?idcategoria=5&idajuda=41' ><b> </b></a></div></div></div>";
438 438 janela =
439   - i3GEO.janela.cria("490px", "340px", "", "", "", titulo, "i3GEOF.legenda", false, "hd", cabecalho, minimiza, function() {
  439 + i3GEO.janela.cria("540px", "350px", "", "", "", titulo, "i3GEOF.legenda", false, "hd", cabecalho, minimiza, function() {
440 440 i3GEO.guias.ajustaGuiaFerramenta("i3GEOF.legenda", "i3GEOlegenda");
441 441 }, true, "", "", "nao");
442 442 divid = janela[2].id;
... ... @@ -856,7 +856,7 @@ i3GEOF.legenda =
856 856 var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten);
857 857 p =
858 858 i3GEO.configura.locaplic + "/classesphp/mapa_controle.php?"
859   - + "base64=sim"
  859 + + "base64=nao"
860 860 + "&g_sid="
861 861 + i3GEO.configura.sid
862 862 + "&funcao=alteraclasse"
... ... @@ -866,11 +866,13 @@ i3GEOF.legenda =
866 866 cp = new cpaint();
867 867 cp.set_transfer_mode('POST');
868 868 cp.set_response_type("JSON");
869   - cp.call(p, "alteraclassesPost", temp, "ids=" + i3GEO.util.base64encode(ids)
  869 + cp.call(p, "alteraclassesPost", temp, "ids=" + ids
870 870 + "&nomes="
871   - + i3GEO.util.base64encode(nomes)
  871 + //+ i3GEO.util.base64encode(nomes)
  872 + + nomes
872 873 + "&exps="
873   - + i3GEO.util.base64encode(exps)
  874 + //+ i3GEO.util.base64encode(exps)
  875 + + exps
874 876 + "&minScales="
875 877 + minScales
876 878 + "&maxScales="
... ... @@ -1981,7 +1983,7 @@ i3GEOF.legenda =
1981 1983 $i("i3GEOlegendaComboSize").innerHTML = retorno.dados.replace("id=''"," onchange='$i(\"i3GEOlegendasizes\").value = this.value'");
1982 1984 }
1983 1985 });
1984   -
  1986 +
1985 1987 i3GEO.util.aplicaAquarela("i3GEOlegendaParametrosEstilos");
1986 1988 p =
1987 1989 i3GEO.configura.locaplic + "/classesphp/mapa_controle.php?g_sid="
... ... @@ -2301,7 +2303,8 @@ i3GEOF.legenda =
2301 2303 + "&buffer="
2302 2304 + $i("i3GEOlegendaClusterBuffer").value
2303 2305 + "&filter="
2304   - + i3GEO.util.base64encode($i("i3GEOlegendaClusterFilter").value)
  2306 + //+ i3GEO.util.base64encode($i("i3GEOlegendaClusterFilter").value)
  2307 + + $i("i3GEOlegendaClusterFilter").value
2305 2308 + "&region="
2306 2309 + $i("i3GEOlegendaClusterRegion").value
2307 2310 + "&group="
... ...
ferramentas/legenda/template_mst.html
  Diff comments   View file @e0a01d8
... ... @@ -131,10 +131,14 @@
131 131 <table summary='' class='lista5'>
132 132 <tr>
133 133 <td>
  134 + <p class='paragrafo'>
134 135 <input id='i3GEOlegendabotao1' size='22' type='button' value='{{{aplicaAlteracao}}}' />
  136 + </p>
135 137 </td>
136 138 <td>
  139 + <p class='paragrafo'>
137 140 <input id='i3GEOlegendabotao2' size='22' type='button' value='{{{adicionaClasse}}}' title='{{{adicionaNovaClasse}}}' />
  141 + </p>
138 142 </td>
139 143 </tr>
140 144 </table>
... ...