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

Timestamp:

Jul 2, 2010, 6:53:40 AM (14 years ago)

Author:

rvelices

Message:

rv_gmaps - start using google.maps JS namespace + upgrade prototype.js

File:

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

extensions/rv_gmaps/trunk/template/data_loader.js

@@ -8 +8 @@
                 }
                 , opts || {} );
-        this.options.rectangle_of_confusion = new GSize( this.options.rectangle_of_confusion.width, this.options.rectangle_of_confusion.height );
+        this.options.rectangle_of_confusion = new google.maps.Size( this.options.rectangle_of_confusion.width, this.options.rectangle_of_confusion.height );
         if (this.options.rectangle_of_confusion.width<16) this.options.rectangle_of_confusion.width=16;
         if (this.options.rectangle_of_confusion.height<16) this.options.rectangle_of_confusion.height=16;
@@ -37 +37 @@
 {
         this._urlMapData = urlMapData;
-        GEvent.bind( this._map, "movestart", this, this.clearTimerReloadData );
-        GEvent.bind( this._map, "moveend", this, this._onMapMoveEnd );
+        google.maps.Event.bind( this._map, "movestart", this, this.clearTimerReloadData );
+        google.maps.Event.bind( this._map, "moveend", this, this._onMapMoveEnd );
         this._loadData();
 },
@@ -77 +77 @@
         var bounds = this._map.getBounds();
 
-        // BEGIN BUG in maps api 2.185 up to "today" 2.193 - when map wraps horizontally more than 360 deg - the getBounds is wrong
-        /*if ( this._map.getZoom() <= 2 || this._map.getZoom() == 3 && this._map.getSize().width > 1000 )
-        {
-                bounds = new GLatLngBounds(
-                                new GLatLng( bounds.getSouthWest().lat(),  -180 ),
-                                new GLatLng( bounds.getNorthEast().lat(),  180 )
-                        );
-        }*/
-        // END BUG
         var latRange = bounds.toSpan().lat();
         var latPrec = latRange * this.options.rectangle_of_confusion.height / this._map.getSize().height;
@@ -107 +98 @@
                                         )
                                 {
-                                        if (document.is_debug) GLog.write('no load: zoom crt: '+this._map.getZoom()+'; prev: '+this._previousLoadDataReq.zoom+'; target: '+this._map.getBoundsZoomLevel(this._previousLoadDataReq.resultBounds));
+                                        if (document.is_debug) google.maps.Log.write('no load: zoom crt: '+this._map.getZoom()+'; prev: '+this._previousLoadDataReq.zoom+'; target: '+this._map.getBoundsZoomLevel(this._previousLoadDataReq.resultBounds));
                                         return;
                                 }
@@ -129 +120 @@
         }
         var digits = Math.max( getLatLonDigits(latRange,4,2), getLatLonDigits(lonRange,4,2) );
-        var box = new GLatLngBounds(
-                        new GLatLng( Math.roundN(bounds.getSouthWest().lat()-sd,digits), Math.roundN( bounds.getSouthWest().lng()-wd,digits ) ),
-                        new GLatLng( Math.roundN(bounds.getNorthEast().lat()+nd,digits), Math.roundN( bounds.getNorthEast().lng()+ed,digits) )
-                );
+        /*var box = new google.maps.LatLngBounds(
+                        new google.maps.LatLng( Math.roundN(bounds.getSouthWest().lat()-sd,digits), Math.roundN( bounds.getSouthWest().lng()-wd,digits ) ),
+                        new google.maps.LatLng( Math.roundN(bounds.getNorthEast().lat()+nd,digits), Math.roundN( bounds.getNorthEast().lng()+ed,digits) )
+                );*/
+        var box = new google.maps.LatLngBounds( bounds.getSouthWest(), bounds.getNorthEast() );
+        box.extend( new google.maps.LatLng( Math.roundN(bounds.getSouthWest().lat()-sd,digits), Math.roundN( bounds.getSouthWest().lng()-wd,digits ) ) );
+        box.extend( new google.maps.LatLng( Math.roundN(bounds.getNorthEast().lat()+nd,digits), Math.roundN( bounds.getNorthEast().lng()+ed,digits) ) );
 
         var url = this._urlMapData;
@@ -140 +134 @@
 
         if (document.is_debug) {
-                GLog.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() );
-                GLog.writeUrl( url );
+                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 );
         }
 
@@ -150 +145 @@
 
         try {
-                GEvent.trigger( this, "dataloading" );
+                google.maps.Event.trigger( this, "dataloading" );
                 GDownloadUrl(url, this._onDataReceived.bind(this) );
         }
@@ -156 +151 @@
                 this._dataLoading = false;
                 this._previousLoadDataReq.box=null;
-                GEvent.trigger( this, "dataloadfailed", 600, e );
+                google.maps.Event.trigger( this, "dataloadfailed", 600, e );
         }
 },
@@ -168 +163 @@
                 {
                         this._previousLoadDataReq.box=null;
-                        GEvent.trigger( this, "dataloadfailed", responseCode, null );
+                        google.maps.Event.trigger( this, "dataloadfailed", responseCode, null );
                 }
                 else
@@ -178 +173 @@
 
                         this._previousLoadDataReq.resultBounds = resp.bounds;
-                        if (document.is_debug && resp.debug) GLog.write( resp.debug );
-                        GEvent.trigger( this, "dataloaded", resp );
+                        if (document.is_debug && resp.debug) google.maps.Log.write( resp.debug );
+                        google.maps.Event.trigger( this, "dataloaded", resp );
                 }
                 catch (e)       {
                         this._previousLoadDataReq.box=null;
-                        GEvent.trigger( this, "dataloadfailed", responseCode, e );
+                        google.maps.Event.trigger( this, "dataloadfailed", responseCode, e );
                         var s = e.message;
                         s += '\n' + data.substr(0,1000);