diff --git a/classesjs/classe_arvoredecamadas.js b/classesjs/classe_arvoredecamadas.js index ed718e4..1dc6579 100644 --- a/classesjs/classe_arvoredecamadas.js +++ b/classesjs/classe_arvoredecamadas.js @@ -2175,9 +2175,6 @@ i3GEO.arvoreDeCamadas = * é mostrado na árvore */ verificaAbrangenciaTemas : function() { - if (typeof (console) !== 'undefined') - console.info("i3GEO.arvoreDeCamadas.verificaAbrangenciaTemas()"); - if (i3GEO.arvoreDeCamadas.VERIFICAABRANGENCIATEMAS === false) { return; } diff --git a/classesjs/classe_interface.js b/classesjs/classe_interface.js index 114d70e..504a626 100644 --- a/classesjs/classe_interface.js +++ b/classesjs/classe_interface.js @@ -2479,11 +2479,12 @@ i3GEO.Interface = i3GEO.Interface.googlemaps.recalcPar(); }, criaImageMap : function(nomeLayer, cache) { - var i3GEOTileO = "", s; + var i3GEOTileO = ""; if (cache == "undefined" || cache == undefined) { cache = ""; } - s = + /* + var s = "i3GEOTileO = new google.maps.ImageMapType({ " + "getTileUrl: function(coord, zoom) {" + " var url = '" + i3GEO.configura.locaplic + "/classesphp/mapa_googlemaps.php?g_sid=" + i3GEO.configura.sid + "&cache=" + cache + "&Z=' + zoom + '&X=' + coord.x + '&Y=' + coord.y + '&layer=" + nomeLayer @@ -2491,8 +2492,71 @@ i3GEO.Interface = + " return url+'&nd='+i3GEO.Interface.googlemaps.posfixo; " + "}, " + "tileSize: new google.maps.Size(256, 256)," + "isPng: true," + "name: '" + nomeLayer + "'" + "});"; eval(s); + */ + + i3GEOTileO = new google.maps.ImageMapType({ + getTileUrl: function(coord, zoom) { + var url = i3GEO.configura.locaplic + "/classesphp/mapa_googlemaps.php?g_sid=" + i3GEO.configura.sid + "&cache=" + cache + + "&Z=" + zoom + "&X=" + coord.x + "&Y=" + coord.y + "&layer=" + nomeLayer + + i3GEO.Interface.googlemaps.PARAMETROSLAYER + '&r=' + Math.random(); + return url+'&nd='+i3GEO.Interface.googlemaps.posfixo; + }, + tileSize: new google.maps.Size(256, 256), + isPng: true, + name: nomeLayer + }); + + /* + i3GEOTileO = new google.maps.ImageMapType({ + getTileUrl: function(coord, zoom) { + var url = i3GEO.configura.locaplic + "/classesphp/mapa_googlemaps.php?g_sid=" + i3GEO.configura.sid + "&cache=" + cache + + "&BBOX=" + i3GEO.Interface.googlemaps.bbox2mercator(i3GEO.Interface.googlemaps.bbox()) + + "&HEIGHT=" + i3GEO.parametros.h + + "&WIDTH=" + i3GEO.parametros.w + + "&layer=" + nomeLayer + + i3GEO.Interface.googlemaps.PARAMETROSLAYER + '&r=' + Math.random(); + return url+'&nd='+i3GEO.Interface.googlemaps.posfixo; + }, + tileSize: new google.maps.Size(i3GEO.parametros.w, i3GEO.parametros.h), + isPng: true, + name: nomeLayer, + projection : i3GeoMap.getProjection(), + b : i3GeoMap.getBounds() + }); + + + google.maps.event.addListener(i3GEOTileO, 'tilesloaded', function() { + var l = i3GEO.Interface.googlemaps.retornaObjetoLayer(nomeLayer); + var currentBounds = i3GeoMap.getBounds(); + if (currentBounds.equals(l.b)) { + return; + } + l.b = currentBounds; + }); + */ return i3GEOTileO; }, + bbox2mercator : function(bbox){ + var c = bbox.split(" "), + p1,p2; + p1 = i3GEO.Interface.googlemaps.geo2mercator(c[0],c[1]); + p2 = i3GEO.Interface.googlemaps.geo2mercator(c[2],c[3]); + return p1.x+" "+p1.y+" "+p2.x+" "+p2.y; + }, + geo2mercator : function(x,y){ + var source = "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs", + dest = "+title= Google Mercator EPSG:900913 +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs", + p = new Proj4js.Point(parseInt(x,10), parseInt(y,10)); + + Proj4js.defs["WGS84"] = source; + Proj4js.defs["EPSG:900913"] = dest; + + source = new Proj4js.Proj('WGS84'); + dest = new Proj4js.Proj('EPSG:900913'); + + Proj4js.transform(source, dest, p); + return p; + }, insereLayer : function(nomeLayer, indice, cache) { if (i3GEO.pluginI3geo.existeObjeto(nomeLayer) === false) { var i = i3GEO.Interface.googlemaps.criaImageMap(nomeLayer, cache); diff --git a/classesphp/mapa_googlemaps.php b/classesphp/mapa_googlemaps.php index 9476b31..dac1c0a 100644 --- a/classesphp/mapa_googlemaps.php +++ b/classesphp/mapa_googlemaps.php @@ -279,7 +279,6 @@ if($cache == true){ $mapa->setsize($_GET["WIDTH"],$_GET["HEIGHT"]); $mapext = explode(" ",$_GET["mapext"]); $mapa->setExtent($mapext[0],$mapext[1],$mapext[2],$mapext[3]); - $o = $mapa->outputformat; $o->set("imagemode",MS_IMAGEMODE_RGBA); diff --git a/interface/black_osm.htm b/interface/black_osm.htm index 3ac94dd..c5187ac 100755 --- a/interface/black_osm.htm +++ b/interface/black_osm.htm @@ -7,6 +7,19 @@ + @@ -15,7 +28,7 @@ - + -- libgit2 0.21.2