From 9163558511715d5f391388e949110fecfc414198 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Fri, 5 Oct 2018 16:16:51 +0200 Subject: [PATCH] Replace instanceof checks with other logic --- src/ol/Collection.js | 2 +- src/ol/Feature.js | 32 +++++++++---------- src/ol/ImageTile.js | 4 +-- src/ol/PluggableMap.js | 20 ++++++------ src/ol/View.js | 11 +++---- src/ol/color.js | 6 ++-- src/ol/colorlike.js | 19 ++---------- src/ol/events/condition.js | 10 +++--- src/ol/extent.js | 4 +-- src/ol/featureloader.js | 16 +++++----- src/ol/format/Feature.js | 25 ++++++++------- src/ol/format/GML2.js | 3 +- src/ol/format/GML3.js | 3 +- src/ol/format/GPX.js | 7 +++-- src/ol/format/KML.js | 42 ++++++++++++------------- src/ol/format/WFS.js | 33 ++++++++++---------- src/ol/format/WKT.js | 9 +++--- src/ol/format/XML.js | 12 ++++---- src/ol/format/XMLFeature.js | 46 ++++++++++++++-------------- src/ol/interaction/Draw.js | 8 ++--- src/ol/interaction/Extent.js | 7 ++--- src/ol/interaction/Modify.js | 11 +++---- src/ol/interaction/MouseWheelZoom.js | 4 +-- src/ol/interaction/Pointer.js | 23 +++++++------- src/ol/interaction/Select.js | 2 +- src/ol/interaction/Snap.js | 29 +++++++++--------- src/ol/layer/Group.js | 3 +- src/ol/layer/Vector.js | 6 ++-- src/ol/layer/VectorTile.js | 4 +-- src/ol/pointer/TouchSource.js | 2 +- src/ol/source/Cluster.js | 3 +- src/ol/source/Image.js | 5 +-- src/ol/source/Raster.js | 26 ++++++++-------- src/ol/source/TileImage.js | 5 +-- src/ol/source/Vector.js | 6 ++-- src/ol/style/Fill.js | 14 +++++---- src/ol/style/Icon.js | 2 +- src/ol/style/IconImage.js | 4 +-- src/ol/style/Style.js | 15 +++++---- src/ol/xml.js | 17 +++------- 40 files changed, 232 insertions(+), 268 deletions(-) diff --git a/src/ol/Collection.js b/src/ol/Collection.js index 00376904e7..c2ae8689ad 100644 --- a/src/ol/Collection.js +++ b/src/ol/Collection.js @@ -160,7 +160,7 @@ class Collection extends BaseObject { * @api */ getLength() { - return /** @type {number} */ (this.get(Property.LENGTH)); + return this.get(Property.LENGTH); } /** diff --git a/src/ol/Feature.js b/src/ol/Feature.js index 752e0f096c..12cc0d0a40 100644 --- a/src/ol/Feature.js +++ b/src/ol/Feature.js @@ -5,8 +5,6 @@ import {assert} from './asserts.js'; import {listen, unlisten, unlistenByKey} from './events.js'; import EventType from './events/EventType.js'; import BaseObject, {getChangeEventType} from './Object.js'; -import Geometry from './geom/Geometry.js'; -import Style from './style/Style.js'; /** * @typedef {typeof Feature|typeof import("./render/Feature.js").default} FeatureClass @@ -62,7 +60,7 @@ import Style from './style/Style.js'; */ class Feature extends BaseObject { /** - * @param {Geometry|Object=} opt_geometryOrProperties + * @param {import("./geom/Geometry.js").default|Object=} opt_geometryOrProperties * You may pass a Geometry object directly, or an object literal containing * properties. If you pass an object literal, you may include a Geometry * associated with a `geometry` key. @@ -86,7 +84,7 @@ class Feature extends BaseObject { /** * User provided style. * @private - * @type {Style|Array