Changeset 12698 for extensions/rv_gmaps/trunk/template/data_handler.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_handler.js (modified) (11 diffs)

extensions/rv_gmaps/trunk/template/data_handler.js

@@ -3 +3 @@
 {
         this._map = map;
+        this._infoWindow = new google.maps.InfoWindow();
         this.options = jQuery.fn.extend(
                 {
-                        icon: G_DEFAULT_ICON,
+                        markerOptions: {},
                         show_all_img_src: null
                 }
                 , opts || {} );
 
-        google.maps.Event.addListener( map, "infowindowclose", function() {map.getInfoWindow().pwgMarker=null;} );
+        google.maps.event.addListener( map, "infowindowclose", function() {map.getInfoWindow().pwgMarker=null;} );
 }
 
@@ -16 +17 @@
 
 _map: null,
+_infoWindow: null,
 options: {},
 _markers: [],
@@ -60 +62 @@
         {
                 changed = false;
-                if (this._markers.length>0 && !this._markers[0].getLatLng().equals( data.image_clusters[0].position ) )
+                if (this._markers.length>0 && !this._markers[0].getPosition().equals( data.image_clusters[0].position ) )
                         changed=true;
         }
@@ -67 +69 @@
         {
                 var newMarkers = [];
-                var infoWindowMarker = this._map.getInfoWindow().pwgMarker;
+                var infoWindowMarker = this._infoWindow.pwgMarker;
 
                 for (i=0; i<data.image_clusters.length; i++)
@@ -82 +84 @@
                         if (marker && marker==infoWindowMarker)
                         {
-                                this._map.removeOverlay( marker );
-                                google.maps.Event.clearListeners(marker, "click" );
-                                google.maps.Event.clearListeners(marker, "dblclick" );
-                                this._map.getInfoWindow().pwgMarker = infoWindowMarker = null;
-                                if (document.is_debug) google.maps.Log.write('removed marker with infoWindow');
+        marker.setMap(null);
+                                google.maps.event.clearListeners(marker, "click" );
+                                google.maps.event.clearListeners(marker, "dblclick" );
+                                this._infoWindow.pwgMarker = infoWindowMarker = null;
+                                if (document.is_debug) glog('removed marker with infoWindow');
                                 marker = this._markers.pop();
                         }
@@ -92 +94 @@
                         if (!marker)
                         {
-                                marker = new google.maps.Marker( cluster.position, {title:  theTitle, icon: this.options.icon } );
-                                google.maps.Event.addListener( marker, "click", pwgBind(this, this._onMarkerClick, marker) );
-                                google.maps.Event.addListener( marker, "dblclick", pwgBind(this, this._onMarkerDblClick, marker) );
-                                this._map.addOverlay( marker );
+                                marker = new google.maps.Marker(this.options.markerOptions);
+        marker.setPosition(cluster.position);
+        marker.setTitle(theTitle);
+                                google.maps.event.addListener( marker, "click", pwgBind(this, this._onMarkerClick, marker) );
+                                google.maps.event.addListener( marker, "dblclick", pwgBind(this, this._onMarkerDblClick, marker) );
+        marker.setMap(this._map);
                         }
                         else
                         {
                                 marker.currentImageIndex=0;
-                                marker.setLatLng( cluster.position );
-                                // changing the marker title is undocumented so we hack it
-                                if (!this.hack)
-                                {
-                                        this.hack = {};
-                                        for (var prop in marker)
-                                        {
-                                                if ( typeof(marker[prop])!='object') continue;
-                                                if (!this.hack.markerHtmlElemWithTitle )
-                                                {
-                                                        try {
-                                                                if (eval("typeof marker." + prop + "[0].src") == "string" && eval("typeof marker." + prop + "[0].title") == "string" )
-                                                                        this.hack.markerHtmlElemWithTitle = prop;
-                                                        }
-                                                        catch (e) {}
-                                                }
-                                                if (!this.hack.markerOptions)
-                                                        try {
-                                                                if ( eval("typeof marker."+prop+".title")=="string" && eval("typeof marker."+prop+".src")=="undefined")
-                                                                        this.hack.markerOptions = prop;
-                                                        }
-                                                        catch (e) {}
-                                        }
-                                }
-                                //undocumented marker.K , marker.ch and marker.jb and marker.l
-                                if (this.hack.markerOptions)
-                                        eval( 'marker.'+this.hack.markerOptions+'.title=theTitle');
-                                if (this.hack.markerHtmlElemWithTitle)
-                                        eval( 'marker.'+this.hack.markerHtmlElemWithTitle+'[0].title=theTitle');
+                                marker.setPosition( cluster.position );
+                                marker.setTitle(theTitle);
+                                marker.setMap(this._map);
                         }
 
@@ -143 +121 @@
                 for (i=0; i<this._markers.length; i++)
                 {
-                        this._map.removeOverlay( this._markers[i] );
-                        google.maps.Event.clearListeners(this._markers[i], "click" );
-                        google.maps.Event.clearListeners(this._markers[i], "dblclick" );
+                        this._markers[i].setMap(null);
+                        google.maps.event.clearListeners(this._markers[i], "click" );
+                        google.maps.event.clearListeners(this._markers[i], "dblclick" );
                 }
 
@@ -158 +136 @@
 _onMarkerClick: function( marker )
 {
-        if (this._map.getInfoWindow().pwgMarker == marker )
+        if (this._infoWindow.pwgMarker == marker )
                 return; // already open
         var content = "";
@@ -182 +160 @@
         content += '<div id="pwgImageDetail">' + this.buildCurrentPictureHtml( marker ) + '</div>';
 
-        marker.openInfoWindowHtml( content );
+        this._infoWindow.setContent( content );
+        this._infoWindow.setPosition( marker.getPosition() );
+        this._infoWindow.open( this._map );
 
         // bind to next / prev a little later because sometimes the nodes are not immediately created
@@ -193 +173 @@
 _onMarkerDblClick: function( marker )
 {
-        this._map.setCenter( marker.pwg.bounds.getCenter(), this._map.getBoundsZoomLevel( marker.pwg.bounds ) );
+        this._map.fitBounds( marker.pwg.bounds );
 },
 
@@ -228 +208 @@
         clearTimeout(this._timerBindPictureNavigation);
         this._timerBindPictureNavigation = null;
-        this._map.getInfoWindow().pwgMarker = marker;
+        this._infoWindow.pwgMarker = marker;
         for (var i=0; i< this._navHtmlIds.length; i++)
         {
                 var elt = document.getElementById( this._navHtmlIds[i] );
                 if (elt)
-                        google.maps.Event.addDomListener(elt, "click", pwgBind(this, this._onPictureNavigate, marker, i) );
+                        google.maps.event.addDomListener(elt, "click", pwgBind(this, this._onPictureNavigate, marker, i) );
         }
 },