diff --git a/admin/js/core.js b/admin/js/core.js index 1158771..e002454 100644 --- a/admin/js/core.js +++ b/admin/js/core.js @@ -1543,7 +1543,16 @@ function core_listaDeLetras(onde,nomeFuncao){ if(onde != ""){ o = document.getElementById(onde); if(o){ - o.innerHTML = ins; + o.innerHTML = "
Iniciais: ou
"+ins+"
"; + document.getElementById("forminiciais").onsubmit = function(){ + var v = document.getElementById("iniciaisLetras").value; + i3GEO.util.insereCookie("I3GEOletraAdmin", v); + eval(nomeFuncao+"('"+v+"');"); + return false; + }; + document.getElementById("_listaDeLetras").onclick = function(){ + document.getElementById("iniciaisLetras").value = letraAtual; + }; } } else{ diff --git a/admin/php/editortexto.php b/admin/php/editortexto.php index 809c9b2..ded1993 100644 --- a/admin/php/editortexto.php +++ b/admin/php/editortexto.php @@ -93,7 +93,7 @@ function filtraLetra(letra) { function comboMapfiles(){ var n = $mapfiles.length, i,ins; - ins = ""; for(i=0;i"+$mapfiles[i].codigo+" - "+$mapfiles[i].nome+""; @@ -101,6 +101,7 @@ function comboMapfiles(){ } ins += ""; $i("comboMapfiles").innerHTML = ins; + $i("selectComboMapfile").value = ""; }; core_pegaMapfiles("comboMapfiles()",letraAtual,""); function mudaMapfile(obj){ diff --git a/admin/php/menutemas.php b/admin/php/menutemas.php index 6466f99..aa64b9d 100644 --- a/admin/php/menutemas.php +++ b/admin/php/menutemas.php @@ -1230,8 +1230,7 @@ function listaMapsTemas() $file = str_replace(".".$extensao,"",$file); if(isset($letra) && $letra != "") { - if(strtolower(substr(basename($file),0,1)) == strtolower($letra)) - { + if(strtolower(substr(basename($file),0,strlen($letra))) == strtolower($letra)){ $arquivos[] = array("nome"=>$file,"extensao"=>$extensao); } } diff --git a/mashups/openlayers.php b/mashups/openlayers.php index cd036b9..5b47a14 100644 --- a/mashups/openlayers.php +++ b/mashups/openlayers.php @@ -151,35 +151,26 @@ if($temas != ""){ } } if($nomeMap != ""){ - - if(empty($layers)){ - $layers = array(); - $maptemp = @ms_newMapObj($nomeMap); + $layers = array(); + $maptemp = @ms_newMapObj($nomeMap); + if($maptemp){ for($i=0;$i<($maptemp->numlayers);++$i) { $layern = $maptemp->getLayer($i); $layers[] = $layern->name; } $nomeLayer = implode(",",$layers); $tituloLayer = $layern->getmetadata("tema"); - } - else{ - $nomeLayer = str_replace(" ",",",$layers); - $layers = explode(",",$layers); - $maptemp = @ms_newMapObj($nomeMap); - //$temp = explode(",",$layers); - $layern = $maptemp->getLayerByName($layers[0]); - $tituloLayer = $layern->getmetadata("tema"); - } - $ebase = "false"; - if(isset($fundo) && $fundo != ""){ - if(in_array($tema,$fundo)){ - $ebase = "true"; + $ebase = "false"; + if(isset($fundo) && $fundo != ""){ + if(in_array($tema,$fundo)){ + $ebase = "true"; + } } + $visivel = "false"; + if(in_array($tema,$visiveis)) + {$visivel = "true";} + $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})'; } - $visivel = "false"; - if(in_array($tema,$visiveis)) - {$visivel = "true";} - $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})'; } else {echo $tema." não foi encontrado.
";} diff --git a/temas/_wbiomashp.map b/temas/_wbiomashp.map index 22e9a0d..532eb07 100644 --- a/temas/_wbiomashp.map +++ b/temas/_wbiomashp.map @@ -1,6 +1,6 @@ -MAP - FONTSET "../symbols/fontes.txt" - SYMBOLSET "../symbols/simbolos.sym" +MAP + FONTSET "../symbols/fontes.txt" + SYMBOLSET "../symbols/simbolos.sym" LAYER CONNECTION "" DATA "c:\ms4w\apache\htdocs\i3geo\aplicmap\dados\biomas.shp" -- libgit2 0.21.2