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

Correct type for style

Browse Source
This commit is contained in:
Tim Schaub
2018-03-09 20:50:51 -07:00
parent 0b673ac110
commit f70050be12
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/Feature.js
+7 -7
View File
@@ -78,7 +78,7 @@ const Feature = function(opt_geometryOrProperties) {
/** /**
* User provided style. * User provided style.
* @private * @private
* @type {module:ol/style/Style~Geometry|Array.<module:ol/style/Style~Geometry>|module:ol/style~StyleFunction} * @type {module:ol/style/Style~Style|Array.<module:ol/style/Style~Style>|module:ol/style~StyleFunction}
*/ */
this.style_ = null; this.style_ = null;
@@ -176,7 +176,7 @@ Feature.prototype.getGeometryName = function() {
/** /**
* Get the feature's style. Will return what was provided to the * Get the feature's style. Will return what was provided to the
* {@link module:ol/Feature~Feature#setStyle} method. * {@link module:ol/Feature~Feature#setStyle} method.
* @return {module:ol/style/Style~Geometry|Array.<module:ol/style/Style~Geometry>|module:ol/style~StyleFunction} The feature style. * @return {module:ol/style/Style~Style|Array.<module:ol/style/Style~Style>|module:ol/style~StyleFunction} The feature style.
* @api * @api
*/ */
Feature.prototype.getStyle = function() { Feature.prototype.getStyle = function() {
@@ -236,7 +236,7 @@ Feature.prototype.setGeometry = function(geometry) {
* Set the style for the feature. This can be a single style object, an array * Set the style for the feature. This can be a single style object, an array
* of styles, or a function that takes a resolution and returns an array of * of styles, or a function that takes a resolution and returns an array of
* styles. If it is `null` the feature has no style (a `null` style). * styles. If it is `null` the feature has no style (a `null` style).
* @param {module:ol/style/Style~Geometry|Array.<module:ol/style/Style~Geometry>|module:ol/style~StyleFunction} style Style for this feature. * @param {module:ol/style/Style~Style|Array.<module:ol/style/Style~Style>|module:ol/style~StyleFunction} style Style for this feature.
* @api * @api
* @fires module:ol/events/Event~Event#event:change * @fires module:ol/events/Event~Event#event:change
*/ */
@@ -283,9 +283,9 @@ Feature.prototype.setGeometryName = function(name) {
/** /**
* Convert the provided object into a feature style function. Functions passed * Convert the provided object into a feature style function. Functions passed
* through unchanged. Arrays of module:ol/style/Style~Geometry or single style objects wrapped * through unchanged. Arrays of module:ol/style/Style~Style or single style objects wrapped
* in a new feature style function. * in a new feature style function.
* @param {module:ol/style~StyleFunction|!Array.<module:ol/style/Style~Geometry>|!module:ol/style/Style~Geometry} obj * @param {module:ol/style~StyleFunction|!Array.<module:ol/style/Style~Style>|!module:ol/style/Style~Style} obj
* A feature style function, a single style, or an array of styles. * A feature style function, a single style, or an array of styles.
* @return {module:ol/style~StyleFunction} A style function. * @return {module:ol/style~StyleFunction} A style function.
*/ */
@@ -294,14 +294,14 @@ export function createStyleFunction(obj) {
return obj; return obj;
} else { } else {
/** /**
* @type {Array.<module:ol/style/Style~Geometry>} * @type {Array.<module:ol/style/Style~Style>}
*/ */
let styles; let styles;
if (Array.isArray(obj)) { if (Array.isArray(obj)) {
styles = obj; styles = obj;
} else { } else {
assert(obj instanceof Style, assert(obj instanceof Style,
41); // Expected an `module:ol/style/Style~Geometry` or an array of `module:ol/style/Style~Geometry` 41); // Expected an `module:ol/style/Style~Style` or an array of `module:ol/style/Style~Style`
styles = [obj]; styles = [obj];
} }
return function() { return function() {