X-Git-Url: https://dev.renevier.net/gitweb.cgi?p=syp.git;a=blobdiff_plain;f=js%2Fsyp.js;h=0f7785491f15a681bc556a81d0e089e7e39376a3;hp=8c2e5bca13e910f427d45abab9046c04bf932f86;hb=19730f2e2bbf61f389882c646f58349df3bcd848;hpb=67d307303acfea6e719a51e437833c76408ef703

diff --git a/js/syp.js b/js/syp.js
index 8c2e5bc..0f77854 100644
--- a/js/syp.js
+++ b/js/syp.js
@@ -127,13 +127,23 @@ var SYP = {
     createDataLayer: function(map) {
         var defaultStyle = new OpenLayers.Style({
             externalGraphic: this.Markers.ICON,
-            graphicHeight: "${height}"
+            graphicHeight: "${height}",
+            label: "${label}",
+            fontColor: "white",
+            fontWeight: "bold"
         }, {
             context: {
                 height: function(feature) {
                     var defaultHeight = SYP.Markers.HEIGHT || 32;
                     var increase = 4 * (feature.attributes.count - 1);
                     return Math.min(defaultHeight + increase, 50);
+                },
+                label: function(feature) {
+                    var renderer = feature.layer.renderer;
+                    if (renderer.CLASS_NAME == "OpenLayers.Renderer.Canvas") {
+                        return ""; // canvas backend cannot draw text above an external Image
+                    }
+                    return (feature.attributes.count > 1) ? feature.attributes.count: "";
                 }
             }
         });
@@ -236,11 +246,36 @@ var SYP = {
         }
     },
 
+    onZoomClusterEnd: function(arg) {
+        var map = arg.object;
+        var point = new OpenLayers.Geometry.Point(this.lonlat.lon, this.lonlat.lat);
+        var center = map.getCenter();
+        for (var i = this.layer.features.length; i-->0;) {
+            var feature = this.layer.features[i];
+            if (feature.geometry.equals(point) && 
+                (feature.attributes.count == this.count)) {
+                   var self = this;
+                   window.setTimeout(function() { map.setCenter(self.lonlat, map.zoom + 1)}, 500);
+                   return;
+            }
+        }
+        SYP.selectControl.activate();
+        map.events.unregister("zoomend", this, SYP.onZoomClusterEnd);
+    },
+
     onFeatureSelect: function(feature) {
         var map = feature.layer.map;
+
         if (feature.attributes.count > 1) {
             this.unselect(feature);
             var lonlat = new OpenLayers.LonLat(feature.geometry.x, feature.geometry.y);
+            var args = {
+                lonlat: lonlat,
+                layer: feature.layer,
+                count: feature.attributes.count
+            }
+            map.events.register("zoomend", args, SYP.onZoomClusterEnd);
+            SYP.selectControl.deactivate();
             map.setCenter(lonlat, map.zoom + 1);
             return;
         }