Changeset 2949

Timestamp:

04/01/07 08:08:13 (2 years ago)

Author:

crschmidt

Message:

• Remove default styling from the Feature.Vector class.
  
• Add a 'style' property to the layer.
  
• When a feature is added to a layer, either uses the style on the
  layer, or uses the default feature style.
  
• Add test to Layer.Vector for this funcionality
  
• Adds a preFeatureInsert hook to change a feature *before*
  drawing it.
  
• Change openmnnd demo to include the use of preFeatureInsert
  and style attribute on layer.
  

Files:

• trunk/openlayers/examples/openmnnd.html (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Feature/Vector.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Vector.js (modified) (3 diffs)
• trunk/openlayers/tests/Layer/test_Vector.html (modified) (1 diff)

trunk/openlayers/examples/openmnnd.html

@@ -30 +30 @@
-            
-            wfs = new OpenLayers.Layer.WFS("Minnesota Streams (WFS)", wfs_url, {'typename':'streams'}, {ratio:1.25, minZoomLevel:4});
-
+
+
+
+
+
+
+
-            map.addLayer(wfs);
-            
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            map.addLayer(pwfs); 
-            
-
-
+
+
+
+
+
+
+
+
+
-            map.addLayer(rwfs); 
-            

trunk/openlayers/lib/OpenLayers/Feature/Vector.js

@@ -52 +52 @@
-            OpenLayers.Util.extend(this.attributes, data);
-        }    
-OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
+null; 
-    },
-    

trunk/openlayers/lib/OpenLayers/Layer/Vector.js

@@ -37 +37 @@
-    reportError: true, 
-
+    /** @type {Object} */
+    style: null,
+
-    /**
-     * List of supported Renderer classes. Add to this list to
@@ -225 +228 @@
-            feature.layer = this;
-
+            if (!feature.style) {
+                if (this.style) {
+                    feature.style = OpenLayers.Util.extend({}, this.style);
+                } else {
+                    feature.style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
+                }    
+            }
+
+            this.preFeatureInsert(feature);
+
-            if (this.drawn) {
-                this.renderer.drawGeometry(feature.geometry, feature.style);
@@ -316 +329 @@
-    onFeatureInsert: function(feature) {
-    },
+    
+    /**
+     * method called before a feature is inserted.
+     * Does nothing by default. Override this if you
+     * need to do something when features are first added to the
+     * layer, but before they are drawn, such as adjust the style.
+     * 
+     * @param {OpenLayers.Feature.Vector} feature
+     */
+    preFeatureInsert: function(feature) {
+    },
-
-    /** @final @type String */

trunk/openlayers/tests/Layer/test_Vector.html

@@ -45 +45 @@
-        t.ok(layer.features.length == 1, "OpenLayers.Layer.Vector.removeFeatures removes a feature from the features array");
-    }
+    
+    function test_Layer_Vector_addsStyle (t) {
+        t.plan(2);    
+        layer = new OpenLayers.Layer.Vector(name);
+        var map = new OpenLayers.Map('map');
+        map.addLayer(layer);
+        f = new OpenLayers.Feature.Vector();
+        t.eq( f.style,  null, "Feature style is null by default.");
+        layer.addFeatures(f);
+        t.ok( f.style != null, "Feature style is set by layer.");
+    }
-
-    function test_99_Layer_Vector_destroy (t) {