diff --git a/admin/admin.db b/admin/admin.db index 8a5a71d..759cbf2 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/ferramentas/legenda/index.js b/ferramentas/legenda/index.js index 4d98027..dc5daf7 100644 --- a/ferramentas/legenda/index.js +++ b/ferramentas/legenda/index.js @@ -654,7 +654,8 @@ i3GEOF.legenda = { i3GEOF.legenda.mostralegenda(); i3GEOF.legenda.aposAlterarLegenda(); }; - p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=aplicacoresrgb&ext="+i3GEO.parametros.mapexten+"&tema="+i3GEOF.legenda.tema; + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); + p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=aplicacoresrgb&ext="+ext+"&tema="+i3GEOF.legenda.tema; cp = new cpaint(); cp.set_transfer_mode('POST'); cp.set_response_type("JSON"); @@ -758,7 +759,8 @@ i3GEOF.legenda = { i3GEOF.legenda.aposAlterarLegenda(); i3GEOF.legenda.aguarde.visibility = "hidden"; }; - p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=alteraclasses&ext="+i3GEO.parametros.mapexten; + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); + p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=alteraclasses&ext="+ext; cp = new cpaint(); cp.set_transfer_mode('POST'); cp.set_response_type("JSON"); @@ -820,7 +822,8 @@ i3GEOF.legenda = { adicionaClasse: function(){ if(i3GEOF.legenda.aguarde.visibility === "visible") {return;} - var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=adicionaclasse"+"&tema="+i3GEOF.legenda.tema+"&ext="+i3GEO.parametros.mapexten, + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); + var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=adicionaclasse"+"&tema="+i3GEOF.legenda.tema+"&ext="+ext, cp = new cpaint(); cp.set_response_type("JSON"); cp.call(p,"alteraclasse",i3GEOF.legenda.mostralegenda); @@ -842,7 +845,8 @@ i3GEOF.legenda = { }; if(i3GEOF.legenda.aguarde.visibility === "visible") {return;} - var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=adicionaopacidade"+"&tema="+i3GEOF.legenda.tema+"&ext="+i3GEO.parametros.mapexten, + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); + var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=adicionaopacidade"+"&tema="+i3GEOF.legenda.tema+"&ext="+ext, cp = new cpaint(); cp.set_response_type("JSON"); cp.call(p,"alteraclasse",retorna); @@ -1018,7 +1022,8 @@ i3GEOF.legenda = { if(i3GEOF.legenda.aguarde.visibility === "visible") {return;} i3GEOF.legenda.aguarde.visibility = "visible"; - var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&tema="+i3GEOF.legenda.tema+"&opcao=simbolounico&ext="+i3GEO.parametros.mapexten, + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); + var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&tema="+i3GEOF.legenda.tema+"&opcao=simbolounico&ext="+ext, cp = new cpaint(), fim = function(){ i3GEOF.legenda.aposAlterarLegenda(); @@ -1050,11 +1055,12 @@ i3GEOF.legenda = { i3GEOF.legenda.aguarde.visibility = "hidden"; }; if($i("i3GEOFlegendaaplicaextent").checked === true){ - p += "&ext="+i3GEO.parametros.mapexten; + p += "&ext="+i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); } else{ - p += "&ext="+i3GEO.parametros.extentTotal; + p += "&ext="+i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal); } + if (item == "") {i3GEO.janela.tempoMsg($trad(81,i3GEOF.legenda.dicionario));return;} i3GEOF.legenda.aguarde.visibility = "visible"; @@ -1079,7 +1085,8 @@ i3GEOF.legenda = { {return;} var item = $i("i3GEOlegendaSelItem").value, nclasses = $i("i3GEOlegendanclasses").value, - p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&nclasses="+nclasses+"&tema="+i3GEOF.legenda.tema+"&item="+item+"&opcao=intervalosiguais&ignorar="+$i("i3GEOlegendaignorar").value+"&ext="+i3GEO.parametros.mapexten, + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten), + p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&nclasses="+nclasses+"&tema="+i3GEOF.legenda.tema+"&item="+item+"&opcao=intervalosiguais&ignorar="+$i("i3GEOlegendaignorar").value+"&ext="+ext, cp = new cpaint(), fim = function(){ i3GEOF.legenda.aposAlterarLegenda(); @@ -1107,7 +1114,8 @@ i3GEOF.legenda = { if(i3GEOF.legenda.aguarde.visibility === "visible") {return;} var item = $i("i3GEOlegendaSelItem").value, - p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&tema="+i3GEOF.legenda.tema+"&item="+item+"&opcao=quartis&ignorar="+$i("i3GEOlegendaignorar").value+"&ext="+i3GEO.parametros.mapexten+"&tipoLegenda="+$i("estiloClassesQuartis").value, + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten), + p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&tema="+i3GEOF.legenda.tema+"&item="+item+"&opcao=quartis&ignorar="+$i("i3GEOlegendaignorar").value+"&ext="+ext+"&tipoLegenda="+$i("estiloClassesQuartis").value, cp = new cpaint(); fim = function(){ i3GEOF.legenda.aposAlterarLegenda(); @@ -1136,7 +1144,8 @@ i3GEOF.legenda = { {return;} var item = $i("i3GEOlegendaSelItem").value, nclasses = $i("i3GEOlegendanclasses").value, - p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&nclasses="+nclasses+"&tema="+i3GEOF.legenda.tema+"&item="+item+"&opcao=quantil&ignorar="+$i("i3GEOlegendaignorar").value+"&ext="+i3GEO.parametros.mapexten, + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten), + p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&nclasses="+nclasses+"&tema="+i3GEOF.legenda.tema+"&item="+item+"&opcao=quantil&ignorar="+$i("i3GEOlegendaignorar").value+"&ext="+ext, cp = new cpaint(), fim = function(){ i3GEOF.legenda.aposAlterarLegenda(); @@ -1165,7 +1174,8 @@ i3GEOF.legenda = { {return;} var item = $i("i3GEOlegendaSelItem").value, nclasses = $i("i3GEOlegendanclasses").value, - p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&nclasses="+nclasses+"&tema="+i3GEOF.legenda.tema+"&item="+item+"&opcao=quebrasnaturais&ignorar="+$i("i3GEOlegendaignorar").value+"&ext="+i3GEO.parametros.mapexten, + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten), + p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&nclasses="+nclasses+"&tema="+i3GEOF.legenda.tema+"&item="+item+"&opcao=quebrasnaturais&ignorar="+$i("i3GEOlegendaignorar").value+"&ext="+ext, cp = new cpaint(), fim = function(){ i3GEOF.legenda.aposAlterarLegenda(); diff --git a/ferramentas/nptpol/index.js b/ferramentas/nptpol/index.js index 2000fc4..8b91844 100644 --- a/ferramentas/nptpol/index.js +++ b/ferramentas/nptpol/index.js @@ -204,6 +204,7 @@ i3GEOF.nptpol = { {ext = i3GEO.Interface.googlemaps.bbox();} else {ext = i3GEO.parametros.mapexten;} + ext = i3GEO.util.extOSM2Geo(ext); p = i3GEO.configura.locaplic+"/ferramentas/nptpol/exec.php?g_sid="+i3GEO.configura.sid+"&funcao=nptPol&temaPt="+$i("i3GEOnptpolPontos").value+"&temaPo="+$i("i3GEOnptpolPoligonos").value+"&ext="+ext; p += "&somaritem="+somaritem; cp = new cpaint(); -- libgit2 0.21.2