Download as
Browse Code »

Commit 04156c9e7f6712a20c8484c785f8121904df271f

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

remoção de parâmetros antigos não utilizados mais nos mapas

Showing 4 changed files with 12 additions and 6 deletions   Show diff stats
admin/admin.db
View file @04156c9
No preview for this file type
classesphp/mapa_inicia.php
  Diff comments   View file @04156c9
@@ -341,20 +341,24 @@ function iniciaMapa() @@ -341,20 +341,24 @@ function iniciaMapa()
341 $res["mapscale"] = $escalaMapa; 341 $res["mapscale"] = $escalaMapa;
342 $res["mapres"] = $m->mapa->resolution; 342 $res["mapres"] = $m->mapa->resolution;
343 $res["pixelsize"] = $celula; 343 $res["pixelsize"] = $celula;
  344 + //TODO depreciar na documentacao e ms_configura
  345 + /*
344 if ((isset($expoeMapfile)) && ($expoeMapfile == "nao")) 346 if ((isset($expoeMapfile)) && ($expoeMapfile == "nao"))
345 {$res["mapfile"] = "";} 347 {$res["mapfile"] = "";}
346 else 348 else
347 {$res["mapfile"] = $map_file;} 349 {$res["mapfile"] = $map_file;}
348 -  
349 - $res["cgi"] = $locmapserv; 350 + */
  351 + $res["mapfile"] = "";
  352 + $res["cgi"] = "";//$locmapserv;
350 $res["extentTotal"] = $ext; 353 $res["extentTotal"] = $ext;
351 - $res["mapimagem"] = $nomer; 354 + $res["mapimagem"] = "";//$nomer;
352 $geoip = "nao"; 355 $geoip = "nao";
353 if (file_exists($locaplic."/pacotes/geoip") && file_exists($locaplic."/pacotes/geoip/GeoLiteCity.dat")) 356 if (file_exists($locaplic."/pacotes/geoip") && file_exists($locaplic."/pacotes/geoip/GeoLiteCity.dat"))
354 {$geoip = "sim";} 357 {$geoip = "sim";}
355 $res["geoip"] = $geoip; 358 $res["geoip"] = $geoip;
356 $res["listavisual"] = (file_exists($locaplic."/imagens/visual")) ? implode(",",listaDiretorios($locaplic."/imagens/visual")) : ""; 359 $res["listavisual"] = (file_exists($locaplic."/imagens/visual")) ? implode(",",listaDiretorios($locaplic."/imagens/visual")) : "";
357 - $res["utilizacgi"] = $utilizacgi; 360 + //TODO depreciar na documentacao
  361 + $res["utilizacgi"] = "nao";//$utilizacgi;
358 $res["versaoms"] = $versao["principal"]; 362 $res["versaoms"] = $versao["principal"];
359 $res["versaomscompleta"] = $versao["completa"]; 363 $res["versaomscompleta"] = $versao["completa"];
360 $res["mensagens"] = $m->pegaMensagens(); 364 $res["mensagens"] = $m->pegaMensagens();
@@ -370,8 +374,8 @@ function iniciaMapa() @@ -370,8 +374,8 @@ function iniciaMapa()
370 $res["tempo"] = microtime(1) - $tempo; 374 $res["tempo"] = microtime(1) - $tempo;
371 $res["embedLegenda"] = $embedLegenda; 375 $res["embedLegenda"] = $embedLegenda;
372 $res["erro"] = ''; 376 $res["erro"] = '';
373 - $res["mappath"] = $imgo->imagepath;  
374 - $res["mapurl"] = $imgo->imageurl; 377 + $res["mappath"] = "";//$imgo->imagepath;
  378 + $res["mapurl"] = "";//$imgo->imageurl;
375 $res["navegacaoDir"] = $navegadoresLocais; 379 $res["navegacaoDir"] = $navegadoresLocais;
376 if($openid == true) 380 if($openid == true)
377 {$res["autenticadoopenid"] = "sim";} 381 {$res["autenticadoopenid"] = "sim";}
ferramentas/convertemapakml/index.js
  Diff comments   View file @04156c9
@@ -48,6 +48,7 @@ i3GEOF.converteMapaKml = { @@ -48,6 +48,7 @@ i3GEOF.converteMapaKml = {
48 /** 48 /**
49 * Susbtitutos para o template 49 * Susbtitutos para o template
50 */ 50 */
  51 + //TODO verificar funcionamento sem expor mapfile
51 mustacheHash : function() { 52 mustacheHash : function() {
52 var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.converteMapaKml.dicionario); 53 var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.converteMapaKml.dicionario);
53 //lista; 54 //lista;
ferramentas/googlemaps1/index.js
  Diff comments   View file @04156c9
@@ -258,6 +258,7 @@ function criaWMS(){ @@ -258,6 +258,7 @@ function criaWMS(){
258 return(cgi+parametros); 258 return(cgi+parametros);
259 } 259 }
260 function criaTile(){ 260 function criaTile(){
  261 + //depreciar???
261 var cgi = window.parent.i3GEO.util.protocolo()+"://"+window.location.host+window.parent.i3GEO.parametros.cgi+"?"; 262 var cgi = window.parent.i3GEO.util.protocolo()+"://"+window.location.host+window.parent.i3GEO.parametros.cgi+"?";
262 var parametros = "map="+window.parent.i3GEO.parametros.mapfile; 263 var parametros = "map="+window.parent.i3GEO.parametros.mapfile;
263 parametros += "&map.scalebar=status+off&map_imagecolor=-1 -1 -1&map_transparent=on"; 264 parametros += "&map.scalebar=status+off&map_imagecolor=-1 -1 -1&map_transparent=on";