Pullup commits from trunk to 2.6 branch:
* virtualStyle typo (Closes #1495) * JSON fix for Safari 3.1 (Closes #1493) * panzoombar off-by-one (Closes #1486) * Handler Hover exception (Closes #1480) * Popup.framedcloud exception (Closes #1479) * VML Renderer when including namespace in page (Closes #1477) * SLD/Rule/Filter changes -- most of this commit (Closes #1492) git-svn-id: http://svn.openlayers.org/branches/openlayers/2.6@6819 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
+31
-19
@@ -27,20 +27,29 @@
|
||||
|
||||
var style = new OpenLayers.Style(baseStyle);
|
||||
|
||||
var rule1 = new OpenLayers.Rule.FeatureId({
|
||||
fids: ["1"],
|
||||
symbolizer: {"Point": {fillColor: "green"}},
|
||||
maxScaleDenominator: 500000});
|
||||
var rule2 = new OpenLayers.Rule.FeatureId({
|
||||
fids: ["1"],
|
||||
symbolizer: {"Point": {fillColor: "yellow"}},
|
||||
minScaleDenominator: 500000,
|
||||
maxScaleDenominator: 1000000});
|
||||
var rule3 = new OpenLayers.Rule.FeatureId({
|
||||
fids: ["1"],
|
||||
symbolizer: {"Point": {fillColor: "red"}},
|
||||
minScaleDenominator: 1000000,
|
||||
maxScaleDenominator: 2500000});
|
||||
var rule1 = new OpenLayers.Rule({
|
||||
symbolizer: {"Point": {fillColor: "green"}},
|
||||
maxScaleDenominator: 500000,
|
||||
filter: new OpenLayers.Filter.FeatureId({
|
||||
fids: ["1"]
|
||||
})
|
||||
});
|
||||
var rule2 = new OpenLayers.Rule({
|
||||
symbolizer: {"Point": {fillColor: "yellow"}},
|
||||
minScaleDenominator: 500000,
|
||||
maxScaleDenominator: 1000000,
|
||||
filter: new OpenLayers.Filter.FeatureId({
|
||||
fids: ["1"]
|
||||
})
|
||||
});
|
||||
var rule3 = new OpenLayers.Rule({
|
||||
symbolizer: {"Point": {fillColor: "red"}},
|
||||
minScaleDenominator: 1000000,
|
||||
maxScaleDenominator: 2500000,
|
||||
filter: new OpenLayers.Filter.FeatureId({
|
||||
fids: ["1"]
|
||||
})
|
||||
});
|
||||
|
||||
var feature = new OpenLayers.Feature.Vector(
|
||||
new OpenLayers.Geometry.Point(3,5),
|
||||
@@ -119,11 +128,14 @@
|
||||
|
||||
function test_Style_context(t) {
|
||||
t.plan(1);
|
||||
var rule = new OpenLayers.Rule.Comparison({
|
||||
type: OpenLayers.Rule.Comparison.LESS_THAN,
|
||||
property: "size",
|
||||
value: 11,
|
||||
symbolizer: {"Point": {externalGraphic: "${img1}"}}});
|
||||
var rule = new OpenLayers.Rule({
|
||||
symbolizer: {"Point": {externalGraphic: "${img1}"}},
|
||||
filter: new OpenLayers.Filter.Comparison({
|
||||
type: OpenLayers.Filter.Comparison.LESS_THAN,
|
||||
property: "size",
|
||||
value: 11
|
||||
})
|
||||
});
|
||||
var style = new OpenLayers.Style();
|
||||
style.context = {
|
||||
"img1": "myImage.png"
|
||||
|
||||
Reference in New Issue
Block a user