Download as
Browse Code »

Commit 2a21b3b09e8d0a47c4b84988438ee02b38d8edc5

Authored by Edmar Moretti
1 parent 33fe7d7e
Exists in master and in 6 other branches composer, doc-root, guia, licenca, readme, unmaintened

Correção na ferramenta de conexão com WMS

Showing 6 changed files with 26 additions and 20 deletions   Show diff stats
classesphp/wmswfs.php
  Diff comments   View file @2a21b3b
... ... @@ -588,7 +588,7 @@ function imprimeEstilos($es, $suporta, $retorna, $tval, $tituloalternativo) {
588 588 $nomeestilo = $e ["nome"];
589 589 $nomecamada = $e ["titulo"];
590 590 $tituloestilo = $e ["titulo"];
591   - $onclick = "seltema(\"estilo\",\"" . $tval . "\",\"\",\"" . $nomeestilo . "\",\"" . $tituloalternativo . " " . $nomecamada . " " . $tituloestilo . "\",\"" . $suporta . "\")";
  591 + $onclick = "i3GEOF.conectarwms.seltema(\"estilo\",\"" . $tval . "\",\"\",\"" . $nomeestilo . "\",\"" . $tituloalternativo . " " . $nomecamada . " " . $tituloestilo . "\",\"" . $suporta . "\")";
592 592  
593 593 $retorna [] = <<<EOT
594 594 <div class="list-group condensed">
... ... @@ -611,7 +611,7 @@ EOT;
611 611 return $retorna;
612 612 }
613 613 function imprimeEstilos2($camada1, $titulocamada1, $suporta) {
614   - $onclick = "seltema(\"tema\",\"" . $camada1 . "\",\"\",\"default\",\"" . $camada1 . " " . $titulocamada1 . "\",\"" . $suporta . "\")";
  614 + $onclick = "i3GEOF.conectarwms.seltema(\"tema\",\"" . $camada1 . "\",\"\",\"default\",\"" . $camada1 . " " . $titulocamada1 . "\",\"" . $suporta . "\")";
615 615 $retorna = <<<EOT
616 616 <div class="list-group condensed">
617 617 <div class="row-content text-left">
... ... @@ -758,7 +758,7 @@ function temaswfs() {
758 758 foreach ( $vs as $v ) {
759 759 $temp .= $v->nodeValue;
760 760 }
761   - $temp = "<input style='cursor:pointer' type=radio NAME='checks' onClick='seltema(\"" . $temp . "\",\"" . $temp1 . "\",\"" . $temp3 . "\",\"" . $serv . "\")' /><span style=color:red >" . $temp . "</span><br>";
  761 + $temp = "<input style='cursor:pointer' type=radio NAME='checks' onClick='i3GEOF.conectarwms.seltema(\"" . $temp . "\",\"" . $temp1 . "\",\"" . $temp3 . "\",\"" . $serv . "\")' /><span style=color:red >" . $temp . "</span><br>";
762 762 $retorno .= "<br>" . $temp . $temp1 . "<br>" . $temp2 . "<hr>";
763 763 }
764 764 $cp->set_data ( $retorno );
... ...
ferramentas/conectarservicos/template_mst.html
  Diff comments   View file @2a21b3b
1   -<div class='container-fluid customScrollBar' >
  1 +<div class='container-fluid customScrollBar' style="margin-right:15px;">
2 2 <a href='javascript:void(0)' onclick="i3GEOF.conectarservicos.kml()" class='btn btn-primary btn-lg btn-block btn-raised'>KML</a>
3 3 <a href='javascript:void(0)' onclick="i3GEOF.conectarservicos.wms()" class='btn btn-primary btn-lg btn-block btn-raised'>WMS</a>
4 4 <a href='javascript:void(0)' onclick="i3GEOF.conectarservicos.wmst()" class='btn btn-primary btn-lg btn-block btn-raised'>WMS-T</a>
... ...
ferramentas/conectarwms/dicionario.js
  Diff comments   View file @2a21b3b
... ... @@ -30,6 +30,11 @@ i3GEOF.conectarwms.dicionario = {
30 30 en : "",
31 31 es : ""
32 32 } ],
  33 + 'listasel' : [ {
  34 + pt : "Lista de servi&ccedil;os cadastrados",
  35 + en : "",
  36 + es : ""
  37 + } ],
33 38 5 : [ {
34 39 pt : "Ooops! Problemas ao acessar o servi&ccedil;o.",
35 40 en : "",
... ...
ferramentas/conectarwms/index.js
  Diff comments   View file @2a21b3b
... ... @@ -250,13 +250,9 @@ i3GEOF.conectarwms = {
250 250 if (tema != ""){
251 251 var retorno = function(retorno){
252 252 i3GEOF.conectarwms.aguarde.visibility = "hidden";
253   - if(retorno.data != "ok"){
254   - i3GEO.janela.tempoMsg($trad('erro2',i3GEOF.conectarwms.dicionario));aguarde("none");
255   - }
256   - else{
257   - i3GEO.atualiza();
258   - }
  253 + i3GEO.atualiza();
259 254 };
  255 + i3GEOF.conectarwms.tema = tema;
260 256 i3GEOF.conectarwms.aguarde.visibility = "visible";
261 257 var tiporep = "";
262 258 if($i("tiporep")){
... ... @@ -270,12 +266,12 @@ i3GEOF.conectarwms = {
270 266 $i("proj").value = "EPSG:4326";
271 267 }
272 268 var p = "&funcao=adicionatemawms&servico="+$i("servicoWms").value+"&tema="+i3GEOF.conectarwms.tema+"&nome="+nometema+"&proj="+$i("proj").value+"&formato="+$i("formatos").value+"&tipo="+tipo+"&versao="+$i("versao").value+"&nomecamada="+nomecamada+"&tiporep="+tiporep+"&suportasld="+sldflag+"&formatosinfo="+$i("formatosinfo").value;
273   - if(g_tipows == "WMS-Tile"){
274   - p += "&tile=1";
275   - }
276   - else{
  269 + //if(g_tipows && g_tipows == "WMS-Tile"){
  270 + // p += "&tile=1";
  271 + //}
  272 + //else{
277 273 p += "&tile=0";
278   - }
  274 + //}
279 275 var cp = new cpaint();
280 276 cp.set_transfer_mode("POST");
281 277 cp.set_response_type("JSON");
... ...
ferramentas/conectarwms/template_mst.html
  Diff comments   View file @2a21b3b
1   -<div class="container-fluid">
  1 +<div class="container-fluid customScrollBar">
2 2 <div class='form-group label-fixed condensed'>
3 3 <label class="control-label" for="servicoWms">{{{sel}}}</label>
4 4 <input class="form-control input-lg" type='text' id='servicoWms' value='' />
5 5 </div>
6 6 <div class='form-group label-fixed condensed'>
7   - <div style="width: 100%;" class="input-group" id='RSSgeo'></div>
  7 + <label class='control-label' >{{{listasel}}}</label>
  8 + <div style="width: 100%;" class="input-group" id='RSSgeo'></div>
8 9 </div>
9 10 <button onclick="i3GEOF.conectarwms.listaLayers()" class='btn btn-primary btn-sm btn-raised'>{{{listaLayers}}}</button>
10 11 <div id="resultadoget" ></div>
... ...
ferramentas/mostraexten/index.js
  Diff comments   View file @2a21b3b
... ... @@ -163,14 +163,18 @@ i3GEOF.mostraExten = {
163 163 y = i3GEO.calculo.dms2dd($i("i3GEOmostraExtenyg").value,$i("i3GEOmostraExtenym").value,$i("i3GEOmostraExtenys").value),
164 164 yy = i3GEO.calculo.dms2dd($i("i3GEOmostraExtenyyg").value,$i("i3GEOmostraExtenyym").value,$i("i3GEOmostraExtenyys").value);
165 165 if ((x == xx) || (y == yy)){
166   - i3GEO.janela.tempoMsg($trad('msgCoordValida',i3GEOF.mostraExten.dicionario));
  166 + //i3GEO.janela.tempoMsg($trad('msgCoordValida',i3GEOF.mostraExten.dicionario));
  167 + //return;
  168 +
  169 + i3GEO.navega.zoomExt(i3GEO.configura.locaplic,i3GEO.configura.sid,i3GEO.parametros.tipoimagem,$i("i3GEOmostraExtenatual").value);
167 170 return;
168 171 }
169 172 if ((x > xx) || (y > yy)){
170   - i3GEO.janela.tempoMsg($trad('msgCoordValida',i3GEOF.mostraExten.dicionario));
  173 + //i3GEO.janela.tempoMsg($trad('msgCoordValida',i3GEOF.mostraExten.dicionario));
  174 + i3GEO.navega.zoomExt(i3GEO.configura.locaplic,i3GEO.configura.sid,i3GEO.parametros.tipoimagem,$i("i3GEOmostraExtenatual").value);
171 175 return;
172 176 }
173   - i3GEO.navega.zoomExt(i3GEO.configura.locaplic,i3GEO.configura.sid,window.parent.i3GEO.parametros.tipoimagem,(x+" "+y+" "+xx+" "+yy));
  177 + i3GEO.navega.zoomExt(i3GEO.configura.locaplic,i3GEO.configura.sid,i3GEO.parametros.tipoimagem,(x+" "+y+" "+xx+" "+yy));
174 178 }
175 179 catch(e){i3GEO.janela.tempoMsg(e+" Erro.");}
176 180 }
... ...