From a9e1ebccd37a3631bf77ac798fb1aca4c30099e4 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 3 Jun 2019 09:07:01 +0200 Subject: [PATCH 1/2] Mark the `layers` property as optional in OverviewMap constructor --- src/ol/control/OverviewMap.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index 93fceff482..020a49d9f2 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -51,8 +51,8 @@ class ControlledMap extends PluggableMap { * @property {boolean} [collapsible=true] Whether the control can be collapsed or not. * @property {string|HTMLElement} [label='ยป'] Text label to use for the collapsed * overviewmap button. Instead of text, also an element (e.g. a `span` element) can be used. - * @property {Array|import("../Collection.js").default} layers - * Layers for the overview map (mandatory). + * @property {Array|import("../Collection.js").default} [layers] + * Layers for the overview map. * @property {function(import("../MapEvent.js").default)} [render] Function called when the control * should be re-rendered. This is called in a `requestAnimationFrame` callback. * @property {HTMLElement|string} [target] Specify a target if you want the control @@ -76,7 +76,7 @@ class OverviewMap extends Control { */ constructor(opt_options) { - const options = opt_options ? opt_options : /** @type {Options} */ ({}); + const options = opt_options ? opt_options : {}; super({ element: document.createElement('div'), From 50343afa6120932ce6a6d66d5ae9628360c74ada Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 3 Jun 2019 09:08:41 +0200 Subject: [PATCH 2/2] Remove unnecessary typecasts in constructors options --- src/ol/layer/BaseVector.js | 3 +-- src/ol/layer/VectorImage.js | 2 +- src/ol/source/ImageArcGISRest.js | 2 +- src/ol/source/ImageCanvas.js | 2 +- src/ol/source/ImageWMS.js | 2 +- src/ol/source/TileArcGISRest.js | 2 +- src/ol/source/TileWMS.js | 2 +- src/ol/style/Circle.js | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/ol/layer/BaseVector.js b/src/ol/layer/BaseVector.js index b612b5f762..441ea30742 100644 --- a/src/ol/layer/BaseVector.js +++ b/src/ol/layer/BaseVector.js @@ -72,8 +72,7 @@ class BaseVectorLayer extends Layer { * @param {Options=} opt_options Options. */ constructor(opt_options) { - const options = opt_options ? - opt_options : /** @type {Options} */ ({}); + const options = opt_options ? opt_options : {}; const baseOptions = assign({}, options); diff --git a/src/ol/layer/VectorImage.js b/src/ol/layer/VectorImage.js index 1b948ce832..980385da57 100644 --- a/src/ol/layer/VectorImage.js +++ b/src/ol/layer/VectorImage.js @@ -60,7 +60,7 @@ class VectorImageLayer extends BaseVectorLayer { * @param {Options=} opt_options Options. */ constructor(opt_options) { - const options = opt_options ? opt_options : /** @type {Options} */ ({}); + const options = opt_options ? opt_options : {}; const baseOptions = assign({}, options); delete baseOptions.imageRatio; diff --git a/src/ol/source/ImageArcGISRest.js b/src/ol/source/ImageArcGISRest.js index d051fca8aa..63859a415b 100644 --- a/src/ol/source/ImageArcGISRest.js +++ b/src/ol/source/ImageArcGISRest.js @@ -56,7 +56,7 @@ class ImageArcGISRest extends ImageSource { */ constructor(opt_options) { - const options = opt_options || /** @type {Options} */ ({}); + const options = opt_options ? opt_options : {}; super({ attributions: options.attributions, diff --git a/src/ol/source/ImageCanvas.js b/src/ol/source/ImageCanvas.js index f98a15d496..2137d7aa6a 100644 --- a/src/ol/source/ImageCanvas.js +++ b/src/ol/source/ImageCanvas.js @@ -53,7 +53,7 @@ class ImageCanvasSource extends ImageSource { */ constructor(opt_options) { - const options = opt_options || /** @type {Options} */ ({}); + const options = opt_options ? opt_options : {}; super({ attributions: options.attributions, diff --git a/src/ol/source/ImageWMS.js b/src/ol/source/ImageWMS.js index 6126421787..2dbf65067c 100644 --- a/src/ol/source/ImageWMS.js +++ b/src/ol/source/ImageWMS.js @@ -63,7 +63,7 @@ class ImageWMS extends ImageSource { */ constructor(opt_options) { - const options = opt_options || /** @type {Options} */ ({}); + const options = opt_options ? opt_options : {}; super({ attributions: options.attributions, diff --git a/src/ol/source/TileArcGISRest.js b/src/ol/source/TileArcGISRest.js index d8ccd391d4..93ef8363b8 100644 --- a/src/ol/source/TileArcGISRest.js +++ b/src/ol/source/TileArcGISRest.js @@ -64,7 +64,7 @@ class TileArcGISRest extends TileImage { */ constructor(opt_options) { - const options = opt_options || /** @type {Options} */ ({}); + const options = opt_options ? opt_options : {}; super({ attributions: options.attributions, diff --git a/src/ol/source/TileWMS.js b/src/ol/source/TileWMS.js index 7e98d56a63..0e449d4fab 100644 --- a/src/ol/source/TileWMS.js +++ b/src/ol/source/TileWMS.js @@ -81,7 +81,7 @@ class TileWMS extends TileImage { */ constructor(opt_options) { - const options = opt_options || /** @type {Options} */ ({}); + const options = opt_options ? opt_options : {}; const params = options.params || {}; diff --git a/src/ol/style/Circle.js b/src/ol/style/Circle.js index 998e8cb739..659c71d305 100644 --- a/src/ol/style/Circle.js +++ b/src/ol/style/Circle.js @@ -24,7 +24,7 @@ class CircleStyle extends RegularShape { */ constructor(opt_options) { - const options = opt_options || /** @type {Options} */ ({}); + const options = opt_options ? opt_options : {}; super({ points: Infinity,