Commit 75dfe6242a7bb4abdb203213633cb0efd4081a33
1 parent
5d6e51f8
Exists in
master
and in
7 other branches
v6 - correção nas ferramentas legenda e nptpol na interface OSM
Showing
3 changed files
with
22 additions
and
11 deletions
Show diff stats
admin/admin.db
No preview for this file type
ferramentas/legenda/index.js
... | ... | @@ -654,7 +654,8 @@ i3GEOF.legenda = { |
654 | 654 | i3GEOF.legenda.mostralegenda(); |
655 | 655 | i3GEOF.legenda.aposAlterarLegenda(); |
656 | 656 | }; |
657 | - 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; | |
657 | + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); | |
658 | + p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=aplicacoresrgb&ext="+ext+"&tema="+i3GEOF.legenda.tema; | |
658 | 659 | cp = new cpaint(); |
659 | 660 | cp.set_transfer_mode('POST'); |
660 | 661 | cp.set_response_type("JSON"); |
... | ... | @@ -758,7 +759,8 @@ i3GEOF.legenda = { |
758 | 759 | i3GEOF.legenda.aposAlterarLegenda(); |
759 | 760 | i3GEOF.legenda.aguarde.visibility = "hidden"; |
760 | 761 | }; |
761 | - p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=alteraclasses&ext="+i3GEO.parametros.mapexten; | |
762 | + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); | |
763 | + p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=alteraclasses&ext="+ext; | |
762 | 764 | cp = new cpaint(); |
763 | 765 | cp.set_transfer_mode('POST'); |
764 | 766 | cp.set_response_type("JSON"); |
... | ... | @@ -820,7 +822,8 @@ i3GEOF.legenda = { |
820 | 822 | adicionaClasse: function(){ |
821 | 823 | if(i3GEOF.legenda.aguarde.visibility === "visible") |
822 | 824 | {return;} |
823 | - 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, | |
825 | + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); | |
826 | + var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=adicionaclasse"+"&tema="+i3GEOF.legenda.tema+"&ext="+ext, | |
824 | 827 | cp = new cpaint(); |
825 | 828 | cp.set_response_type("JSON"); |
826 | 829 | cp.call(p,"alteraclasse",i3GEOF.legenda.mostralegenda); |
... | ... | @@ -842,7 +845,8 @@ i3GEOF.legenda = { |
842 | 845 | }; |
843 | 846 | if(i3GEOF.legenda.aguarde.visibility === "visible") |
844 | 847 | {return;} |
845 | - 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, | |
848 | + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); | |
849 | + var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&opcao=adicionaopacidade"+"&tema="+i3GEOF.legenda.tema+"&ext="+ext, | |
846 | 850 | cp = new cpaint(); |
847 | 851 | cp.set_response_type("JSON"); |
848 | 852 | cp.call(p,"alteraclasse",retorna); |
... | ... | @@ -1018,7 +1022,8 @@ i3GEOF.legenda = { |
1018 | 1022 | if(i3GEOF.legenda.aguarde.visibility === "visible") |
1019 | 1023 | {return;} |
1020 | 1024 | i3GEOF.legenda.aguarde.visibility = "visible"; |
1021 | - 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, | |
1025 | + var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); | |
1026 | + var p = i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?g_sid="+i3GEO.configura.sid+"&funcao=alteraclasse&tema="+i3GEOF.legenda.tema+"&opcao=simbolounico&ext="+ext, | |
1022 | 1027 | cp = new cpaint(), |
1023 | 1028 | fim = function(){ |
1024 | 1029 | i3GEOF.legenda.aposAlterarLegenda(); |
... | ... | @@ -1050,11 +1055,12 @@ i3GEOF.legenda = { |
1050 | 1055 | i3GEOF.legenda.aguarde.visibility = "hidden"; |
1051 | 1056 | }; |
1052 | 1057 | if($i("i3GEOFlegendaaplicaextent").checked === true){ |
1053 | - p += "&ext="+i3GEO.parametros.mapexten; | |
1058 | + p += "&ext="+i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); | |
1054 | 1059 | } |
1055 | 1060 | else{ |
1056 | - p += "&ext="+i3GEO.parametros.extentTotal; | |
1061 | + p += "&ext="+i3GEO.util.extOSM2Geo(i3GEO.parametros.extentTotal); | |
1057 | 1062 | } |
1063 | + | |
1058 | 1064 | if (item == "") |
1059 | 1065 | {i3GEO.janela.tempoMsg($trad(81,i3GEOF.legenda.dicionario));return;} |
1060 | 1066 | i3GEOF.legenda.aguarde.visibility = "visible"; |
... | ... | @@ -1079,7 +1085,8 @@ i3GEOF.legenda = { |
1079 | 1085 | {return;} |
1080 | 1086 | var item = $i("i3GEOlegendaSelItem").value, |
1081 | 1087 | nclasses = $i("i3GEOlegendanclasses").value, |
1082 | - 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, | |
1088 | + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten), | |
1089 | + 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, | |
1083 | 1090 | cp = new cpaint(), |
1084 | 1091 | fim = function(){ |
1085 | 1092 | i3GEOF.legenda.aposAlterarLegenda(); |
... | ... | @@ -1107,7 +1114,8 @@ i3GEOF.legenda = { |
1107 | 1114 | if(i3GEOF.legenda.aguarde.visibility === "visible") |
1108 | 1115 | {return;} |
1109 | 1116 | var item = $i("i3GEOlegendaSelItem").value, |
1110 | - 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, | |
1117 | + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten), | |
1118 | + 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, | |
1111 | 1119 | cp = new cpaint(); |
1112 | 1120 | fim = function(){ |
1113 | 1121 | i3GEOF.legenda.aposAlterarLegenda(); |
... | ... | @@ -1136,7 +1144,8 @@ i3GEOF.legenda = { |
1136 | 1144 | {return;} |
1137 | 1145 | var item = $i("i3GEOlegendaSelItem").value, |
1138 | 1146 | nclasses = $i("i3GEOlegendanclasses").value, |
1139 | - 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, | |
1147 | + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten), | |
1148 | + 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, | |
1140 | 1149 | cp = new cpaint(), |
1141 | 1150 | fim = function(){ |
1142 | 1151 | i3GEOF.legenda.aposAlterarLegenda(); |
... | ... | @@ -1165,7 +1174,8 @@ i3GEOF.legenda = { |
1165 | 1174 | {return;} |
1166 | 1175 | var item = $i("i3GEOlegendaSelItem").value, |
1167 | 1176 | nclasses = $i("i3GEOlegendanclasses").value, |
1168 | - 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, | |
1177 | + ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten), | |
1178 | + 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, | |
1169 | 1179 | cp = new cpaint(), |
1170 | 1180 | fim = function(){ |
1171 | 1181 | i3GEOF.legenda.aposAlterarLegenda(); | ... | ... |
ferramentas/nptpol/index.js
... | ... | @@ -204,6 +204,7 @@ i3GEOF.nptpol = { |
204 | 204 | {ext = i3GEO.Interface.googlemaps.bbox();} |
205 | 205 | else |
206 | 206 | {ext = i3GEO.parametros.mapexten;} |
207 | + ext = i3GEO.util.extOSM2Geo(ext); | |
207 | 208 | 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; |
208 | 209 | p += "&somaritem="+somaritem; |
209 | 210 | cp = new cpaint(); | ... | ... |