Changeset 6396

Timestamp:

02/28/08 12:57:37 (6 months ago)

Author:

ahocevar

Message:

* Style and Rule now have separate context properties

• new convenience method addUniqueValueRules in OL.StyleMap. This can actually be used to achieve what I was trying to show in the example of this ticket's description.
  
• some refactoring of OL.Style to remove duplicate code (with tests)
  
• a new example showing how to add a "unique value" legend to a point layer using the new addUniqueValueRules method
  
• Rule.symbolizer can now also be just a symbolizer, instead of a hash of symbolizers keyed by "Point", "Line", "Polygon". This will make things even simpler (as can be seen in the styles-unique.html example)
  

r=tschaub (closes #1373)

Files:

• trunk/openlayers/examples/styles-unique.html (added)
• trunk/openlayers/lib/OpenLayers/Rule.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Style.js (modified) (6 diffs)
• trunk/openlayers/lib/OpenLayers/StyleMap.js (modified) (1 diff)
• trunk/openlayers/tests/Rule/test_Comparison.html (modified) (2 diffs)
• trunk/openlayers/tests/test_Style.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Rule.js

@@ -23 +23 @@
-    /**
-     * Property: context
-and its
-symbolizers' property values should be evaluatad against. If no
-context is specified, feature.attributes will be used
+should be
+evaluatad against. If no context is specified, feature.attributes will
+be used.
-     */
-    context: null,
@@ -41 +41 @@
-    /**
-     * Property: symbolizer
-Hash of styles for this rule. Contains hashes of feature
-tyles. K
+Symbolizer or hash of symbolizers for this rule. If hash of
+ymbolizers, k
-     */
-    symbolizer: null,

trunk/openlayers/lib/OpenLayers/Style.js

@@ -42 +42 @@
-    
-    /**
+     * Property: context
+     * {Object} An optional object with properties that symbolizers' property
+     * values should be evaluatad against. If no context is specified,
+     * feature.attributes will be used
+     */
+    context: null,
+
+    /**
-     * Property: defaultStyle
-     * {Object} hash of style properties to use as default for merging
@@ -117 +125 @@
-        for(var i=0; i<rules.length; i++) {
-            rule = rules[i];
-            context = rule.context;
-            if (!context) {
-                context = feature.attributes || feature.data;
-            }
-            // does the rule apply?
-            var applies = rule.evaluate(feature);
@@ -129 +133 @@
-                } else {
-                    appliedRules = true;
-, context
+
-                }
-            }
@@ -138 +142 @@
-            appliedRules = true;
-            for(var i=0; i<elseRules.length; i++) {
-, context
+
-            }
-        }
@@ -159 +163 @@
-     * style - {Object}
-     * feature - {<OpenLayer.Feature.Vector>}
-     * context - {Object}
-     *
-     * Returns:
-     * {Object} A style with new symbolizer applied.
-     */
-, context
+
-        var symbolizerPrefix = feature.geometry ?
-                this.getSymbolizerPrefix(feature.geometry) :
-                OpenLayers.Style.SYMBOLIZER_PREFIXES[0];
-
-
-
+
+
+
+
-        // merge the style with the current style
-        return this.createLiterals(
@@ -213 +218 @@
-        // check the default style
-        var style = this.defaultStyle;
-
-
-
-
-
+
-
-        // walk through all rules to check for properties in their symbolizer
-        var rules = this.rules;
-prefixes = OpenLayers.Style.SYMBOLIZER_PREFIXES
+symbolizer, value
-        for (var i=0; i<rules.length; i++) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
+            }
+        }
+        return propertyStyles;
+    },
+    
+    /**
+     * Method: addPropertyStyles
+     * 
+     * Parameters:
+     * propertyStyles - {Object} hash to add new property styles to. Will be
+     *                  modified inline
+     * symbolizer     - {Object} search this symbolizer for property styles
+     * 
+     * Returns:
+     * {Object} propertyStyles hash
+     */
+    addPropertyStyles: function(propertyStyles, symbolizer) {
+        var property;
+        for (var key in symbolizer) {
+            property = symbolizer[key];
+            if (typeof property == "string" &&
+                    property.match(/\$\{\w+\}/)) {
+                propertyStyles[key] = true;
-            }
-        }

trunk/openlayers/lib/OpenLayers/StyleMap.js

@@ -111 +111 @@
-            this.styles[intent].createSymbolizer(feature));
-    },
+    
+    /**
+     * Method: addUniqueValueRules
+     * Convenience method to create comparison rules for unique values of a
+     * property. The rules will be added to the style object for a specified
+     * rendering intent. This method is a shortcut for creating something like
+     * the "unique value legends" familiar from well known desktop GIS systems
+     * 
+     * Parameters:
+     * renderIntent - {String} rendering intent to add the rules to
+     * property     - {String} values of feature attributes to create the
+     *                rules for
+     * symbolizers  - {Object} Hash of symbolizers, keyed by the desired
+     *                property values 
+     */
+    addUniqueValueRules: function(renderIntent, property, symbolizers) {
+        var rules = [];
+        for (var value in symbolizers) {
+            rules.push(new OpenLayers.Rule.Comparison({
+                type: OpenLayers.Rule.Comparison.EQUAL_TO,
+                property: property,
+                value: value,
+                symbolizer: symbolizers[value]}));
+        }
+        this.styles[renderIntent].addRules(rules);
+    },
-
-    CLASS_NAME: "OpenLayers.StyleMap"

trunk/openlayers/tests/Rule/test_Comparison.html

@@ -39 +39 @@
-    
-    function test_Comparison_evaluate(t) {
-3
+4
-        
-        var rule = new OpenLayers.Rule.Comparison({
@@ -63 +63 @@
-                    " evaluates to "+result.toString()+" correctly.");
-        }
+        rule.context = {
+            area: 4998
+        }
+        var result = rule.evaluate();
+        t.eq(result, true, "evaluation against custom rule context works.");
-    }
-    </script> 

trunk/openlayers/tests/test_Style.html

@@ -117 +117 @@
-    function test_Style_context(t) {
-        t.plan(1);
-        var context = {
-            foo: "bar",
-            size: 10};
-        var rule = new OpenLayers.Rule.Comparison({
-            type: OpenLayers.Rule.Comparison.LESS_THAN,
-            context: context,
-            property: "size",
-            value: 11,
-foo}.png
+img1}
-        var style = new OpenLayers.Style();
+        style.context = {
+            "img1": "myImage.png"
+        };
-        style.addRules([rule]);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-