Download as
Browse Code »

Commit e0ef0a0743ef3bc0bbb59bfb715b8890b0eb8161

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

--no commit message

Showing 11 changed files with 39 additions and 33 deletions   Show diff stats
admin/admin.db
View file @e0ef0a0
No preview for this file type
classesjs/classe_interface.js
  Diff comments   View file @e0ef0a0
... ... @@ -2037,7 +2037,7 @@ i3GEO.Interface = {
2037 2037 },
2038 2038 janela = i3GEO.janela.cria(
2039 2039 "230px",
2040   - "100px",
  2040 + "110px",
2041 2041 "",
2042 2042 "",
2043 2043 "",
... ...
classesjs/classe_janela.js
  Diff comments   View file @e0ef0a0
... ... @@ -250,6 +250,8 @@ i3GEO.janela = {
250 250 classe = "hd";
251 251 i3GEO.janela.TRANSICAOSUAVE = false;
252 252 }
  253 + if(navm && i3GEO.Interface.ATUAL === "googleearth")
  254 + {funcaoMinimiza = null;}
253 255 wlargurA = parseInt(wlargura,10)+2+"px";
254 256 if($i(id))
255 257 {YAHOO.janelaDoca.xp.panel.destroy();}
... ...
ferramentas/buscafotos/index.js.php
  Diff comments   View file @e0ef0a0
... ... @@ -179,7 +179,7 @@ i3GEOF.buscaFotos = {
179 179 */
180 180 ativaFoco: function(){
181 181 g_operacao = "navega";
182   - i3GEO.util.criaPin();
  182 + i3GEO.util.criaPin("pinfoto",i3GEO.configura.locaplic+'/imagens/google/foto.png');
183 183 if(!$i("i3GEOF.buscaFotos_c"))
184 184 {return;}
185 185 var i = $i("i3GEOF.buscaFotos_c").style;
... ... @@ -264,8 +264,8 @@ i3GEOF.buscaFotos = {
264 264 Esconde a imagem de localização da foto no mapa
265 265 */
266 266 escondexy: function(){
267   - if($i("boxpin")){
268   - var box = $i("boxpin");
  267 + if($i("pinfoto")){
  268 + var box = $i("pinfoto");
269 269 box.style.display = "none";
270 270 box.style.top = "0px";
271 271 box.style.left = "0px";
... ... @@ -281,12 +281,12 @@ i3GEOF.buscaFotos = {
281 281 {return;}
282 282 xy = xy.split(",");
283 283 xy = i3GEO.calculo.dd2tela(xy[1]*1,xy[0]*1,$i(i3GEO.Interface.IDMAPA),i3GEO.parametros.mapexten,i3GEO.parametros.pixelsize);
284   - var box = $i("boxpin");
  284 + var box = $i("pinfoto");
285 285 box.style.display = "block";
286   - box.style.width = "21px";
287   - box.style.height = "25px";
288   - box.style.top = parseInt(xy[1],10)+"px";
289   - box.style.left = parseInt(xy[0],10)+"px";
  286 + box.style.width = "27px";
  287 + box.style.height = "27px";
  288 + box.style.top = parseInt(xy[1],10) - 27 + "px";
  289 + box.style.left = parseInt(xy[0],10) - 13 +"px";
290 290 },
291 291 /*
292 292 Function: listafotospanoramio
... ...
ferramentas/confluence/index.js.php
  Diff comments   View file @e0ef0a0
... ... @@ -143,7 +143,7 @@ i3GEOF.confluence = {
143 143 */
144 144 ativaFoco: function(){
145 145 g_operacao = "navega";
146   - i3GEO.util.criaPin();
  146 + i3GEO.util.criaPin("pinconf",i3GEO.configura.locaplic+'/imagens/google/confluence.png');
147 147 var i = $i("i3GEOF.confluence_c").style;
148 148 i3GEO.janela.ULTIMOZINDEX++;
149 149 i.zIndex = 21000 + i3GEO.janela.ULTIMOZINDEX;
... ... @@ -154,8 +154,8 @@ i3GEOF.confluence = {
154 154 Esconde a marca mostrada no mapa
155 155 */
156 156 escondexy: function(){
157   - if($i("boxpin")){
158   - var box = $i("boxpin");
  157 + if($i("pinconf")){
  158 + var box = $i("pinconf");
159 159 box.style.display = "none";
160 160 box.style.top = "0px";
161 161 box.style.left = "0px";
... ... @@ -171,12 +171,12 @@ i3GEOF.confluence = {
171 171 {return;}
172 172 xy = xy.split(",");
173 173 xy = i3GEO.calculo.dd2tela(xy[1]*1,xy[0]*1,$i(i3GEO.Interface.IDMAPA),i3GEO.parametros.mapexten,i3GEO.parametros.pixelsize);
174   - var box = $i("boxpin");
  174 + var box = $i("pinconf");
175 175 box.style.display = "block";
176   - box.style.width = "21px";
177   - box.style.height = "25px";
178   - box.style.top = parseInt(xy[1],10)+"px";
179   - box.style.left = parseInt(xy[0],10)+"px";
  176 + box.style.width = "27px";
  177 + box.style.height = "27px";
  178 + box.style.top = parseInt(xy[1],10) - 27 +"px";
  179 + box.style.left = parseInt(xy[0],10) - 13 +"px";
180 180 },
181 181 /*
182 182 Function: lista
... ...
ferramentas/googlemaps/index.php
  Diff comments   View file @e0ef0a0
... ... @@ -106,7 +106,8 @@ function inicializa(){
106 106 }
107 107 });
108 108 GEvent.addListener(map, "mousemove", function(ponto) {
109   - var teladms,tela;
  109 + var teladms,tela,temp,
  110 + mapexten = window.parent.i3GEO.parametros.mapexten;
110 111 teladms = window.parent.i3GEO.calculo.dd2dms(ponto.x,ponto.y);
111 112 //tela = map.getProjection().fromLatLngToPixel(ponto);
112 113 window.parent.objposicaocursor = {
... ... @@ -122,12 +123,15 @@ function inicializa(){
122 123 window.parent.i3GEO.eventos.mousemoveMapa();
123 124 if(window.parent.i3GEO.Interface.ATUAL === "googleearth")
124 125 {return;}
125   - xy = window.parent.i3GEO.calculo.dd2tela(ponto.x,ponto.y,window.parent.document.getElementById(window.parent.i3GEO.Interface.IDMAPA),window.parent.i3GEO.parametros.mapexten,window.parent.i3GEO.parametros.pixelsize);
126   - box.style.display = "block";
127   - box.style.width = "5px";
128   - box.style.height = "5px";
129   - box.style.top = parseInt(xy[1],10)+"px";
130   - box.style.left = parseInt(xy[0],10)+"px";
  126 + temp = mapexten.split(" ");
  127 + if(ponto.x < temp[2] && ponto.y < temp[3]){
  128 + xy = window.parent.i3GEO.calculo.dd2tela(ponto.x,ponto.y,window.parent.document.getElementById(window.parent.i3GEO.Interface.IDMAPA),mapexten,window.parent.i3GEO.parametros.pixelsize);
  129 + box.style.display = "block";
  130 + box.style.width = "5px";
  131 + box.style.height = "5px";
  132 + box.style.top = (parseInt(xy[1],10) + 2.5) +"px";
  133 + box.style.left = (parseInt(xy[0],10) - 2.5) +"px";
  134 + }
131 135 });
132 136 function botaoI3geo() {}
133 137 botaoI3geo.prototype = new GControl();
... ... @@ -208,7 +212,7 @@ function ondegoogle()
208 212 var h = xyMin[1]-xyMax[1]
209 213 box.style.display = "block"
210 214 box.style.width = w
211   - box.style.height = h
  215 + box.style.height = h+3
212 216 box.style.top = xyMax[1]+"px"
213 217 box.style.left = xyMin[0]+"px"
214 218 box.style.display="block"
... ...
ferramentas/metar/index.js.php
  Diff comments   View file @e0ef0a0
... ... @@ -220,16 +220,16 @@ i3GEOF.metar = {
220 220 mostraxy: function(x,y){
221 221 if(i3GEO.Interface.ATUAL === "googleearth")
222 222 {return;}
223   - i3GEO.util.criaBox("boxpin");
  223 + i3GEO.util.criaPin("pinmetar",i3GEO.configura.locaplic+'/imagens/google/metar.png');
224 224 xy = i3GEO.calculo.dd2tela(x*1,y*1,$i(i3GEO.Interface.IDCORPO),i3GEO.parametros.mapexten,i3GEO.parametros.pixelsize);
225   - var box = $i("boxpin");
  225 + var box = $i("pinmetar");
226 226 box.style.display = "block";
227   - box.style.width = "5px";
228   - box.style.height = "5px";
229   - box.style.top = parseInt(xy[1],10)-5+"px";
230   - box.style.left = parseInt(xy[0],10)-5+"px";
  227 + box.style.width = "27px";
  228 + box.style.height = "27px";
  229 + box.style.top = parseInt(xy[1],10)-27+"px";
  230 + box.style.left = parseInt(xy[0],10)-13+"px";
231 231 box.style.position = "absolute";
232   - box.style.border = "solid 2px red"
  232 + box.style.border = "solid 0px red"
233 233 box.style.zIndex = 5000
234 234 }
235 235 };
... ...
imagens/google/confluence.png 0 → 100644
View file @e0ef0a0

1020 Bytes
imagens/google/foto.png 0 → 100644
View file @e0ef0a0

712 Bytes
imagens/google/metar.png 0 → 100644
View file @e0ef0a0

653 Bytes
ms_configura.php
  Diff comments   View file @e0ef0a0
... ... @@ -371,7 +371,7 @@ if (strtoupper(substr(PHP_OS, 0, 3) == &#39;WIN&#39;))
371 371 Tipo:
372 372 {string}
373 373 */
374   - $interfacePadrao = "googlemaps.phtml";
  374 + $interfacePadrao = "openlayers.htm";
375 375 }
376 376 else //se for linux
377 377 {
... ...