Download as
Browse Code »

Commit b675796ec7a916e9cc61739fee8a6e837bef7d88

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

Correção na listagem das classes e acentuação no editor de mapfiles

Showing 4 changed files with 29 additions and 17 deletions   Show diff stats
admin/admin.db
View file @b675796
No preview for this file type
admin/js/editormapfile.js
  Diff comments   View file @b675796
... ... @@ -614,12 +614,16 @@ function salvarDadosEditorPlugin(onde,plugin,codigoMap,codigoLayer){
614 614 par = [],
615 615 prog = "../php/editormapfile.php?funcao=gravaPlugin",
616 616 i;
617   -
618   - for(i=0; i<n; i++){
619   - par.push('"'+campos[i].name+'":"'+campos[i].value+'"');
  617 + if(!i3GEO.pluginI3geo[plugin].parametrosFormAdmin){
  618 + for(i=0; i<n; i++){
  619 + par.push('"'+campos[i].name+'":"'+campos[i].value+'"');
  620 + }
  621 + if(plugin != ""){
  622 + plugin = '{"plugin":"'+plugin+'","parametros":{' + par.join(",") + '}}';
  623 + }
620 624 }
621   - if(plugin != ""){
622   - plugin = '{"plugin":"'+plugin+'","parametros":{' + par.join(",") + '}}';
  625 + else{
  626 + plugin = i3GEO.pluginI3geo[plugin].parametrosFormAdmin(onde);
623 627 }
624 628 core_carregando("ativa");
625 629 core_carregando(" gravando o registro do layer= "+codigoLayer);
... ...
admin/js/editormapfile_classes.js
  Diff comments   View file @b675796
... ... @@ -41,7 +41,7 @@ function conteudoNoClasse(codigoMap,codigoLayer,indice,nome){
41 41 var conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"sobeDesce('sobe','classe','"+codigoMap+"','"+codigoLayer+"','"+indice+"')\" title=sobe src=\"../imagens/34.png\" />";
42 42 conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"sobeDesce('desce','classe','"+codigoMap+"','"+codigoLayer+"','"+indice+"')\" title=desce src=\"../imagens/33.png\" />";
43 43 conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluirClasse('"+codigoMap+"','"+codigoLayer+"','"+indice+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />&nbsp;<span>"+indice+" "+i3GEO.util.base64decode(nome)+"</span>";
44   - var d = {classes:codigoMap+"_"+codigoLayer,html:conteudo,id:codigoMap+"_"+codigoLayer+"_"+indice,codigoMap:codigoMap,codigoLayer:codigoLayer,indiceClasse:indice};
  44 + var d = {type:'html',classes:codigoMap+"_"+codigoLayer,html:conteudo,id:codigoMap+"_"+codigoLayer+"_"+indice,codigoMap:codigoMap,codigoLayer:codigoLayer,indiceClasse:indice};
45 45 return d;
46 46 }
47 47 function montaParametrosClasses(no,dados,redesenha)
... ... @@ -156,19 +156,25 @@ function classesAuto(codigoMap,codigoLayer)
156 156 var callback2 = {
157 157 success:function(o) {
158 158 try {
159   - var nos = tree.getNodesByProperty("classes",codigoMap+"_"+codigoLayer);
160   - /*
161   - var dados = YAHOO.lang.JSON.parse(o.responseText);
162   -
  159 + var n,tempNode,d,i,nos = tree.getNodeByProperty("etiquetaClasses",codigoMap+"_"+codigoLayer);
163 160 if(nos){
164   - for (var i=0, j=nos.length; i<j; i++)
165   - {tree.removeNode(nos[i],false);}
  161 + n = nos.children.length;
  162 + for (i=3; i<n; i++){
  163 + tree.removeNode(nos.children[3],true);
  164 + }
  165 + }
  166 + //tree.draw();
  167 + var dados = YAHOO.lang.JSON.parse(o.responseText);
  168 + n = dados.length;
  169 + for (i=0; i < n; i++) {
  170 + d = conteudoNoClasse(codigoMap,codigoLayer,dados[i].indice,dados[i].nome);
  171 + tempNode = new YAHOO.widget.HTMLNode(d,nos, false,true);
  172 + tempNode.setDynamicLoad(loadClasseData, iconMode);
  173 + tempNode.isLeaf = false;
  174 + tempNode.enableHighlight = false;
166 175 }
167   - tree.draw();
168   - var no = tree.getNodeByProperty("etiquetaClasses",codigoMap+"_"+codigoLayer);
169   - */
170 176 nos.refresh();
171   - //montaParametrosTemas(no,dados);
  177 + tree.draw();
172 178 core_carregando("desativa");
173 179 YAHOO.admin.container.panelEditorAutoClasses.destroy();
174 180 YAHOO.admin.container.panelEditorAutoClasses = null;
... ...
admin/php/editormapfile.php
  Diff comments   View file @b675796
... ... @@ -137,6 +137,7 @@ switch (strtoupper($funcao))
137 137 retornaJSON($layer->getmetadata("PLUGINI3GEO"));
138 138 break;
139 139 case "GRAVAPLUGIN":
  140 + //echo $plugin;exit;
140 141 $mapfile = $locaplic."/temas/".$codigoMap.".map";
141 142 $mapa = ms_newMapObj($mapfile);
142 143 $layer = $mapa->getlayerbyname($codigoLayer);
... ... @@ -1485,7 +1486,8 @@ function listaClasses()
1485 1486 for($i=0;$i<$nclasses;++$i)
1486 1487 {
1487 1488 $classe = $layer->getclass($i);
1488   - $dados[] = array("indice"=>$i,"nome"=>base64_encode((mb_convert_encoding($classe->name,"UTF-8","ISO-8859-1"))));
  1489 + $texto = $classe->name;
  1490 + $dados[] = array("indice"=>$i,"nome"=>base64_encode($texto));
1489 1491 }
1490 1492 return $dados;
1491 1493 }
... ...