Changeset 6240

Timestamp:

02/12/08 18:05:47 (7 months ago)

Author:

ahocevar

Message:

"users should be able to customize the select style per feature": Created a StyleMap class which stores all styles that are needed for a layer. Controls that need to render features differently can now just give a render intent (e.g. "default", "select" or "temporary") to the layer's drawFeature method, instead of having extra style informations like Control.SelectFeature.selectStyle. Existing application that set layer.style or feature.style are still supported, but both of these style properties are now null by default. r=crschmidt,elemoine,tschaub (closes #1120)

Files:

• trunk/openlayers/examples/georss-flickr.html (modified) (2 diffs)
• trunk/openlayers/examples/openmnnd.html (modified) (2 diffs)
• trunk/openlayers/examples/osm-layer.html (modified) (1 diff)
• trunk/openlayers/examples/sld.html (modified) (3 diffs)
• trunk/openlayers/examples/wfs-scribble.html (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/ModifyFeature.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Control/SelectFeature.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Feature/Vector.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Format/SLD.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Layer/Vector.js (modified) (5 diffs)
• trunk/openlayers/lib/OpenLayers/Style.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/StyleMap.js (added)
• trunk/openlayers/tests/Control/test_ModifyFeature.html (modified) (2 diffs)
• trunk/openlayers/tests/Control/test_SelectFeature.html (modified) (2 diffs)
• trunk/openlayers/tests/Layer/test_Vector.html (modified) (3 diffs)
• trunk/openlayers/tests/list-tests.html (modified) (1 diff)
• trunk/openlayers/tests/test_Style.html (modified) (10 diffs)
• trunk/openlayers/tests/test_StyleMap.html (added)

trunk/openlayers/examples/georss-flickr.html

@@ -32 +32 @@
-            style = new OpenLayers.Style({externalGraphic: "${thumbnail}"});
-            
+            // make the thumbnails larger when we select them
+            selectStyle = new OpenLayers.Style({pointRadius: 35});
+            
-            // create a rule with a point symbolizer that will make the thumbnail
-            // larger if the title of the rss item conatins "powder"
@@ -48 +51 @@
-            style.addRules([rule, elseRule]);
-            
-
+
+
+
-            map.addLayer(markerLayer);
-            
-            // control that will show a popup when clicking on a thumbnail
-            var popupControl = new OpenLayers.Control.SelectFeature(markerLayer, {
-              selectStyle: style,
-              onSelect: function(feature) {
-                  var pos = feature.geometry;

trunk/openlayers/examples/openmnnd.html

@@ -29 +29 @@
-            map.addLayer(wms);
-
-
+, style: OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default'])
-
-            // preFeatureInsert can be used to set style before the feature is drawn
@@ -58 +58 @@
-
-            rstyle = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
-I
+i
-            rwfs = new OpenLayers.Layer.WFS("Minnesota Roads (WFS)", wfs_url, {'typename':'roads'},
-              {ratio:1.25, minZoomLevel:7, extractAttributes: true, style:rstyle});

trunk/openlayers/examples/osm-layer.html

@@ -48 +48 @@
-        }
-        function style_osm_feature(feature) {
-.fill = "black"
+ = OpenLayers.Util.extend({'fill':'black'}, OpenLayers.Feature.Vector.style['default'])
-            if (feature.attributes.highway == "motorway") {
-                feature.style.strokeColor = "blue";

trunk/openlayers/examples/sld.html

@@ -33 +33 @@
-            styles = sld[1];
-            
-
+
+
+
+
-            
-            gmlLayers = [
@@ -39 +42 @@
-                    new OpenLayers.Layer.GML("StateBoundaries",
-                            "tasmania/TasmaniaStateBoundaries.xml", {
-: waterStyle["default"]
+Map: new OpenLayers.StyleMap(styles["WaterBodies"])
-                    new OpenLayers.Layer.GML("Roads",
-                            "tasmania/TasmaniaRoads.xml", {
-: waterStyle["default"]
+Map: new OpenLayers.StyleMap(styles["Roads"])
-                    new OpenLayers.Layer.GML("WaterBodies",
-                            "tasmania/TasmaniaWaterBodies.xml", {
-: waterStyle["default"]
+Map: new OpenLayers.StyleMap(styles["WaterBodies"])
-                    new OpenLayers.Layer.GML("Cities",
-                            "tasmania/TasmaniaCities.xml", {
-: waterStyle["default"]
+Map: new OpenLayers.StyleMap(styles["Cities"])
- 
-
-
-
-
-
-
-
-
-
-
+
+
-            }
-            
-            // SLD can also be used for the SelectFeature control
-            waterStyle["Hover Styler"].defaultStyle =
-                    OpenLayers.Feature.Vector.style["select"];
-            hover = new OpenLayers.Control.SelectFeature(gmlLayers[2], {
-selectStyle: waterStyle["Hover Styler"]
-hover: true
+hover: true
+renderIntent: "Hover Styler"
-                });
-            map.addControl(hover);
@@ -75 +67 @@
-        // set a new style when the radio button changes
-        function setStyle(styleName) {
+            gmlLayers[2].styleMap.styles["default"] = styles["WaterBodies"][styleName];
-            // change the style of the features of the WaterBodies layer
-            var features = gmlLayers[2].features;
-            for (var i=0; i<features.length; i++) {
-                features[i].style = waterStyle[styleName];
-            }
-            gmlLayers[2].redraw();
-        }

trunk/openlayers/examples/wfs-scribble.html

@@ -36 +36 @@
-            df.featureAdded = function(feature) {
-              feature.state = OpenLayers.State.INSERT;
-['strokeColor'] = "#ff0000"
+ = OpenLayers.Util.extend({'strokeColor': '#ff0000'}, OpenLayers.Feature.Vector.style['default'])
-              feature.layer.drawFeature(feature);
-            }

trunk/openlayers/lib/OpenLayers.js

@@ -178 +178 @@
-            "OpenLayers/Layer/GML.js",
-            "OpenLayers/Style.js",
+            "OpenLayers/StyleMap.js",
-            "OpenLayers/Rule.js",
-            "OpenLayers/Rule/FeatureId.js",

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

@@ -168 +168 @@
-        this.vertices = [];
-        this.virtualVertices = [];
-
+
+
-        this.styleVirtual.fillOpacity = 0.3;
-        this.styleVirtual.strokeOpacity = 0.3;
@@ -410 +411 @@
-                this.virtualVertices = [];
-            }
-selectStyle
+renderIntent
-        }
-        // keep the vertex on top so it gets the mouseout after dragging
@@ -497 +498 @@
-                vertex.geometry.parent.removeComponent(vertex.geometry);
-                this.layer.drawFeature(this.feature,
-selectStyle
+renderIntent
-                this.resetVertices();
-                this.onModification(this.feature);

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

@@ -96 +96 @@
-     * {Object} Hash of styles
-     */
-
+
+
+
+
+
+
+
+
-
-    /**
@@ -248 +255 @@
-     */
-    select: function(feature) {
-        // Store feature style for restoration later
-        if(feature.originalStyle != feature.style) {
-            feature.originalStyle = feature.style;
-        }
-        this.layer.selectedFeatures.push(feature);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        this.layer.events.triggerEvent("featureselected", {feature: feature});
-        this.onSelect(feature);
@@ -281 +274 @@
-    unselect: function(feature) {
-        // Store feature style for restoration later
-
-
-
-
+
-        OpenLayers.Util.removeItem(this.layer.selectedFeatures, feature);
-        this.layer.events.triggerEvent("featureunselected", {feature: feature});

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

@@ -60 +60 @@
-    style: null,
-    
+    /**
+     * Property: renderIntent
+     * {String} rendering intent currently being used
+     */
+    renderIntent: "default",
+
-    /** 
-     * Constructor: OpenLayers.Feature.Vector

trunk/openlayers/lib/OpenLayers/Format/SLD.js

@@ -196 +196 @@
-     * Parameters:
-     * xmlNode - {<DOMElement>}
-     * name - {String} The name of the returned rule.
-     * 
-     * Returns:
@@ -568 +567 @@
-     * attributeName  - {String} name of the attribute to match
-     * attributeValue - {String} optional value of the attribute
-     *
-     * Returns:
-     * {DOMElement}
-     */
-    getNodeWithAttribute: function(xmlNodeList, attributeName, attributeValue) {

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

@@ -99 +99 @@
-     */
-    style: null,
+    
+    /**
+     * Property: styleMap
+     * {<OpenLayers.StyleMap>}
+     */
+    styleMap: null,
-
-    /**
@@ -148 +154 @@
-        );
-
-        var defaultStyle = OpenLayers.Feature.Vector.style['default'];
-        this.style = OpenLayers.Util.extend({}, defaultStyle);
-
-        OpenLayers.Layer.prototype.initialize.apply(this, arguments);
-
@@ -163 +166 @@
-            this.displayError();
-        } 
+
+        if (!this.styleMap) {
+            this.styleMap = new OpenLayers.StyleMap();
+        }
-
-        this.features = [];
@@ -313 +320 @@
-            feature.layer = this;
-
-
+ && this.style
-                feature.style = OpenLayers.Util.extend({}, this.style);
-            }
@@ -404 +411 @@
-     * Parameters: 
-     * feature - {<OpenLayers.Feature.Vector>} 
-
+Symbolizer hash or {String} renderIntent
-     */
-    drawFeature: function(feature, style) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        
-        this.renderer.drawFeature(feature, style);

trunk/openlayers/lib/OpenLayers/Style.js

@@ -44 +44 @@
-     * Property: defaultStyle
-     * {Object} hash of style properties to use as default for merging
- createStyle
-
+
+createSymbolizer 
-     */
-    defaultStyle: null,
@@ -97 +97 @@
-    
-    /**
-APIMethod: createStyle
+Method: createSymbolizer
-     * creates a style by applying all feature-dependent rules to the base
-     * style.
@@ -103 +103 @@
-     * Parameters:
-     * feature - {<OpenLayers.Feature>} feature to evaluate rules for
-
-
-
-
-
-
+
+
+
+
+
-        var style = OpenLayers.Util.extend({}, this.defaultStyle);
-        

trunk/openlayers/tests/Control/test_ModifyFeature.html

@@ -7 +7 @@
-        t.plan(3);
-        var layer = {
+            styleMap: {createSymbolizer: function(){}},
-            events: {
-                on: function() {}
@@ -78 +79 @@
-        
-        var control = new OpenLayers.Control.ModifyFeature({
-: null
+Map: {createSymbolizer: function(){}}
-            events: {
-                on: function() {}

trunk/openlayers/tests/Control/test_SelectFeature.html

@@ -34 +34 @@
-    
-    function test_Control_SelectFeature_select(t) {
-7
+2
-        var map = new OpenLayers.Map("map");
-        var layer = new OpenLayers.Layer.Vector();
@@ -41 +41 @@
-        var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(0,0));
-        layer.addFeatures(feature);
-
+
+
+
-        control.select(feature);
-style.strokeColor, OpenLayers.Feature.Vector.style['select'].strokeColor, "feature style is set to select style
+renderIntent, "select", "render intent is set to select
-        control.unselect(feature);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    

trunk/openlayers/tests/Layer/test_Vector.html

@@ -68 +68 @@
-        t.ok(layer.features.length == 0,
-             "OpenLayers.Layer.Vector.removeFeatures(layer.features) removes all feature from the features array");
-    }
-    
-    function test_Layer_Vector_addStyle (t) {
-        t.plan(2);    
-        var layer = new OpenLayers.Layer.Vector(name);
-        var map = new OpenLayers.Map('map');
-        map.addLayer(layer);
-        var g = new OpenLayers.Geometry.Point(0, 0);
-        var f = new OpenLayers.Feature.Vector(g);
-        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.");
-    }
-    
@@ -107 +95 @@
-             "calls layer.renderer.drawFeature() with feature.geometry");
-        
-'exists'
+{foo: "bar"}
-        layer.drawFeature(feature);
-        t.eq(feature.style, s,
@@ -113 +101 @@
-        
-        feature.style = null;
-'exists'
+{foo: "bar"}
-        layer.drawFeature(feature);
-, s
+.foo, s.foo
-             "given null feature style, uses layer style");
-
-'exists'
-'exists'
-'custom'
+{foo1: "bar1"}
+{foo2: "bar2"}
+{foo: "bar"}
-        layer.drawFeature(feature, customStyle);
-, s
+.foo, s.foo
-             "given a custom style, renders with that");
-        

trunk/openlayers/tests/list-tests.html

@@ -43 +43 @@
-    <li>Feature/test_Vector.html</li>
-    <li>test_Style.html</li>
+    <li>test_StyleMap.html</li>
-    <li>test_Rule.html</li>
-    <li>Rule/test_Comparison.html</li>

trunk/openlayers/tests/test_Style.html

@@ -12 +12 @@
-             "new OpenLayers.Style returns object" ); 
-        t.eq(style.foo, "bar", "constructor sets options correctly"); 
-tyle, "function", "style has a createStyle
+ymbolizer, "function", "style has a createSymbolizer
-    }
-    
@@ -46 +46 @@
-        var feature = new OpenLayers.Feature.Vector(
-                new OpenLayers.Geometry.Point(3,5),
-
-
+
-
-        feature.fid = "1";
-        // for this fid, the above rule should apply
+        
+        layer.styleMap = new OpenLayers.StyleMap(style);
-                
-        layer.addFeatures([feature]);
@@ -59 +60 @@
-
-        // at this scale, the feature should be green
-tyle
+ymbolizer
-        t.eq(createdStyle.externalGraphic, "barbar.png", "Calculated property style correctly.");
-        t.eq(createdStyle.display, "", "Feature is visible at scale "+map.getScale());
@@ -66 +67 @@
-        map.setCenter(new OpenLayers.LonLat(3,5), 9);
-        // at this scale, the feature should be red
-tyle
+ymbolizer
-        t.eq(createdStyle.display, "", "Feature is visible at scale "+map.getScale());
-        t.eq(createdStyle.fillColor, "yellow", "Point symbolizer from rule applied correctly.");
@@ -72 +73 @@
-        map.setCenter(new OpenLayers.LonLat(3,5), 8);
-        // at this scale, the feature should be yellow
-tyle
+ymbolizer
-        t.eq(createdStyle.display, "", "Feature is visible at scale "+map.getScale());
-        t.eq(createdStyle.fillColor, "red", "Point symbolizer from rule applied correctly.");
@@ -78 +79 @@
-        map.setCenter(new OpenLayers.LonLat(3,5), 7);
-        // at this scale, the feature should be invisible
-tyle
+ymbolizer
-        t.eq(createdStyle.display, "none", "Feature is invisible at scale "+map.getScale());
-        t.eq(createdStyle.fillColor, baseStyle.fillColor, "Point symbolizer from base style applied correctly.");
@@ -85 +86 @@
-        // now the rule should not apply
-        
-tyle
+ymbolizer
-        t.eq(createdStyle.fillColor, baseStyle.fillColor, "Correct style for rule that does not apply to fid=\"2\".");
-    }
-    
-tyle
+ymbolizer
-        t.plan(2);
-        var style = new OpenLayers.Style();
@@ -105 +106 @@
-            t.eq(r.id, rule.id, "(plain) applySymbolizer called with correct rule");
-        }
-tyle
+ymbolizer
-
-        rule.evaluate = function() {return false;};
@@ -111 +112 @@
-            t.eq(r.id, elseRule.id, "(else) applySymbolizer called with correct rule");
-        }
-tyle
+ymbolizer
-    }
-    
@@ -127 +128 @@
-        var style = new OpenLayers.Style();
-        style.addRules([rule]);
-tyle
+ymbolizer
-        t.eq(styleHash.externalGraphic, "bar.png", "correctly evaluated rule against a custom context");
-    }