ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adding support for cloning rules and filters. r=ahocevar (closes #1919)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@9071 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2009-03-17 16:08:12 +00:00
parent 7fa74f1b0b
commit 576e931dac
11 changed files with 241 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/OpenLayers/Filter.js
View File

@@ -51,5 +51,16 @@ OpenLayers.Filter = OpenLayers.Class({
return true;
},
/**
* APIMethod: clone
* Clones this filter. Should be implementted by subclasses.
*
* Returns:
* {<OpenLayers.Filter>} Clone of this filter.
*/
clone: function() {
return null;
},
CLASS_NAME: "OpenLayers.Filter"
});
});

11
lib/OpenLayers/Filter/Comparison.js
View File

@@ -230,6 +230,17 @@ OpenLayers.Filter.Comparison = OpenLayers.Class(OpenLayers.Filter, {
return value;
},
/**
* APIMethod: clone
* Clones this filter.
*
* Returns:
* {<OpenLayers.Filter.Comparison>} Clone of this filter.
*/
clone: function() {
return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison(), this);
},
CLASS_NAME: "OpenLayers.Filter.Comparison"
});

14
lib/OpenLayers/Filter/FeatureId.js
View File

@@ -62,5 +62,19 @@ OpenLayers.Filter.FeatureId = OpenLayers.Class(OpenLayers.Filter, {
return false;
},
/**
* APIMethod: clone
* Clones this filter.
*
* Returns:
* {<OpenLayers.Filter.FeatureId>} Clone of this filter.
*/
clone: function() {
var filter = new OpenLayers.Filter.FeatureId();
OpenLayers.Util.extend(filter, this);
filter.fids = this.fids.slice();
return filter;
},
CLASS_NAME: "OpenLayers.Filter.FeatureId"
});

18
lib/OpenLayers/Filter/Logical.js
View File

@@ -90,6 +90,24 @@ OpenLayers.Filter.Logical = OpenLayers.Class(OpenLayers.Filter, {
}
},
/**
* APIMethod: clone
* Clones this filter.
*
* Returns:
* {<OpenLayers.Filter.Logical>} Clone of this filter.
*/
clone: function() {
var filters = [];
for(var i=0, len=this.filters.length; i<len; ++i) {
filters.push(this.filters[i].clone());
}
return new OpenLayers.Filter.Logical({
type: this.type,
filters: filters
});
},
CLASS_NAME: "OpenLayers.Filter.Logical"
});

13
lib/OpenLayers/Filter/Spatial.js
View File

@@ -104,6 +104,19 @@ OpenLayers.Filter.Spatial = OpenLayers.Class(OpenLayers.Filter, {
return intersect;
},
/**
* APIMethod: clone
* Clones this filter.
*
* Returns:
* {<OpenLayers.Filter.Spatial>} Clone of this filter.
*/
clone: function() {
var options = OpenLayers.Util.applyDefaults({
value: this.value && this.value.clone && this.value.clone()
}, this);
return new OpenLayers.Filter.Spatial(options);
},
CLASS_NAME: "OpenLayers.Filter.Spatial"
});

30
lib/OpenLayers/Rule.js
View File

@@ -101,10 +101,9 @@ OpenLayers.Rule = OpenLayers.Class({
* {<OpenLayers.Rule>}
*/
initialize: function(options) {
this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
this.symbolizer = {};
OpenLayers.Util.extend(this, options);
this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
},
/**
@@ -178,6 +177,33 @@ OpenLayers.Rule = OpenLayers.Class({
}
return context;
},
/**
* APIMethod: clone
* Clones this rule.
*
* Returns:
* {<OpenLayers.Rule>} Clone of this rule.
*/
clone: function() {
var options = OpenLayers.Util.extend({}, this);
// clone symbolizer
options.symbolizer = {};
for(var key in this.symbolizer) {
value = this.symbolizer[key];
type = typeof value;
if(type === "object") {
options.symbolizer[key] = OpenLayers.Util.extend({}, value);
} else if(type === "string") {
options.symbolizer[key] = value;
}
}
// clone filter
options.filter = this.filter && this.filter.clone();
// clone context
options.context = this.context && OpenLayers.Util.extend({}, this.context);
return new OpenLayers.Rule(options);
},
CLASS_NAME: "OpenLayers.Rule"
});

23
tests/Filter/Comparison.html
View File

@@ -175,6 +175,29 @@
}
}
function test_clone(t) {
t.plan(3);
var filter = new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: "prop",
value: "val"
});
var clone = filter.clone();
// modify the original
filter.type = OpenLayers.Filter.Comparison.NOT_EQUAL_TO;
t.eq(clone.type, OpenLayers.Filter.Comparison.EQUAL_TO, "clone has proper type");
t.eq(clone.property, "prop", "clone has proper property");
t.eq(clone.value, "val", "clone has proper value");
filter.destroy();
}
</script>

20
tests/Filter/FeatureId.html
View File

@@ -40,6 +40,26 @@
feature.destroy();
}
}
function test_clone(t) {
t.plan(1);
var filter = new OpenLayers.Filter.FeatureId({
fids: [1, 2, 3]
});
var clone = filter.clone();
// modify the original
filter.fids.push(4);
t.eq(clone.fids.length, 3, "clone has proper fids length");
filter.destroy();
}
</script>
</head>
<body>

34
tests/Filter/Logical.html
View File

@@ -34,6 +34,40 @@
t.eq(filter.evaluate(feature.attributes), false,
"feature evaluates to false correctly.");
}
function test_clone(t) {
t.plan(2);
var filter = new OpenLayers.Filter.Logical({
type: OpenLayers.Filter.Logical.AND,
filters: [
new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: "prop1",
value: "val1"
}),
new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.NOT_EQUAL_TO,
property: "prop2",
value: "val2"
})
]
});
var clone = filter.clone();
// modify the original
filter.type = OpenLayers.Filter.Logical.OR;
filter.filters[0].value = "nada";
t.eq(clone.type, OpenLayers.Filter.Logical.AND, "clone has proper type");
t.eq(clone.filters[0].value, "val1", "clone has cloned child filters");
filter.destroy();
}
</script>
</head>
<body>

25
tests/Filter/Spatial.html
View File

@@ -71,6 +71,31 @@
t.eq(res, false,
"evaluates returns correct value when feature does not intersect bounds");
}
function test_clone(t) {
t.plan(2);
var bounds = new OpenLayers.Bounds(0, 0, 10, 10);
var filter = new OpenLayers.Filter.Spatial({
type: OpenLayers.Filter.Spatial.BBOX,
value: bounds
});
var clone = filter.clone();
// modify the original
filter.value.bottom = -100;
t.eq(clone.type, OpenLayers.Filter.Spatial.BBOX, "clone has proper type");
t.eq(clone.value.toBBOX(), "0,0,10,10", "clone has proper value");
filter.destroy();
clone.destroy();
}
</script>
</head>
<body>

43
tests/Rule.html
View File

@@ -40,6 +40,49 @@
t.eq(context.foobar, "world", "value returned by getContext is correct"
+ " if a context is given in constructor options");
}
function test_clone(t) {
t.plan(7);
var rule = new OpenLayers.Rule({
name: "test rule",
minScaleDenominator: 10,
maxScaleDenominator: 20,
filter: new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.EQUAL_TO,
property: "prop",
value: "value"
}),
symbolizer: {
fillColor: "black"
},
context: {
foo: "bar"
}
});
var clone = rule.clone();
t.eq(clone.name, "test rule", "name copied");
t.eq(clone.minScaleDenominator, 10, "minScaleDenominator copied");
t.eq(clone.filter.type, OpenLayers.Filter.Comparison.EQUAL_TO, "clone has correct filter type");
// modify original
rule.filter.property = "new";
rule.symbolizer.fillColor = "white";
rule.context.foo = "baz";
// confirm that clone didn't change
t.eq(clone.filter.property, "prop", "clone has clone of filter");
t.eq(clone.symbolizer.fillColor, "black", "clone has clone of symbolizer");
t.eq(clone.context.foo, "bar", "clone has clone of context");
// confirm that ids are different
t.ok(clone.id !== rule.id, "clone has different id");
rule.destroy();
clone.destroy();
}
function test_Rule_destroy(t) {
t.plan(1);