Download as
Browse Code »

Commit d8b5a0907157b3ef8bd4a629915f12d14ea5880c

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

--no commit message

Showing 5 changed files with 11 additions and 8 deletions   Show diff stats
classesjs/classe_configura.js
  Diff comments   View file @d8b5a09
... ... @@ -687,7 +687,7 @@ i3GEO.configura = {
687 687 marcadorZoom = "";
688 688 if(i3GEO.Interface.ATUAL==="openlayers"){
689 689 if(i3GEO.Interface.TABLET === false)
690   - {OLpanel.activateControl(OLpan);}
  690 + {OLpanel.activateControl(i3GEO.Interface.openlayers.OLpan);}
691 691 return;
692 692 }
693 693 panMapaInicia = function(exy){
... ...
classesjs/classe_guias.js
  Diff comments   View file @d8b5a09
... ... @@ -243,9 +243,9 @@ i3GEO.guias = {
243 243 //
244 244 //obtém outras guias que podem existir no mapa
245 245 //
246   - var nguiasreal = 0,onf,outf,guiaconteudo,id,guia,guias,nguias,g,re,ng,tituloguia,i,ins,largura,altura;
247   - CONFIGURA = i3GEO.guias.CONFIGURA,
248   - guias = i3GEO.util.listaChaves(CONFIGURA);
  246 + var nguiasreal = 0,onf,outf,guiaconteudo,id,guia,guias,nguias,g,re,ng,tituloguia,i,ins,largura,altura,
  247 + CONFIGURA = i3GEO.guias.CONFIGURA,
  248 + guias = i3GEO.util.listaChaves(CONFIGURA);
249 249  
250 250 try{
251 251 nguias = guias.length;
... ...
classesjs/classe_interface.js
  Diff comments   View file @d8b5a09
... ... @@ -829,10 +829,10 @@ i3GEO.Interface = {
829 829 //estes controles ficam invisíveis e são usados quando os ícones default do i3geo são ativados
830 830 //
831 831 if(i3GEO.Interface.TABLET === false){
832   - OLpan = new OpenLayers.Control.Navigation();
  832 + i3GEO.Interface.openlayers.OLpan = new OpenLayers.Control.Navigation();
833 833 OLzoom = new OpenLayers.Control.ZoomBox();
834 834 OLpanel = new OpenLayers.Control.Panel();
835   - OLpanel.addControls([OLpan,OLzoom]);
  835 + OLpanel.addControls([i3GEO.Interface.openlayers.OLpan,OLzoom]);
836 836 i3geoOL.addControl(OLpanel);
837 837 }
838 838 openlayers.ativaBotoes();
... ... @@ -1106,6 +1106,8 @@ i3GEO.Interface = {
1106 1106 p = e.xy;
1107 1107 //altera o indicador de localizacao
1108 1108 lonlat = i3geoOL.getLonLatFromPixel(p);
  1109 + if(!lonlat)
  1110 + {return;}
1109 1111 d = i3GEO.calculo.dd2dms(lonlat.lon,lonlat.lat);
1110 1112 try{
1111 1113 objposicaocursor.ddx = lonlat.lon;
... ...
ferramentas/selecao/index.js.php
  Diff comments   View file @d8b5a09
... ... @@ -398,7 +398,7 @@ i3GEOF.selecao = {
398 398 {alert("Escolha um tema");return;}
399 399 if(g_tipoacao !== 'selecaobox')
400 400 {return;}
401   - i3geoOL.removeControl(OLpanel);
  401 + i3geoOL.removeControl(i3GEO.Interface.openlayers.OLpan);
402 402 i3GEOF.selecao.box.criaBox();
403 403 adicionaxyBox = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO));
404 404 var i = $i("i3geoboxSel").style;
... ...
interface/openlayers.htm
  Diff comments   View file @d8b5a09
... ... @@ -145,7 +145,7 @@
145 145 </td>
146 146 </tr>
147 147 </table>
148   -<script src="../classesjs/i3geo.js"></script>
  148 +<script src="../classesjs/i3geonaocompacto.js"></script>
149 149 <script src="../pacotes/openlayers/OpenLayers29.js.php"></script>
150 150 <script>
151 151 /*
... ... @@ -252,6 +252,7 @@ OpenLayers.ImgPath = &quot;../pacotes/openlayers/img/&quot;;
252 252 {layers:""},
253 253 {isBaseLayer:true,visibility:false}
254 254 );
  255 +
255 256 i3GEO.Interface.openlayers.LAYERSADICIONAIS = [ims,wsm,bra,osm];
256 257 })();
257 258 //
... ...