"users should be able to customize the select style per feature": Created a !StyleMap class which stores all styles that are needed for a layer. Controls that need to render features differently can now just give a render intent (e.g. "default", "select" or "temporary") to the layer's drawFeature method, instead of having extra style informations like Control.!SelectFeature.selectStyle. Existing application that set layer.style or feature.style are still supported, but both of these style properties are now null by default. r=crschmidt,elemoine,tschaub (closes #1120)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@6240 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -95,7 +95,14 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
* APIProperty: selectStyle
|
||||
* {Object} Hash of styles
|
||||
*/
|
||||
selectStyle: OpenLayers.Feature.Vector.style['select'],
|
||||
selectStyle: null,
|
||||
|
||||
/**
|
||||
* Property: renderIntent
|
||||
* {String} key used to retrieve the select style from the layer's
|
||||
* style map.
|
||||
*/
|
||||
renderIntent: "select",
|
||||
|
||||
/**
|
||||
* Property: handler
|
||||
@@ -247,25 +254,11 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
* feature - {<OpenLayers.Feature.Vector>}
|
||||
*/
|
||||
select: function(feature) {
|
||||
// Store feature style for restoration later
|
||||
if(feature.originalStyle != feature.style) {
|
||||
feature.originalStyle = feature.style;
|
||||
}
|
||||
this.layer.selectedFeatures.push(feature);
|
||||
|
||||
var selectStyle = this.selectStyle;
|
||||
|
||||
if (feature.style.CLASS_NAME == "OpenLayers.Style") {
|
||||
feature.style = feature.style.createStyle(feature);
|
||||
} else {
|
||||
feature.style = OpenLayers.Util.extend({}, feature.style);
|
||||
}
|
||||
if (selectStyle.CLASS_NAME == "OpenLayers.Style") {
|
||||
selectStyle = selectStyle.createStyle(feature);
|
||||
}
|
||||
OpenLayers.Util.extend(feature.style, selectStyle);
|
||||
|
||||
this.layer.drawFeature(feature);
|
||||
var selectStyle = this.selectStyle || this.renderIntent;
|
||||
|
||||
this.layer.drawFeature(feature, selectStyle);
|
||||
this.layer.events.triggerEvent("featureselected", {feature: feature});
|
||||
this.onSelect(feature);
|
||||
},
|
||||
@@ -280,10 +273,7 @@ OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
*/
|
||||
unselect: function(feature) {
|
||||
// Store feature style for restoration later
|
||||
if(feature.originalStyle != null) {
|
||||
feature.style = feature.originalStyle;
|
||||
}
|
||||
this.layer.drawFeature(feature);
|
||||
this.layer.drawFeature(feature, "default");
|
||||
OpenLayers.Util.removeItem(this.layer.selectedFeatures, feature);
|
||||
this.layer.events.triggerEvent("featureunselected", {feature: feature});
|
||||
this.onUnselect(feature);
|
||||
|
||||
Reference in New Issue
Block a user