Changeset 12698 for extensions/rv_gmaps/trunk/template/data_loader.js

Timestamp:

Dec 6, 2011, 5:42:24 AM (12 years ago)

Author:

rvelices

Message:

rv_gmaps towards full maps api v3 migration (still to test)

File:

• extensions/rv_gmaps/trunk/template/data_loader.js (modified) (10 diffs)

extensions/rv_gmaps/trunk/template/data_loader.js

@@ -4 +4 @@
         this.options = jQuery.fn.extend(
                 {
-                        reload_data_timeout: 1800,
-                        rectangle_of_confusion: G_DEFAULT_ICON.iconSize
+                        reload_data_timeout: 500,
+                        rectangle_of_confusion: new google.maps.Size(32,16)
                 }
                 , opts || {} );
@@ -37 +37 @@
 {
         this._urlMapData = urlMapData;
-        google.maps.Event.bind( this._map, "movestart", this, this.clearTimerReloadData );
-        google.maps.Event.bind( this._map, "moveend", this, this._onMapMoveEnd );
-        this._loadData();
+        google.maps.event.bind( this._map, "movestart", this, this.clearTimerReloadData );
+        google.maps.event.bind( this._map, "idle", this, this._onIdle );
+        //this._loadData();
 },
 
@@ -59 +59 @@
 },
 
-_onMapMoveEnd: function()
+_onIdle: function()
 {
         this.clearTimerReloadData();
@@ -78 +78 @@
 
         var latRange = bounds.toSpan().lat();
-        var latPrec = latRange * this.options.rectangle_of_confusion.height / this._map.getSize().height;
+        var latPrec = latRange * this.options.rectangle_of_confusion.height / this._map.getDiv().offsetHeight;
 
         var lonRange = bounds.toSpan().lng();
-        var lonPrec = ( lonRange>=0 ? lonRange : 360-lonRange )* this.options.rectangle_of_confusion.width / this._map.getSize().width;
+        var lonPrec = ( lonRange>=0 ? lonRange : 360-lonRange )* this.options.rectangle_of_confusion.width / this._map.getDiv().offsetWidth;
 
         if ( this._previousLoadDataReq.box!=null )
         { // not the first time
-                if ( this._previousLoadDataReq.box.containsBounds( bounds ) )
+                if ( this._previousLoadDataReq.box.contains( bounds.getNorthEast() )
+                                        && this._previousLoadDataReq.box.contains( bounds.getSouthWest() ))
                 {
                         if ( this._previousLoadDataReq.resultBounds == null )
@@ -109 +110 @@
 
         var nd=0, sd=0, ed=0, wd=0;
-        if ( !bounds.isFullLat() )
+        /*if ( !bounds.isFullLat() )*/
         {
                 nd = latRange*12/100;
                 sd = latRange*4/100;
         }
-        if ( !bounds.isFullLng() )
+        /*if ( !bounds.isFullLng() )*/
         {
                 ed = lonRange*9/100;
@@ -130 +131 @@
 
         if (document.is_debug) {
-                google.maps.Log.write("sd="+sd+" wd="+wd+" nd="+nd+" ed="+ed);
-                google.maps.Log.write( "bounds: " + this._map.getBounds().getSouthWest().toUrlValue() + " " + this._map.getBounds().getNorthEast().toUrlValue() +"; zoom: "+this._map.getZoom() +"; size: "+this._map.getSize().toString() +"; c: "+this._map.getCenter().toUrlValue() );
-                google.maps.Log.writeUrl( url );
+                glog("sd="+sd+" wd="+wd+" nd="+nd+" ed="+ed);
+                glog( url );
         }
 
@@ -141 +141 @@
 
         try {
-                google.maps.Event.trigger( this, "dataloading" );
+                google.maps.event.trigger( this, "dataloading" );
                 jQuery.ajax( {
                         url: url,
@@ -151 +151 @@
                 this._dataLoading = false;
                 this._previousLoadDataReq.box=null;
-                google.maps.Event.trigger( this, "dataloadfailed", 600, e );
+                google.maps.event.trigger( this, "dataloadfailed", 600, e );
         }
 },
@@ -164 +164 @@
                         throw new Error( "DATA DECODING ERROR" );
                 this._previousLoadDataReq.resultBounds = resp.bounds;
-                if (document.is_debug && resp.debug) google.maps.Log.write( resp.debug );
-                google.maps.Event.trigger( this, "dataloaded", resp );
+                if (document.is_debug && resp.debug) glog( resp.debug );
+                google.maps.event.trigger( this, "dataloaded", resp );
         }
         catch (e)       {
                 this._previousLoadDataReq.box=null;
-                google.maps.Event.trigger( this, "dataloadfailed", responseCode, e );
+                google.maps.event.trigger( this, "dataloadfailed", responseCode, e );
                 var s = e.message;
                 s += '\n' + data.substr(0,1000);
@@ -182 +182 @@
 {
         try {
-                google.maps.Event.trigger( this, "dataloadfailed", textStatus + xhr.status, exc );
+                google.maps.event.trigger( this, "dataloadfailed", textStatus + xhr.status, exc );
         }
         catch (e) {