SLD maps minScaleDenominator and maxScaleDenominator to rule minScale and maxScale. r=tschaub (closes #1297)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@5964 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -107,47 +107,75 @@ OpenLayers.Style = OpenLayers.Class({
|
||||
* Returns:
|
||||
* {<OpenLayers.Feature.Vector.style>} hash of feature styles
|
||||
*/
|
||||
createStyle: function(feature, baseStyle) {
|
||||
if (!baseStyle) {
|
||||
baseStyle = this.defaultStyle;
|
||||
}
|
||||
var style = OpenLayers.Util.extend({}, baseStyle);
|
||||
createStyle: function(feature) {
|
||||
var style = OpenLayers.Util.extend({}, this.defaultStyle);
|
||||
|
||||
var draw = true;
|
||||
var rules = this.rules;
|
||||
var draw = rules.length == 0 ? true : false;
|
||||
|
||||
for (var i=0; i<this.rules.length; i++) {
|
||||
var rule;
|
||||
for (var i=0; i<rules.length; i++) {
|
||||
rule = rules[i];
|
||||
// does the rule apply?
|
||||
var applies = this.rules[i].evaluate(feature);
|
||||
if (applies) {
|
||||
// check if within minScale/maxScale bounds
|
||||
var applies = rule.evaluate(feature);
|
||||
|
||||
if (rule.minScaleDenominator || rule.maxScaleDenominator) {
|
||||
var scale = feature.layer.map.getScale();
|
||||
if (this.rules[i].minScale) {
|
||||
draw = scale > OpenLayers.Style.createLiteral(
|
||||
this.rules[i].minScale, feature);
|
||||
}
|
||||
if (draw && this.rules[i].maxScale) {
|
||||
draw = scale < OpenLayers.Style.createLiteral(
|
||||
this.rules[i].maxScale, feature);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// check if within minScale/maxScale bounds
|
||||
if (rule.minScaleDenominator) {
|
||||
applies = scale >= OpenLayers.Style.createLiteral(
|
||||
rule.minScaleDenominator, feature);
|
||||
}
|
||||
if (applies && rule.maxScaleDenominator) {
|
||||
applies = scale < OpenLayers.Style.createLiteral(
|
||||
rule.maxScaleDenominator, feature);
|
||||
}
|
||||
|
||||
if (draw && rule.CLASS_NAME == "OpenLayers.Rule") {
|
||||
// apply plain rules only if no other applied (ElseFilter)
|
||||
applies = false;
|
||||
}
|
||||
|
||||
if (applies) {
|
||||
draw = true;
|
||||
|
||||
// determine which symbolizer (Point, Line, Polygon) to use
|
||||
var symbolizerPrefix = feature.geometry ?
|
||||
this.getSymbolizerPrefix(feature.geometry) :
|
||||
OpenLayers.Style.SYMBOLIZER_PREFIXES[0];
|
||||
|
||||
// now merge the style with the current style
|
||||
// merge the style with the current style
|
||||
var symbolizer = this.rules[i].symbolizer[symbolizerPrefix];
|
||||
OpenLayers.Util.extend(style, symbolizer);
|
||||
}
|
||||
}
|
||||
|
||||
style.display = draw ? "" : "none";
|
||||
|
||||
// calculate literals for all styles in the propertyStyles cache
|
||||
this.createLiterals(style, feature);
|
||||
style.display = draw ? "" : "none";
|
||||
|
||||
return style;
|
||||
},
|
||||
|
||||
/**
|
||||
* Method: createLiterals
|
||||
* creates literals for all style properties that have an entry in
|
||||
* <this.propertyStyles>.
|
||||
*
|
||||
* Parameters:
|
||||
* style - {Object} style to create literals for. Will be modified
|
||||
* inline.
|
||||
* feature - {<OpenLayers.Feature.Vector>} feature to take properties from
|
||||
*
|
||||
* Returns;
|
||||
* {Object} the modified style
|
||||
*/
|
||||
createLiterals: function(style, feature) {
|
||||
for (var i in this.propertyStyles) {
|
||||
style[i] = OpenLayers.Style.createLiteral(style[i], feature);
|
||||
}
|
||||
|
||||
return style;
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user