-
+
{{{escolhatipo}}} :
@@ -187,7 +187,7 @@
-
+
{{{seescolher}}}
diff --git a/ferramentas/inserexy2/index.js b/ferramentas/inserexy2/index.js
index 776f4ab..c824789 100755
--- a/ferramentas/inserexy2/index.js
+++ b/ferramentas/inserexy2/index.js
@@ -159,7 +159,7 @@ i3GEOF.inserexy = {
cabecalho,
minimiza,
"",
- false,
+ true,
"",
"",
"",
@@ -278,7 +278,7 @@ i3GEOF.inserexy = {
if (retorno.data != undefined){
var ins = [],i;
for (i=0;i
"+retorno.data[i].x+" "+retorno.data[i].y+" ");}
+ {ins.push("
"+retorno.data[i].x+" "+retorno.data[i].y+"
");}
$i("i3GEOinserexyguia6obj").innerHTML = ins.join("");
}
else
@@ -338,7 +338,7 @@ i3GEOF.inserexy = {
xsv = xsv.replace(regv,".");
direcao = i3GEO.calculo.dms2dd(xgv,xmv,xsv);
//pega o último ponto
- divs = $i("i3GEOinserexyguia6obj").getElementsByTagName("div");
+ divs = $i("i3GEOinserexyguia6obj").getElementsByClassName("i3GEOinserexyguia6obj");
divs = divs[divs.length - 1];
divs = divs.innerHTML.split(" ");
x = divs[0];
@@ -453,8 +453,9 @@ i3GEOF.inserexy = {
*/
adiciona: function(xy,fonte){
- if(i3GEOF.inserexy.aguarde.visibility === "visible")
- {return;}
+ if(i3GEOF.inserexy.aguarde.visibility === "visible"){
+ return;
+ }
var tema,
item = "",
valoritem = "",
@@ -472,7 +473,7 @@ i3GEOF.inserexy = {
n = xyn.length;
temp = "";
for(i=0;i" + xyn[i]+" "+xyn[i+1] + "";
+ temp += "
" + xyn[i]+" "+xyn[i+1] + "
";
}
$i("i3GEOinserexyguia6obj").innerHTML += temp;
if($i("i3GEOinserexyItem") && $i("i3GEOinserexyvalorItem")){
@@ -554,7 +555,7 @@ i3GEOF.inserexy = {
{return;}
i3GEOF.inserexy.aguarde.visibility = "visible";
try{
- var divs = $i("i3GEOinserexyguia6obj").getElementsByTagName("div"),
+ var divs = $i("i3GEOinserexyguia6obj").getElementsByClassName("pontosInseridos"),
n = divs.length,
xy = [],
cp = new cpaint(),
@@ -562,9 +563,9 @@ i3GEOF.inserexy = {
mostra = function(retorno){
i3GEOF.inserexy.aguarde.visibility = "hidden";
if (retorno.data !== undefined){
- var ins = "
";
- ins += "
";
- ins += "
";
+ var ins = "
";
+ ins += "
";
+ ins += "
";
$i("i3GEOinserexywktres").innerHTML = "
"+ins+"
";
}
else
@@ -584,28 +585,26 @@ i3GEOF.inserexy = {
Cria um gráfico de perfil com base nos dados inseridos
*/
graficoPerfil: function(){
- try{
- var divs = $i("i3GEOinserexyguia6obj").getElementsByTagName("div"),
- js = i3GEO.configura.locaplic+"/ferramentas/perfil/index.js.php",
- n = divs.length,
- x = [],
- y = [],
- xy,
- i;
- for (i=0;i
*/
criaPerfil: function(){
- try{
- if(i3GEOF.perfil.aguarde.visibility === "visible")
- {return;}
+ if(i3GEOF.perfil.aguarde.visibility === "visible"){
+ return;
+ }
var fim = function(retorno){
i3GEOF.perfil.aguarde.visibility = "hidden";
- if (retorno.data === undefined )
- {$i("i3GEOperfilfim").innerHTML = "Erro.";return;}
+ if (retorno.data === undefined ){
+ //$i("i3GEOperfilfim").innerHTML = "Erro.";
+ return;
+ }
else{
- if(retorno.data.status != "OK")
- {$i("i3GEOperfilfim").innerHTML = $trad('erroServico',i3GEOF.perfil.dicionario);return;}
+ if(retorno.data.status != "OK"){
+ $i("i3GEOperfilfim").innerHTML = $trad('erroServico',i3GEOF.perfil.dicionario);
+ return;
+ }
i3GEOF.perfil.converteDados(retorno.data.results);
if(!$i("i3GEOF.graficointerativo1_script")){
var js = i3GEO.configura.locaplic+"/ferramentas/graficointerativo1/dependencias.php";
@@ -189,7 +188,6 @@ i3GEOF.perfil = {
if($i("i3GEOFperfilFonteGoogle").checked === true && i3GEO.Interface.ATUAL !== "googlemaps"){
i3GEO.navega.dialogo.google(i3GEOF.perfil.listaPontos(true).split(","));
}
-
}
};
if($i("i3GEOFperfilFonteGoogle").checked === true){
@@ -206,9 +204,6 @@ i3GEOF.perfil = {
i3GEOF.perfil.aguarde.visibility = "visible";
i3GEO.php.dadosPerfilRelevo(fim,$i("i3GEOFperfilTemasSel").value,pontos,$i("i3GEOFperfilAmostragem").value,$i("i3GEOFperfilComboItens").value);
}
-
- }
- catch(e){$i("i3GEOperfilfim").innerHTML = "Erro. "+e;i3GEO.janela.fechaAguarde();i3GEOF.perfil.aguarde.visibility = "hidden";}
},
/*
Function: iniciaGrafico
@@ -291,8 +286,13 @@ i3GEOF.perfil = {
"i3GEOFperfilComboItens",
i3GEO.temaAtivo,
function(retorno){
- $i("i3GEOFperfilDivComboItens").innerHTML = "
"+$trad('itemValores',i3GEOF.perfil.dicionario)+"
"+retorno.dados+"
";
- }
+ $i("i3GEOFperfilDivComboItens").innerHTML = retorno.dados;
+ },
+ "",
+ "",
+ "",
+ "",
+ "form-control"
);
}
else
@@ -308,7 +308,10 @@ i3GEOF.perfil = {
"",
false,
"ligados",
- "display:block"
+ "",
+ false,
+ true,
+ "form-control"
);
}
};
diff --git a/ferramentas/perfil/template_mst.html b/ferramentas/perfil/template_mst.html
index ef4bde8..7e076ec 100755
--- a/ferramentas/perfil/template_mst.html
+++ b/ferramentas/perfil/template_mst.html
@@ -1,19 +1,31 @@
-{{{fonteDadosZ}}}
-
-
-
-
{{{ouTemaMapa}}}
-
-
-
-
-
-{{{numeroPontosLinha}}}
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/js/compactados/ajuda_compacto.js b/js/compactados/ajuda_compacto.js
old mode 100644
new mode 100755
index 8e4086f..8e4086f
--- a/js/compactados/ajuda_compacto.js
+++ b/js/compactados/ajuda_compacto.js
diff --git a/js/compactados/analise_compacto.js b/js/compactados/analise_compacto.js
old mode 100644
new mode 100755
index 91868c6..91868c6
--- a/js/compactados/analise_compacto.js
+++ b/js/compactados/analise_compacto.js
diff --git a/js/compactados/arvoredecamadas_compacto.js b/js/compactados/arvoredecamadas_compacto.js
old mode 100644
new mode 100755
index 116e61c..116e61c
--- a/js/compactados/arvoredecamadas_compacto.js
+++ b/js/compactados/arvoredecamadas_compacto.js
diff --git a/js/compactados/arvoredetemas_compacto.js b/js/compactados/arvoredetemas_compacto.js
old mode 100644
new mode 100755
index 192e851..192e851
--- a/js/compactados/arvoredetemas_compacto.js
+++ b/js/compactados/arvoredetemas_compacto.js
diff --git a/js/compactados/base64_compacto.js b/js/compactados/base64_compacto.js
old mode 100644
new mode 100755
index 9ff1f1a..9ff1f1a
--- a/js/compactados/base64_compacto.js
+++ b/js/compactados/base64_compacto.js
diff --git a/js/compactados/busca_compacto.js b/js/compactados/busca_compacto.js
old mode 100644
new mode 100755
index 380c4a5..380c4a5
--- a/js/compactados/busca_compacto.js
+++ b/js/compactados/busca_compacto.js
diff --git a/js/compactados/caixaDeFerramentas_compacto.js b/js/compactados/caixaDeFerramentas_compacto.js
old mode 100644
new mode 100755
index 33f12c4..33f12c4
--- a/js/compactados/caixaDeFerramentas_compacto.js
+++ b/js/compactados/caixaDeFerramentas_compacto.js
diff --git a/js/compactados/calculo_compacto.js b/js/compactados/calculo_compacto.js
old mode 100644
new mode 100755
index 32b90de..32b90de
--- a/js/compactados/calculo_compacto.js
+++ b/js/compactados/calculo_compacto.js
diff --git a/js/compactados/catalogoDir_compacto.js b/js/compactados/catalogoDir_compacto.js
old mode 100644
new mode 100755
index f414552..f414552
--- a/js/compactados/catalogoDir_compacto.js
+++ b/js/compactados/catalogoDir_compacto.js
diff --git a/js/compactados/catalogoEstrelas_compacto.js b/js/compactados/catalogoEstrelas_compacto.js
old mode 100644
new mode 100755
index 7d8e059..7d8e059
--- a/js/compactados/catalogoEstrelas_compacto.js
+++ b/js/compactados/catalogoEstrelas_compacto.js
diff --git a/js/compactados/catalogoInde_compacto.js b/js/compactados/catalogoInde_compacto.js
old mode 100644
new mode 100755
index 5ee129b..5ee129b
--- a/js/compactados/catalogoInde_compacto.js
+++ b/js/compactados/catalogoInde_compacto.js
diff --git a/js/compactados/catalogoMapas_compacto.js b/js/compactados/catalogoMapas_compacto.js
old mode 100644
new mode 100755
index 670e4ce..670e4ce
--- a/js/compactados/catalogoMapas_compacto.js
+++ b/js/compactados/catalogoMapas_compacto.js
diff --git a/js/compactados/catalogoMenus_compacto.js b/js/compactados/catalogoMenus_compacto.js
old mode 100644
new mode 100755
index 7014248..7014248
--- a/js/compactados/catalogoMenus_compacto.js
+++ b/js/compactados/catalogoMenus_compacto.js
diff --git a/js/compactados/catalogoMetaestat_compacto.js b/js/compactados/catalogoMetaestat_compacto.js
old mode 100644
new mode 100755
index 179aa3e..179aa3e
--- a/js/compactados/catalogoMetaestat_compacto.js
+++ b/js/compactados/catalogoMetaestat_compacto.js
diff --git a/js/compactados/catalogoOgc_compacto.js b/js/compactados/catalogoOgc_compacto.js
old mode 100644
new mode 100755
index ffce5a9..ffce5a9
--- a/js/compactados/catalogoOgc_compacto.js
+++ b/js/compactados/catalogoOgc_compacto.js
diff --git a/js/compactados/catalogoRegioes_compacto.js b/js/compactados/catalogoRegioes_compacto.js
old mode 100644
new mode 100755
index 404db8e..404db8e
--- a/js/compactados/catalogoRegioes_compacto.js
+++ b/js/compactados/catalogoRegioes_compacto.js
diff --git a/js/compactados/catalogoSistemas_compacto.js b/js/compactados/catalogoSistemas_compacto.js
old mode 100644
new mode 100755
index 9245cfc..9245cfc
--- a/js/compactados/catalogoSistemas_compacto.js
+++ b/js/compactados/catalogoSistemas_compacto.js
diff --git a/js/compactados/configura_compacto.js b/js/compactados/configura_compacto.js
old mode 100644
new mode 100755
index e3d6fe5..e3d6fe5
--- a/js/compactados/configura_compacto.js
+++ b/js/compactados/configura_compacto.js
diff --git a/js/compactados/coordenadas_compacto.js b/js/compactados/coordenadas_compacto.js
old mode 100644
new mode 100755
index 404bf09..404bf09
--- a/js/compactados/coordenadas_compacto.js
+++ b/js/compactados/coordenadas_compacto.js
diff --git a/js/compactados/desenho_compacto.js b/js/compactados/desenho_compacto.js
old mode 100644
new mode 100755
index 0906ae5..0906ae5
--- a/js/compactados/desenho_compacto.js
+++ b/js/compactados/desenho_compacto.js
diff --git a/js/compactados/dicionario_ajuda_compacto.js b/js/compactados/dicionario_ajuda_compacto.js
old mode 100644
new mode 100755
index e69de29..e69de29
--- a/js/compactados/dicionario_ajuda_compacto.js
+++ b/js/compactados/dicionario_ajuda_compacto.js
diff --git a/js/compactados/dicionario_compacto.js b/js/compactados/dicionario_compacto.js
old mode 100644
new mode 100755
index ec6d4d9..ec6d4d9
--- a/js/compactados/dicionario_compacto.js
+++ b/js/compactados/dicionario_compacto.js
diff --git a/js/compactados/editor_compacto.js b/js/compactados/editor_compacto.js
old mode 100644
new mode 100755
index c77bc37..c77bc37
--- a/js/compactados/editor_compacto.js
+++ b/js/compactados/editor_compacto.js
diff --git a/js/compactados/eventos_compacto.js b/js/compactados/eventos_compacto.js
old mode 100644
new mode 100755
index cda2a72..cda2a72
--- a/js/compactados/eventos_compacto.js
+++ b/js/compactados/eventos_compacto.js
diff --git a/js/compactados/guias_compacto.js b/js/compactados/guias_compacto.js
old mode 100644
new mode 100755
index d0c1361..d0c1361
--- a/js/compactados/guias_compacto.js
+++ b/js/compactados/guias_compacto.js
diff --git a/js/compactados/idioma_compacto.js b/js/compactados/idioma_compacto.js
old mode 100644
new mode 100755
index 50f94a7..50f94a7
--- a/js/compactados/idioma_compacto.js
+++ b/js/compactados/idioma_compacto.js
diff --git a/js/compactados/ini_i3geo_compacto.js b/js/compactados/ini_i3geo_compacto.js
old mode 100644
new mode 100755
index 969d7eb..969d7eb
--- a/js/compactados/ini_i3geo_compacto.js
+++ b/js/compactados/ini_i3geo_compacto.js
diff --git a/js/compactados/interface_compacto.js b/js/compactados/interface_compacto.js
old mode 100644
new mode 100755
index 7cfd6ad..7cfd6ad
--- a/js/compactados/interface_compacto.js
+++ b/js/compactados/interface_compacto.js
diff --git a/js/compactados/janela_compacto.js b/js/compactados/janela_compacto.js
old mode 100644
new mode 100755
index 2167208..2167208
--- a/js/compactados/janela_compacto.js
+++ b/js/compactados/janela_compacto.js
diff --git a/js/compactados/legenda_compacto.js b/js/compactados/legenda_compacto.js
old mode 100644
new mode 100755
index 864b4a9..864b4a9
--- a/js/compactados/legenda_compacto.js
+++ b/js/compactados/legenda_compacto.js
diff --git a/js/compactados/login_compacto.js b/js/compactados/login_compacto.js
old mode 100644
new mode 100755
index 6d4d052..6d4d052
--- a/js/compactados/login_compacto.js
+++ b/js/compactados/login_compacto.js
diff --git a/js/compactados/mapa_compacto.js b/js/compactados/mapa_compacto.js
old mode 100644
new mode 100755
index 3e572c5..3e572c5
--- a/js/compactados/mapa_compacto.js
+++ b/js/compactados/mapa_compacto.js
diff --git a/js/compactados/maparef_compacto.js b/js/compactados/maparef_compacto.js
old mode 100644
new mode 100755
index f1b84cd..f1b84cd
--- a/js/compactados/maparef_compacto.js
+++ b/js/compactados/maparef_compacto.js
diff --git a/js/compactados/marcador_compacto.js b/js/compactados/marcador_compacto.js
old mode 100644
new mode 100755
index 64fd288..64fd288
--- a/js/compactados/marcador_compacto.js
+++ b/js/compactados/marcador_compacto.js
diff --git a/js/compactados/mustache.js b/js/compactados/mustache.js
old mode 100644
new mode 100755
index 7473a81..7473a81
--- a/js/compactados/mustache.js
+++ b/js/compactados/mustache.js
diff --git a/js/compactados/navega_compacto.js b/js/compactados/navega_compacto.js
old mode 100644
new mode 100755
index 222b2f9..222b2f9
--- a/js/compactados/navega_compacto.js
+++ b/js/compactados/navega_compacto.js
diff --git a/js/compactados/php_compacto.js b/js/compactados/php_compacto.js
old mode 100644
new mode 100755
index 58ebcf5..58ebcf5
--- a/js/compactados/php_compacto.js
+++ b/js/compactados/php_compacto.js
diff --git a/js/compactados/plugini3geo_compacto.js b/js/compactados/plugini3geo_compacto.js
old mode 100644
new mode 100755
index 85e2916..85e2916
--- a/js/compactados/plugini3geo_compacto.js
+++ b/js/compactados/plugini3geo_compacto.js
diff --git a/js/compactados/proj4js.js b/js/compactados/proj4js.js
old mode 100644
new mode 100755
index 9bdc4ce..9bdc4ce
--- a/js/compactados/proj4js.js
+++ b/js/compactados/proj4js.js
diff --git a/js/compactados/social_compacto.js b/js/compactados/social_compacto.js
old mode 100644
new mode 100755
index 8aa672a..8aa672a
--- a/js/compactados/social_compacto.js
+++ b/js/compactados/social_compacto.js
diff --git a/js/compactados/tema_compacto.js b/js/compactados/tema_compacto.js
old mode 100644
new mode 100755
index 464e123..464e123
--- a/js/compactados/tema_compacto.js
+++ b/js/compactados/tema_compacto.js
diff --git a/js/compactados/util_compacto.js b/js/compactados/util_compacto.js
old mode 100644
new mode 100755
index b0a092b..b0a092b
--- a/js/compactados/util_compacto.js
+++ b/js/compactados/util_compacto.js
diff --git a/js/compactados/wicket.js b/js/compactados/wicket.js
old mode 100644
new mode 100755
index e0e5f3b..e0e5f3b
--- a/js/compactados/wicket.js
+++ b/js/compactados/wicket.js
diff --git a/js/i3geo_tudo_compacto7.js.php b/js/i3geo_tudo_compacto7.js.php
old mode 100644
new mode 100755
index 7de5b15..7de5b15
--- a/js/i3geo_tudo_compacto7.js.php
+++ b/js/i3geo_tudo_compacto7.js.php
diff --git a/pacotes/cpaint/cpaint2_compacto.inc.js b/pacotes/cpaint/cpaint2_compacto.inc.js
old mode 100644
new mode 100755
index 1179423..1179423
--- a/pacotes/cpaint/cpaint2_compacto.inc.js
+++ b/pacotes/cpaint/cpaint2_compacto.inc.js
diff --git a/pacotes/mobileesp/mdetect_compacto.js b/pacotes/mobileesp/mdetect_compacto.js
old mode 100644
new mode 100755
index 9ab0db5..9ab0db5
--- a/pacotes/mobileesp/mdetect_compacto.js
+++ b/pacotes/mobileesp/mdetect_compacto.js
diff --git a/pacotes/yui290/build/carousel/carousel_compacto.js b/pacotes/yui290/build/carousel/carousel_compacto.js
old mode 100644
new mode 100755
index 2111cd6..2111cd6
--- a/pacotes/yui290/build/carousel/carousel_compacto.js
+++ b/pacotes/yui290/build/carousel/carousel_compacto.js
diff --git a/pacotes/yui290/build/container/container_compacto.js b/pacotes/yui290/build/container/container_compacto.js
old mode 100644
new mode 100755
index aa7fb0c..aa7fb0c
--- a/pacotes/yui290/build/container/container_compacto.js
+++ b/pacotes/yui290/build/container/container_compacto.js
diff --git a/pacotes/yui290/build/container/container_core_compacto.js b/pacotes/yui290/build/container/container_core_compacto.js
old mode 100644
new mode 100755
index f2c2d3c..f2c2d3c
--- a/pacotes/yui290/build/container/container_core_compacto.js
+++ b/pacotes/yui290/build/container/container_core_compacto.js
diff --git a/pacotes/yui290/build/resize/resize_compacto.js b/pacotes/yui290/build/resize/resize_compacto.js
old mode 100644
new mode 100755
index 335f70f..335f70f
--- a/pacotes/yui290/build/resize/resize_compacto.js
+++ b/pacotes/yui290/build/resize/resize_compacto.js
diff --git a/pacotes/yui290/build/treeview/treeview_compacto.js b/pacotes/yui290/build/treeview/treeview_compacto.js
old mode 100644
new mode 100755
index 6ff4374..6ff4374
--- a/pacotes/yui290/build/treeview/treeview_compacto.js
+++ b/pacotes/yui290/build/treeview/treeview_compacto.js
diff --git a/pacotes/yui290/build/utilities/utilities_compacto.js b/pacotes/yui290/build/utilities/utilities_compacto.js
old mode 100644
new mode 100755
index 7a1455c..7a1455c
--- a/pacotes/yui290/build/utilities/utilities_compacto.js
+++ b/pacotes/yui290/build/utilities/utilities_compacto.js
--
libgit2 0.21.2