Changeset 5978

Timestamp:

02/03/08 12:48:19 (1 year ago)

Author:

ahocevar

Message:

evaluation of else filter in SLD. r=tschaub (closes #1317)

Files:

• trunk/openlayers/examples/georss-flickr.html (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Format/SLD.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Rule.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Style.js (modified) (3 diffs)
• trunk/openlayers/tests/test_Style.html (modified) (1 diff)

trunk/openlayers/examples/georss-flickr.html

@@ -42 +42 @@
-            // If the above rule does not apply, use a smaller pointRadius.
-            var elseRule = new OpenLayers.Rule({
+                    elseFilter: true,
-                    symbolizer: {"Point": {pointRadius: 20}}});
-            
@@ -70 +71 @@
-            popupControl.activate();
-            
-"", null
+null, window
-            
-        }
@@ -89 +90 @@
-                    createFeatureFromItem: createFeatureFromItem});
-
-XML
+Text
-
-
-
-
-
-
+
-            markerLayer.addFeatures(rss);
-        }

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

@@ -208 +208 @@
-            var rule = this.parseFilter(filter[0]);
-        } else {
-rule applies to all features (no filter or ElseFilter)
+start with an empty rule that always applies
-            var rule = new OpenLayers.Rule();
-
+
+
+
+
+
+
+
+
-        rule.name = name;
-        

trunk/openlayers/lib/OpenLayers/Rule.js

@@ -21 +21 @@
-    name: 'default',
-
+    /**
+     * Property: elseFilter
+     * {Boolean} Determines whether this rule is only to be applied only if
+     * no other rules match (ElseFilter according to the SLD specification). 
+     * Default is false.  For instances of OpenLayers.Rule, if elseFilter is
+     * false, the rule will always apply.  For subclasses, the else property is 
+     * ignored.
+     */
+    elseFilter: false,
+    
-    /**
-     * Property: symbolizer

trunk/openlayers/lib/OpenLayers/Style.js

@@ -112 +112 @@
-        
-        var rules = this.rules;
-        var draw = rules.length == 0 ? true : false;
-
-        var rule;
-
+
+
+
-            rule = rules[i];
-        
+
-            var applies = rule.evaluate(feature);
-            
@@ -133 +134 @@
-                        rule.maxScaleDenominator, feature);
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -155 +155 @@
-        // calculate literals for all styles in the propertyStyles cache
-        this.createLiterals(style, feature);
-
+
+
+
+
+
+
+
-        
-        return style;
+    },
+    
+    /**
+     * Method: applySymbolizer
+     *
+     * Parameters:
+     * rule - {OpenLayers.Rule}
+     * style - {Object}
+     * feature - {<OpenLayer.Feature.Vector>}
+     *
+     * Returns:
+     * {Object} A style with new symbolizer applied.
+     */
+    applySymbolizer: function(rule, style, feature) {
+        var symbolizerPrefix = feature.geometry ?
+                this.getSymbolizerPrefix(feature.geometry) :
+                OpenLayers.Style.SYMBOLIZER_PREFIXES[0];
+
+        // merge the style with the current style
+        var symbolizer = rule.symbolizer[symbolizerPrefix];
+        return OpenLayers.Util.extend(style, symbolizer);
-    },
-    

trunk/openlayers/tests/test_Style.html

@@ -88 +88 @@
-        t.eq(createdStyle.fillColor, baseStyle.fillColor, "Correct style for rule that does not apply to fid=\"2\".");
-    }
+    
+    function test_Style_createStyle(t) {
+        t.plan(2);
+        var style = new OpenLayers.Style();
+        var rule = new OpenLayers.Rule({
+            id: Math.random()
+        });
+        var elseRule = new OpenLayers.Rule({
+            id: Math.random(),
+            elseFilter: true
+        });
+        style.addRules([rule, elseRule]);
+
+        // test that applySymbolizer is only called with rule
+        style.applySymbolizer = function(r) {
+            t.eq(r.id, rule.id, "(plain) applySymbolizer called with correct rule");
+        }
+        style.createStyle(new OpenLayers.Feature.Vector());
+
+        rule.evaluate = function() {return false;};
+        style.applySymbolizer = function(r) {
+            t.eq(r.id, elseRule.id, "(else) applySymbolizer called with correct rule");
+        }
+        style.createStyle(new OpenLayers.Feature.Vector());
+
+
+    }
-
-    function test_Style_destroy(t) {