Give precedence to feature style

This commit is contained in:
Antoine Abt
2014-07-10 12:11:02 +02:00
parent 0b9936107d
commit 60f1874766
14 changed files with 172 additions and 176 deletions
+12 -12
View File
@@ -1662,7 +1662,7 @@ olx.interaction.DragZoomOptions.prototype.style;
* snapTolerance: (number|undefined),
* type: ol.geom.GeometryType,
* minPointsPerRing: (number|undefined),
* style: (ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined),
* style: (ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined),
* geometryName: (string|undefined),
* condition: (ol.events.ConditionType|undefined)}}
* @api
@@ -1709,7 +1709,7 @@ olx.interaction.DrawOptions.prototype.minPointsPerRing;
/**
* Style for sketch features.
* @type {ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined}
* @type {ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined}
*/
olx.interaction.DrawOptions.prototype.style;
@@ -1790,7 +1790,7 @@ olx.interaction.KeyboardZoomOptions.prototype.delta;
/**
* @typedef {{deleteCondition: (ol.events.ConditionType|undefined),
* pixelTolerance: (number|undefined),
* style: (ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined),
* style: (ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined),
* features: ol.Collection}}
* @api
*/
@@ -1817,7 +1817,7 @@ olx.interaction.ModifyOptions.prototype.pixelTolerance;
/**
* FeatureOverlay style.
* @type {ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined}
* @type {ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined}
*/
olx.interaction.ModifyOptions.prototype.style;
@@ -1875,7 +1875,7 @@ olx.interaction.PinchZoomOptions.prototype.duration;
* @typedef {{addCondition: (ol.events.ConditionType|undefined),
* condition: (ol.events.ConditionType|undefined),
* layers: (Array.<ol.layer.Layer>|function(ol.layer.Layer): boolean|undefined),
* style: (ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined),
* style: (ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined),
* removeCondition: (ol.events.ConditionType|undefined),
* toggleCondition: (ol.events.ConditionType|undefined)}}
* @api
@@ -1920,7 +1920,7 @@ olx.interaction.SelectOptions.prototype.layers;
/**
* Style for the selected features (those in the FeatureOverlay).
* @type {ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined}
* @type {ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined}
*/
olx.interaction.SelectOptions.prototype.style;
@@ -2400,7 +2400,7 @@ olx.layer.TileOptions.prototype.useInterimTilesOnError;
* opacity: (number|undefined),
* saturation: (number|undefined),
* source: ol.source.Vector,
* style: (ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined),
* style: (ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined),
* visible: (boolean|undefined)}}
* @api
*/
@@ -2474,7 +2474,7 @@ olx.layer.VectorOptions.prototype.source;
/**
* Layer style.
* @type {ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined}
* @type {ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined}
*/
olx.layer.VectorOptions.prototype.style;
@@ -2489,7 +2489,7 @@ olx.layer.VectorOptions.prototype.visible;
/**
* @typedef {{features: (Array.<ol.Feature>|ol.Collection|undefined),
* map: (ol.Map|undefined),
* style: (ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined)}}
* style: (ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined)}}
* @api
*/
olx.FeatureOverlayOptions;
@@ -2511,7 +2511,7 @@ olx.FeatureOverlayOptions.prototype.map;
/**
* Feature style.
* @type {ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined}
* @type {ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined}
*/
olx.FeatureOverlayOptions.prototype.style;
@@ -3529,7 +3529,7 @@ olx.source.ImageCanvasOptions.prototype.state;
* ratio: (number|undefined),
* resolutions: (Array.<number>|undefined),
* source: ol.source.Vector,
* style: (ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined)}}
* style: (ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined)}}
* @api
*/
olx.source.ImageVectorOptions;
@@ -3589,7 +3589,7 @@ olx.source.ImageVectorOptions.prototype.source;
/**
* Style to use when rendering features to the canvas.
* @type {ol.style.Style|Array.<ol.style.Style>|ol.feature.StyleFunction|undefined}
* @type {ol.style.Style|Array.<ol.style.Style>|ol.style.StyleFunction|undefined}
*/
olx.source.ImageVectorOptions.prototype.style;