Changeset 5896

Timestamp:

01/25/08 18:13:57 (1 year ago)

Author:

ahocevar

Message:

SelectFeature and OpenLayers.Feature.Vector.styleselect?: changed Control.SelectFeature to inherit properties that are not set in selectStyle from feature.style. r=tschaub (closes #1260)

Files:

• trunk/openlayers/lib/OpenLayers/Control/SelectFeature.js (modified) (1 diff)
• trunk/openlayers/tests/Control/test_SelectFeature.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Control/SelectFeature.js

@@ -221 +221 @@
-    select: function(feature) {
-        // Store feature style for restoration later
-== null
+!= feature.style
-            feature.originalStyle = feature.style;
-        }
-        this.layer.selectedFeatures.push(feature);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        this.layer.drawFeature(feature);
-        this.onSelect(feature);

trunk/openlayers/tests/Control/test_SelectFeature.html

@@ -34 +34 @@
-    
-    function test_Control_SelectFeature_select(t) {
-2
+7
-        var map = new OpenLayers.Map("map");
-        var layer = new OpenLayers.Layer.Vector();
@@ -46 +46 @@
-        control.unselect(feature);
-        t.eq(feature.style.strokeColor, OpenLayers.Feature.Vector.style['default'].strokeColor, "feature style is set back to old style");
+        
+        // Don't ever overwrite my feature style with undefined properties from the selectStyle
+        feature.style = {externalGraphic: "foo.png", pointRadius: 39};
+        control.selectStyle.pointRadius = undefined;
+        control.select(feature);
+        t.eq(feature.style.pointRadius, 39, "undefined style property inherited from original feature style");
+        control.unselect(feature);
+        
+        // Ok, that one went well. But I'm sure you cannot handle OL.Style.
+        feature.style = new OpenLayers.Style({externalGraphic: "foo.png", pointRadius: 39});
+        control.select(feature);
+        t.eq(feature.style.pointRadius, 39, "undefined style property inherited from original feature style object");
+        control.unselect(feature);
+        
+        // Wow, but using OL.Style as selectStyle will break you.
+        control.selectStyle = new OpenLayers.Style({strokeColor: "green"});
+        control.select(feature);
+        t.eq(feature.style.strokeColor, "green", "style correct if both feature.style and selectStyle are OL.Style");
+        control.unselect(feature);
+        
+        // Not bad, not bad. And what if I set feature.style back to a style hash?
+        feature.style = layer.style;
+        control.select(feature);
+        t.eq(feature.style.strokeColor, "green", "style still correct with only selectStyle being OL.Style");
+        control.unselect(feature);
+        t.eq(feature.style.strokeColor, OpenLayers.Feature.Vector.style["default"].strokeColor, "style set back to original correctly");
-    }
-