Changeset 12706 for extensions/rv_gmaps/trunk/template/data_handler.js

Timestamp:

Dec 8, 2011, 10:36:35 PM (12 years ago)

Author:

rvelices

Message:

rv_gmaps use places autocomplete + added new markers + better algo for displaying markers

File:

• extensions/rv_gmaps/trunk/template/data_handler.js (modified) (6 diffs)

extensions/rv_gmaps/trunk/template/data_handler.js

@@ -12 +12 @@
 
         google.maps.event.bind( this._map, "click", this, this._onMapClick);
-        //google.maps.event.bind( this._infoWindow, "domready", this, this._onInfoWindowDomReady);
 }
 
@@ -23 +22 @@
 _navHtmlIds: ["gotoPrevImage", "gotoNextImage"],
 _navHtmlHandles: [],
-_recursionProtect: 0,
 _prevResult: { nb_items:0 },
 
@@ -70 +68 @@
         if (changed)
         {
-                var newMarkers = [];
+// BEGIN NEW ****************   
+                var markersToRemove=[], clustersToAdd=[], newMarkers=[];
+                data.image_clusters.sort( function(a,b) { return PwgDataHandler.cmpll( a.position, b.position); } );
+                for (i=0; i<data.image_clusters.length; i++)
+                {
+                        var cluster = data.image_clusters[i];
+                        while(this._markers.length)
+                        {
+                                var marker = this._markers[0];
+                                if (PwgDataHandler.cmpll(cluster.position, marker.getPosition()) == 0)
+                                {
+                                        marker.pwg = {
+                                                nb_items: cluster.nb_items,
+                                                images: cluster.items,
+                                                bounds: cluster.bounds,
+                                                blowup_url: cluster.blowup_url
+                                                };
+                                        newMarkers.push(marker);
+                                        this._markers.shift();
+                                        cluster = null;
+                                        break;
+                                }
+                                else if (PwgDataHandler.cmpll(cluster.position, marker.getPosition()) < 0)
+                                {
+                                        break;
+                                }
+                                else
+                                {
+                                        markersToRemove.push(marker);
+                                        this._markers.shift();
+                                }
+                        }
+
+                        if (cluster)
+                                clustersToAdd.push(cluster);
+                }
+
+                if (document.is_debug) glog('reused ' + newMarkers.length + ' exact markers');
+                markersToRemove = markersToRemove.concat( this._markers );
+
+                var infoWindowMarker = this._infoWindow.getAnchor();
+                for (i=0; i<clustersToAdd.length; i++)
+                {
+                        var cluster = clustersToAdd[i];
+                        var theTitle = "";
+                        if (cluster.nb_items>1)
+                                theTitle = Localization.fmt1("%d photos", cluster.nb_items);
+                        else
+                                theTitle = cluster.items[0].name;
+
+                        var marker = markersToRemove.pop();
+                        if (marker && marker==infoWindowMarker)
+                        {
+                                marker.setMap(null);
+                                google.maps.event.clearInstanceListeners(marker);
+                                if (document.is_debug) glog('removed marker with infoWindow');
+                                marker = this._markers.pop();
+                        }
+
+                        if (!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.setPosition( cluster.position );
+                                marker.setTitle(theTitle);
+                        }
+
+                        newMarkers.push(marker);
+
+                        marker.pwg = {
+                                nb_items: cluster.nb_items,
+                                images: cluster.items,
+                                bounds: cluster.bounds,
+                                blowup_url: cluster.blowup_url
+                                };
+                }
+
+                for (i=0; i<markersToRemove.length; i++)
+                {
+                        markersToRemove[i].setMap(null);
+                        google.maps.event.clearInstanceListeners(markersToRemove[i]);
+                }
+
+                this._markers = newMarkers;
+                this._markers.sort( function(a,b) { return PwgDataHandler.cmpll( a.getPosition(), b.getPosition()); } );
+// END new
+                
+/*              var newMarkers = [];
                 var infoWindowMarker = this._infoWindow.getAnchor();
 
@@ -123 +216 @@
                         google.maps.event.clearInstanceListeners(this._markers[i]);
                 }
-
+*/
                 this._markers = newMarkers;
                 this._prevResult.nb_items=data.nb_items;
@@ -207 +300 @@
 _onInfoWindowDomReady: function()
 {
-        if (this._recursionProtect)
-                return;
         if (!this._infoWindow.getAnchor() || this._infoWindow.getAnchor().pwg.images.length<2)
                 return;
-        try {
-                this._recursionProtect = 1;
-                for (var i=0; i< this._navHtmlIds.length; i++)
-                {
-                        var elt = document.getElementById( this._navHtmlIds[i] );
-                        if (elt)
-                                this._navHtmlHandles.push( google.maps.event.addDomListener(elt, "click", pwgBind(this, this._onPictureNavigate, this._infoWindow.getAnchor(), i) ) );
-                }
-        }
-        finally {
-                this._recursionProtect = 0;
+        for (var i=0; i< this._navHtmlIds.length; i++)
+        {
+                var elt = document.getElementById( this._navHtmlIds[i] );
+                if (elt)
+                        this._navHtmlHandles.push( google.maps.event.addDomListener(elt, "click", pwgBind(this, this._onPictureNavigate, this._infoWindow.getAnchor(), i) ) );
         }
 },
@@ -267 +352 @@
 }
 
+PwgDataHandler.cmpll = function(a,b) {
+        var d= a.lng() - b.lng();
+        if (d < -.5e-6)
+                return -1;
+        else if (d > .5e-6)
+                return 1;
+        d= a.lat() - b.lat();
+        if (d < -.5e-6)
+                return -1;
+        else if (d > .5e-6)
+                return 1;
+        return 0;
+}
 
 String.prototype.urlNoHtm = function()