From affbf59b776c84796d2590bd6303f90e4b6a4d7a Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 25 Jul 2018 18:33:49 -0700 Subject: [PATCH] Use Object instead of Object. --- src/ol/Feature.js | 4 +- src/ol/MapBrowserEventHandler.js | 2 +- src/ol/Object.js | 10 +- src/ol/PluggableMap.js | 16 ++-- src/ol/Tile.js | 2 +- src/ol/TileCache.js | 2 +- src/ol/TileQueue.js | 2 +- src/ol/VectorImageTile.js | 8 +- src/ol/VectorTile.js | 2 +- src/ol/View.js | 2 +- src/ol/color.js | 2 +- src/ol/control/Attribution.js | 2 +- src/ol/css.js | 2 +- src/ol/events.js | 2 +- src/ol/events/EventTarget.js | 6 +- src/ol/format/EsriJSON.js | 4 +- src/ol/format/GML2.js | 22 ++--- src/ol/format/GML3.js | 38 ++++---- src/ol/format/GMLBase.js | 20 ++-- src/ol/format/GPX.js | 40 ++++---- src/ol/format/GeoJSON.js | 4 +- src/ol/format/IGC.js | 2 +- src/ol/format/KML.js | 106 +++++++++++----------- src/ol/format/MVT.js | 6 +- src/ol/format/OSMXML.js | 6 +- src/ol/format/OWS.js | 28 +++--- src/ol/format/TopoJSON.js | 2 +- src/ol/format/WFS.js | 22 ++--- src/ol/format/WKT.js | 4 +- src/ol/format/WMSCapabilities.js | 36 ++++---- src/ol/format/WMTSCapabilities.js | 22 ++--- src/ol/geom/Geometry.js | 2 +- src/ol/geom/flat/geodesic.js | 2 +- src/ol/interaction/Modify.js | 4 +- src/ol/interaction/Pointer.js | 2 +- src/ol/interaction/Select.js | 2 +- src/ol/interaction/Snap.js | 8 +- src/ol/layer/Base.js | 2 +- src/ol/layer/Group.js | 2 +- src/ol/pointer/EventSource.js | 4 +- src/ol/pointer/MouseSource.js | 2 +- src/ol/pointer/MsSource.js | 2 +- src/ol/pointer/PointerEvent.js | 6 +- src/ol/pointer/PointerEventHandler.js | 4 +- src/ol/pointer/TouchSource.js | 2 +- src/ol/proj/Units.js | 2 +- src/ol/proj/projections.js | 2 +- src/ol/proj/transforms.js | 2 +- src/ol/render/Feature.js | 6 +- src/ol/render/canvas.js | 4 +- src/ol/render/canvas/Replay.js | 8 +- src/ol/render/canvas/ReplayGroup.js | 18 ++-- src/ol/render/canvas/TextReplay.js | 8 +- src/ol/render/webgl/ImageReplay.js | 2 +- src/ol/render/webgl/Replay.js | 10 +- src/ol/render/webgl/ReplayGroup.js | 14 +-- src/ol/render/webgl/TextReplay.js | 6 +- src/ol/render/webgl/TextureReplay.js | 4 +- src/ol/renderer/Layer.js | 4 +- src/ol/renderer/Map.js | 6 +- src/ol/renderer/canvas/TileLayer.js | 2 +- src/ol/renderer/canvas/VectorLayer.js | 2 +- src/ol/renderer/canvas/VectorTileLayer.js | 6 +- src/ol/renderer/vector.js | 2 +- src/ol/renderer/webgl/TileLayer.js | 2 +- src/ol/renderer/webgl/VectorLayer.js | 2 +- src/ol/reproj/Triangulation.js | 2 +- src/ol/source/CartoDB.js | 2 +- src/ol/source/Cluster.js | 2 +- src/ol/source/ImageArcGISRest.js | 2 +- src/ol/source/ImageMapGuide.js | 2 +- src/ol/source/ImageWMS.js | 2 +- src/ol/source/Source.js | 2 +- src/ol/source/Stamen.js | 4 +- src/ol/source/Tile.js | 2 +- src/ol/source/TileArcGISRest.js | 2 +- src/ol/source/TileImage.js | 4 +- src/ol/source/TileWMS.js | 2 +- src/ol/source/UTFGrid.js | 2 +- src/ol/source/UrlTile.js | 2 +- src/ol/source/Vector.js | 8 +- src/ol/source/VectorTile.js | 4 +- src/ol/structs/LRUCache.js | 2 +- src/ol/structs/PriorityQueue.js | 2 +- src/ol/structs/RBush.js | 2 +- src/ol/style/Atlas.js | 2 +- src/ol/style/IconImageCache.js | 2 +- src/ol/style/Style.js | 4 +- src/ol/webgl/Context.js | 6 +- src/ol/xml.js | 16 ++-- tasks/generate-index.js | 4 +- test/spec/ol/source/tile.test.js | 2 +- 92 files changed, 334 insertions(+), 334 deletions(-) diff --git a/src/ol/Feature.js b/src/ol/Feature.js index 69716bdcad..fe5fc38872 100644 --- a/src/ol/Feature.js +++ b/src/ol/Feature.js @@ -54,7 +54,7 @@ import Style from './style/Style.js'; */ class Feature extends BaseObject { /** - * @param {module:ol/geom/Geometry|Object.=} opt_geometryOrProperties + * @param {module:ol/geom/Geometry|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. @@ -104,7 +104,7 @@ class Feature extends BaseObject { const geometry = opt_geometryOrProperties; this.setGeometry(geometry); } else { - /** @type {Object.} */ + /** @type {Object} */ const properties = opt_geometryOrProperties; this.setProperties(properties); } diff --git a/src/ol/MapBrowserEventHandler.js b/src/ol/MapBrowserEventHandler.js index b90ad9e714..8e3d65dddd 100644 --- a/src/ol/MapBrowserEventHandler.js +++ b/src/ol/MapBrowserEventHandler.js @@ -68,7 +68,7 @@ class MapBrowserEventHandler extends EventTarget { this.activePointers_ = 0; /** - * @type {!Object.} + * @type {!Object} * @private */ this.trackedTouches_ = {}; diff --git a/src/ol/Object.js b/src/ol/Object.js index df919ec00e..2683a2274c 100644 --- a/src/ol/Object.js +++ b/src/ol/Object.js @@ -88,7 +88,7 @@ class ObjectEvent extends Event { class BaseObject extends Observable { /** - * @param {Object.=} opt_values An object with key-value pairs. + * @param {Object=} opt_values An object with key-value pairs. */ constructor(opt_values) { super(); @@ -101,7 +101,7 @@ class BaseObject extends Observable { /** * @private - * @type {!Object.} + * @type {!Object} */ this.values_ = {}; @@ -135,7 +135,7 @@ class BaseObject extends Observable { /** * Get an object of all property names and values. - * @return {Object.} Object. + * @return {Object} Object. * @api */ getProperties() { @@ -176,7 +176,7 @@ class BaseObject extends Observable { /** * Sets a collection of key-value pairs. Note that this changes any existing * properties and adds new ones (it does not remove any existing properties). - * @param {Object.} values Values. + * @param {Object} values Values. * @param {boolean=} opt_silent Update without triggering an event. * @api */ @@ -205,7 +205,7 @@ class BaseObject extends Observable { /** - * @type {Object.} + * @type {Object} */ const changeEventTypeCache = {}; diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js index 20a5691b71..16162585d6 100644 --- a/src/ol/PluggableMap.js +++ b/src/ol/PluggableMap.js @@ -41,16 +41,16 @@ import {create as createTransform, apply as applyTransform} from './transform.js * @property {null|module:ol/extent~Extent} extent * @property {module:ol/coordinate~Coordinate} focus * @property {number} index - * @property {Object.} layerStates + * @property {Object} layerStates * @property {Array} layerStatesArray * @property {module:ol/transform~Transform} pixelToCoordinateTransform * @property {Array} postRenderFunctions * @property {module:ol/size~Size} size - * @property {!Object.} skippedFeatureUids + * @property {!Object} skippedFeatureUids * @property {module:ol/TileQueue} tileQueue - * @property {Object.>} usedTiles + * @property {Object>} usedTiles * @property {Array} viewHints - * @property {!Object.>} wantedTiles + * @property {!Object>} wantedTiles */ @@ -78,7 +78,7 @@ import {create as createTransform, apply as applyTransform} from './transform.js * @property {module:ol/Collection.} [interactions] * @property {HTMLElement|Document} keyboardEventTarget * @property {module:ol/Collection.} overlays - * @property {Object.} values + * @property {Object} values */ @@ -330,7 +330,7 @@ class PluggableMap extends BaseObject { /** * A lookup of overlays by id. * @private - * @type {Object.} + * @type {Object} */ this.overlayIdIndex_ = {}; @@ -368,7 +368,7 @@ class PluggableMap extends BaseObject { /** * Uids of features to skip at rendering time. - * @type {Object.} + * @type {Object} * @private */ this.skippedFeatureUids_ = {}; @@ -1356,7 +1356,7 @@ function createOptionsInternal(options) { } /** - * @type {Object.} + * @type {Object} */ const values = {}; diff --git a/src/ol/Tile.js b/src/ol/Tile.js index 2883a8bcfe..de57ff74e3 100644 --- a/src/ol/Tile.js +++ b/src/ol/Tile.js @@ -93,7 +93,7 @@ class Tile extends EventTarget { /** * Lookup of start times for rendering transitions. If the start time is * equal to -1, the transition is complete. - * @type {Object.} + * @type {Object} */ this.transitionStarts_ = {}; diff --git a/src/ol/TileCache.js b/src/ol/TileCache.js index 47f7a8bead..5c0131e9da 100644 --- a/src/ol/TileCache.js +++ b/src/ol/TileCache.js @@ -16,7 +16,7 @@ class TileCache extends LRUCache { } /** - * @param {!Object.} usedTiles Used tiles. + * @param {!Object} usedTiles Used tiles. */ expireCache(usedTiles) { while (this.canExpireCache()) { diff --git a/src/ol/TileQueue.js b/src/ol/TileQueue.js index 1c53aa3bb7..dddcdcdfc3 100644 --- a/src/ol/TileQueue.js +++ b/src/ol/TileQueue.js @@ -50,7 +50,7 @@ class TileQueue extends PriorityQueue { /** * @private - * @type {!Object.} + * @type {!Object} */ this.tilesLoadingKeys_ = {}; diff --git a/src/ol/VectorImageTile.js b/src/ol/VectorImageTile.js index e11eb664b4..407970c5f4 100644 --- a/src/ol/VectorImageTile.js +++ b/src/ol/VectorImageTile.js @@ -33,7 +33,7 @@ class VectorImageTile extends Tile { * @param {module:ol/Tile~UrlFunction} tileUrlFunction Tile url function. * @param {module:ol/tilegrid/TileGrid} sourceTileGrid Tile grid of the source. * @param {module:ol/tilegrid/TileGrid} tileGrid Tile grid of the renderer. - * @param {Object.} sourceTiles Source tiles. + * @param {Object} sourceTiles Source tiles. * @param {number} pixelRatio Pixel ratio. * @param {module:ol/proj/Projection} projection Projection. * @param {function(new: module:ol/VectorTile, module:ol/tilecoord~TileCoord, module:ol/TileState, string, @@ -51,7 +51,7 @@ class VectorImageTile extends Tile { /** * @private - * @type {!Object.} + * @type {!Object} */ this.context_ = {}; @@ -63,13 +63,13 @@ class VectorImageTile extends Tile { /** * @private - * @type {!Object.} + * @type {!Object} */ this.replayState_ = {}; /** * @private - * @type {Object.} + * @type {Object} */ this.sourceTiles_ = sourceTiles; diff --git a/src/ol/VectorTile.js b/src/ol/VectorTile.js index e18bfcf506..438a27b427 100644 --- a/src/ol/VectorTile.js +++ b/src/ol/VectorTile.js @@ -70,7 +70,7 @@ class VectorTile extends Tile { /** * @private - * @type {Object.} + * @type {Object} */ this.replayGroups_ = {}; diff --git a/src/ol/View.js b/src/ol/View.js index 7d22d8fc99..61667a9c8d 100644 --- a/src/ol/View.js +++ b/src/ol/View.js @@ -273,7 +273,7 @@ class View extends BaseObject { applyOptions_(options) { /** - * @type {Object.} + * @type {Object} */ const properties = {}; properties[ViewProperty.CENTER] = options.center !== undefined ? diff --git a/src/ol/color.js b/src/ol/color.js index b0c856d37a..0ad5e3ad56 100644 --- a/src/ol/color.js +++ b/src/ol/color.js @@ -84,7 +84,7 @@ export const fromString = ( const MAX_CACHE_SIZE = 1024; /** - * @type {Object.} + * @type {Object} */ const cache = {}; diff --git a/src/ol/control/Attribution.js b/src/ol/control/Attribution.js index 9e3afdace6..341123b55c 100644 --- a/src/ol/control/Attribution.js +++ b/src/ol/control/Attribution.js @@ -153,7 +153,7 @@ class Attribution extends Control { getSourceAttributions_(frameState) { /** * Used to determine if an attribution already exists. - * @type {!Object.} + * @type {!Object} */ const lookup = {}; diff --git a/src/ol/css.js b/src/ol/css.js index b6dc6ab5fc..a7eab92100 100644 --- a/src/ol/css.js +++ b/src/ol/css.js @@ -62,7 +62,7 @@ export const CLASS_COLLAPSED = 'ol-collapsed'; * Get the list of font families from a font spec. Note that this doesn't work * for font families that have commas in them. * @param {string} The CSS font property. - * @return {Object.} The font families (or null if the input spec is invalid). + * @return {Object} The font families (or null if the input spec is invalid). */ export const getFontFamilies = (function() { let style; diff --git a/src/ol/events.js b/src/ol/events.js index f67b7d0a65..662c29765a 100644 --- a/src/ol/events.js +++ b/src/ol/events.js @@ -87,7 +87,7 @@ export function getListeners(target, type) { * Get the lookup of listeners. If one does not exist on the target, it is * created. * @param {module:ol/events/EventTarget~EventTargetLike} target Target. - * @return {!Object.>} Map of + * @return {!Object>} Map of * listeners by event type. */ function getListenerMap(target) { diff --git a/src/ol/events/EventTarget.js b/src/ol/events/EventTarget.js index be1f631ee8..406abfc2c1 100644 --- a/src/ol/events/EventTarget.js +++ b/src/ol/events/EventTarget.js @@ -34,19 +34,19 @@ class EventTarget extends Disposable { /** * @private - * @type {!Object.} + * @type {!Object} */ this.pendingRemovals_ = {}; /** * @private - * @type {!Object.} + * @type {!Object} */ this.dispatching_ = {}; /** * @private - * @type {!Object.>} + * @type {!Object>} */ this.listeners_ = {}; diff --git a/src/ol/format/EsriJSON.js b/src/ol/format/EsriJSON.js index f2e9c5a64c..7592995d89 100644 --- a/src/ol/format/EsriJSON.js +++ b/src/ol/format/EsriJSON.js @@ -23,7 +23,7 @@ import {get as getProjection} from '../proj.js'; /** * @const - * @type {Object.} + * @type {Object} */ const GEOMETRY_READERS = {}; GEOMETRY_READERS[GeometryType.POINT] = readPointGeometry; @@ -36,7 +36,7 @@ GEOMETRY_READERS[GeometryType.MULTI_POLYGON] = readMultiPolygonGeometry; /** * @const - * @type {Object.} + * @type {Object} */ const GEOMETRY_WRITERS = {}; GEOMETRY_WRITERS[GeometryType.POINT] = writePointGeometry; diff --git a/src/ol/format/GML2.js b/src/ol/format/GML2.js index 927d0d666d..603561ab95 100644 --- a/src/ol/format/GML2.js +++ b/src/ol/format/GML2.js @@ -21,7 +21,7 @@ const schemaLocation = GMLNS + ' http://schemas.opengis.net/gml/2.1.2/feature.xs /** * @const - * @type {Object.} + * @type {Object} */ const MULTIGEOMETRY_TO_MEMBER_NODENAME = { 'MultiLineString': 'lineStringMember', @@ -587,7 +587,7 @@ class GML2 extends GMLBase { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { @@ -598,7 +598,7 @@ GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { @@ -610,7 +610,7 @@ GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.BOX_PARSERS_ = { @@ -622,7 +622,7 @@ GML2.prototype.BOX_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.GEOMETRY_PARSERS_ = { @@ -645,7 +645,7 @@ GML2.prototype.GEOMETRY_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.GEOMETRY_SERIALIZERS_ = { @@ -677,7 +677,7 @@ GML2.prototype.GEOMETRY_SERIALIZERS_ = { }; /** - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = { @@ -690,7 +690,7 @@ GML2.prototype.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = { }; /** - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.RING_SERIALIZERS_ = { @@ -701,7 +701,7 @@ GML2.prototype.RING_SERIALIZERS_ = { }; /** - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.POINTMEMBER_SERIALIZERS_ = { @@ -713,7 +713,7 @@ GML2.prototype.POINTMEMBER_SERIALIZERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = { @@ -726,7 +726,7 @@ GML2.prototype.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = { }; /** - * @type {Object.>} + * @type {Object>} * @private */ GML2.prototype.ENVELOPE_SERIALIZERS_ = { diff --git a/src/ol/format/GML3.js b/src/ol/format/GML3.js index e782ce048f..2b6f8429ad 100644 --- a/src/ol/format/GML3.js +++ b/src/ol/format/GML3.js @@ -31,7 +31,7 @@ const schemaLocation = GMLNS + /** * @const - * @type {Object.} + * @type {Object} */ const MULTIGEOMETRY_TO_MEMBER_NODENAME = { 'MultiLineString': 'lineStringMember', @@ -920,7 +920,7 @@ class GML3 extends GMLBase { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { @@ -933,7 +933,7 @@ GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { @@ -946,7 +946,7 @@ GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.GEOMETRY_PARSERS_ = { @@ -976,7 +976,7 @@ GML3.prototype.GEOMETRY_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.MULTICURVE_PARSERS_ = { @@ -991,7 +991,7 @@ GML3.prototype.MULTICURVE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.MULTISURFACE_PARSERS_ = { @@ -1006,7 +1006,7 @@ GML3.prototype.MULTISURFACE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.CURVEMEMBER_PARSERS_ = { @@ -1020,7 +1020,7 @@ GML3.prototype.CURVEMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.SURFACEMEMBER_PARSERS_ = { @@ -1033,7 +1033,7 @@ GML3.prototype.SURFACEMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.SURFACE_PARSERS_ = { @@ -1045,7 +1045,7 @@ GML3.prototype.SURFACE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.CURVE_PARSERS_ = { @@ -1057,7 +1057,7 @@ GML3.prototype.CURVE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.ENVELOPE_PARSERS_ = { @@ -1072,7 +1072,7 @@ GML3.prototype.ENVELOPE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.PATCHES_PARSERS_ = { @@ -1085,7 +1085,7 @@ GML3.prototype.PATCHES_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.SEGMENTS_PARSERS_ = { @@ -1109,7 +1109,7 @@ GML3.prototype.writeFeatures; /** - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.RING_SERIALIZERS_ = { @@ -1121,7 +1121,7 @@ GML3.prototype.RING_SERIALIZERS_ = { /** - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.ENVELOPE_SERIALIZERS_ = { @@ -1133,7 +1133,7 @@ GML3.prototype.ENVELOPE_SERIALIZERS_ = { /** - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = { @@ -1147,7 +1147,7 @@ GML3.prototype.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = { /** - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.POINTMEMBER_SERIALIZERS_ = { @@ -1159,7 +1159,7 @@ GML3.prototype.POINTMEMBER_SERIALIZERS_ = { /** - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = { @@ -1173,7 +1173,7 @@ GML3.prototype.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = { /** - * @type {Object.>} + * @type {Object>} * @private */ GML3.prototype.GEOMETRY_SERIALIZERS_ = { diff --git a/src/ol/format/GMLBase.js b/src/ol/format/GMLBase.js index ef92fd97d8..9af1f7680d 100644 --- a/src/ol/format/GMLBase.js +++ b/src/ol/format/GMLBase.js @@ -44,7 +44,7 @@ const ONLY_WHITESPACE_RE = /^[\s\xa0]*$/; /** * @typedef {Object} Options - * @property {Object.|string} [featureNS] Feature + * @property {Object|string} [featureNS] Feature * namespace. If not defined will be derived from GML. If multiple * feature types have been configured which come from different feature * namespaces, this will be an object with the keys being the prefixes used @@ -102,7 +102,7 @@ class GMLBase extends XMLFeature { /** * @protected - * @type {Object.|string|undefined} + * @type {Object|string|undefined} */ this.featureNS = options.featureNS; @@ -119,7 +119,7 @@ class GMLBase extends XMLFeature { this.schemaLocation = ''; /** - * @type {Object.>} + * @type {Object>} */ this.FEATURE_COLLECTION_PARSERS = {}; this.FEATURE_COLLECTION_PARSERS[GMLNS] = { @@ -471,7 +471,7 @@ class GMLBase extends XMLFeature { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GMLBase.prototype.MULTIPOINT_PARSERS_ = { @@ -484,7 +484,7 @@ GMLBase.prototype.MULTIPOINT_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GMLBase.prototype.MULTILINESTRING_PARSERS_ = { @@ -497,7 +497,7 @@ GMLBase.prototype.MULTILINESTRING_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GMLBase.prototype.MULTIPOLYGON_PARSERS_ = { @@ -510,7 +510,7 @@ GMLBase.prototype.MULTIPOLYGON_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GMLBase.prototype.POINTMEMBER_PARSERS_ = { @@ -522,7 +522,7 @@ GMLBase.prototype.POINTMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = { @@ -534,7 +534,7 @@ GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @private */ GMLBase.prototype.POLYGONMEMBER_PARSERS_ = { @@ -546,7 +546,7 @@ GMLBase.prototype.POLYGONMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object>} * @protected */ GMLBase.prototype.RING_PARSERS = { diff --git a/src/ol/format/GPX.js b/src/ol/format/GPX.js index 7274c1893e..61dfc980d3 100644 --- a/src/ol/format/GPX.js +++ b/src/ol/format/GPX.js @@ -38,7 +38,7 @@ const SCHEMA_LOCATION = 'http://www.topografix.com/GPX/1/1 ' + /** * @const - * @type {Object.): (module:ol/Feature|undefined)>} + * @type {Object): (module:ol/Feature|undefined)>} */ const FEATURE_READER = { 'rte': readRte, @@ -49,7 +49,7 @@ const FEATURE_READER = { /** * @const - * @type {Object.>} + * @type {Object>} */ const GPX_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -61,7 +61,7 @@ const GPX_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const LINK_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -72,7 +72,7 @@ const LINK_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const GPX_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -225,7 +225,7 @@ class GPX extends XMLFeature { /** * @const - * @type {Object.>} + * @type {Object>} */ const RTE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -243,7 +243,7 @@ const RTE_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const RTEPT_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -254,7 +254,7 @@ const RTEPT_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TRK_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -272,7 +272,7 @@ const TRK_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TRKSEG_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -282,7 +282,7 @@ const TRKSEG_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TRKPT_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -293,7 +293,7 @@ const TRKPT_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const WPT_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -328,7 +328,7 @@ const LINK_SEQUENCE = ['text', 'type']; /** * @const - * @type {Object.>} + * @type {Object>} */ const LINK_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -339,7 +339,7 @@ const LINK_SERIALIZERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const RTE_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -349,7 +349,7 @@ const RTE_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const RTE_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -366,7 +366,7 @@ const RTE_SERIALIZERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const RTEPT_TYPE_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -376,7 +376,7 @@ const RTEPT_TYPE_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TRK_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -386,7 +386,7 @@ const TRK_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TRK_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -410,7 +410,7 @@ const TRKSEG_NODE_FACTORY = makeSimpleNodeFactory('trkpt'); /** * @const - * @type {Object.>} + * @type {Object>} */ const TRKSEG_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -420,7 +420,7 @@ const TRKSEG_SERIALIZERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const WPT_TYPE_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -432,7 +432,7 @@ const WPT_TYPE_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const WPT_TYPE_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -459,7 +459,7 @@ const WPT_TYPE_SERIALIZERS = makeStructureNS( /** * @const - * @type {Object.} + * @type {Object} */ const GEOMETRY_TYPE_TO_NODENAME = { 'Point': 'wpt', diff --git a/src/ol/format/GeoJSON.js b/src/ol/format/GeoJSON.js index 8b484fc889..501aa3f9b0 100644 --- a/src/ol/format/GeoJSON.js +++ b/src/ol/format/GeoJSON.js @@ -231,7 +231,7 @@ class GeoJSON extends JSONFeature { /** * @const - * @type {Object.} + * @type {Object} */ const GEOMETRY_READERS = { 'Point': readPointGeometry, @@ -246,7 +246,7 @@ const GEOMETRY_READERS = { /** * @const - * @type {Object.} + * @type {Object} */ const GEOMETRY_WRITERS = { 'Point': writePointGeometry, diff --git a/src/ol/format/IGC.js b/src/ol/format/IGC.js index 4072e779a6..e13d8fe623 100644 --- a/src/ol/format/IGC.js +++ b/src/ol/format/IGC.js @@ -94,7 +94,7 @@ class IGC extends TextFeature { readFeatureFromText(text, opt_options) { const altitudeMode = this.altitudeMode_; const lines = text.split(NEWLINE_RE); - /** @type {Object.} */ + /** @type {Object} */ const properties = {}; const flatCoordinates = []; let year = 2000; diff --git a/src/ol/format/KML.js b/src/ol/format/KML.js index ecd42ddce7..2bff381ff4 100644 --- a/src/ol/format/KML.js +++ b/src/ol/format/KML.js @@ -79,7 +79,7 @@ const SCHEMA_LOCATION = 'http://www.opengis.net/kml/2.2 ' + /** - * @type {Object.} + * @type {Object} */ const ICON_ANCHOR_UNITS_MAP = { 'fraction': IconAnchorUnits.FRACTION, @@ -89,7 +89,7 @@ const ICON_ANCHOR_UNITS_MAP = { /** * @const - * @type {Object.>} + * @type {Object>} */ const PLACEMARK_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -126,7 +126,7 @@ const PLACEMARK_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const NETWORK_LINK_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -144,7 +144,7 @@ const NETWORK_LINK_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const LINK_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -154,7 +154,7 @@ const LINK_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const REGION_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -165,7 +165,7 @@ const REGION_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const KML_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -175,7 +175,7 @@ const KML_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const KML_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -441,7 +441,7 @@ class KML extends XMLFeature { /** * @private - * @type {!Object.|string)>} + * @type {!Object|string)>} */ this.sharedStyles_ = {}; @@ -905,7 +905,7 @@ function createNameStyleFunction(foundStyle, name) { * @param {Array|undefined} style Style. * @param {string} styleUrl Style URL. * @param {Array} defaultStyle Default style. - * @param {!Object.|string)>} sharedStyles Shared styles. + * @param {!Object|string)>} sharedStyles Shared styles. * @param {boolean|undefined} showPointNames true to show names for point placemarks. * @return {module:ol/style/Style~StyleFunction} Feature style function. */ @@ -962,7 +962,7 @@ function createFeatureStyleFunction(style, styleUrl, defaultStyle, sharedStyles, /** * @param {Array|string|undefined} styleValue Style value. * @param {Array} defaultStyle Default style. - * @param {!Object.|string)>} sharedStyles + * @param {!Object|string)>} sharedStyles * Shared styles. * @return {Array} Style. */ @@ -1094,7 +1094,7 @@ function readScale(node) { /** * @const - * @type {Object.>} + * @type {Object>} */ const STYLE_MAP_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1115,7 +1115,7 @@ function readStyleMapValue(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const ICON_STYLE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1231,7 +1231,7 @@ function iconStyleParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const LABEL_STYLE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1266,7 +1266,7 @@ function labelStyleParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const LINE_STYLE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1302,7 +1302,7 @@ function lineStyleParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const POLY_STYLE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1342,7 +1342,7 @@ function polyStyleParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const FLAT_LINEAR_RING_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1386,7 +1386,7 @@ function gxCoordParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const GX_MULTITRACK_GEOMETRY_PARSERS = makeStructureNS( GX_NAMESPACE_URIS, { @@ -1411,7 +1411,7 @@ function readGxMultiTrack(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const GX_TRACK_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1447,7 +1447,7 @@ function readGxTrack(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const ICON_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1479,7 +1479,7 @@ function readIcon(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const GEOMETRY_FLAT_COORDINATES_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1500,7 +1500,7 @@ function readFlatCoordinatesFromNode(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const EXTRUDE_AND_ALTITUDE_MODE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1554,7 +1554,7 @@ function readLinearRing(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const MULTI_GEOMETRY_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1648,7 +1648,7 @@ function readPoint(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const FLAT_LINEAR_RINGS_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1686,7 +1686,7 @@ function readPolygon(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const STYLE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1778,7 +1778,7 @@ function setCommonGeometryProperties(multiGeometry, geometries) { /** * @const - * @type {Object.>} + * @type {Object>} */ const DATA_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1806,7 +1806,7 @@ function dataParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const EXTENDED_DATA_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1833,7 +1833,7 @@ function regionParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const PAIR_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1892,7 +1892,7 @@ function placemarkStyleMapParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const SCHEMA_DATA_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1925,7 +1925,7 @@ function simpleDataParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const LAT_LON_ALT_BOX_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1964,7 +1964,7 @@ function latLonAltBoxParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const LOD_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -1994,7 +1994,7 @@ function lodParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const INNER_BOUNDARY_IS_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -2020,7 +2020,7 @@ function innerBoundaryIsParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const OUTER_BOUNDARY_IS_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -2125,7 +2125,7 @@ function writeCoordinatesTextNode(node, coordinates, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const EXTENDEDDATA_NODE_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2182,7 +2182,7 @@ function writeDataNodeValue(node, value) { /** * @const - * @type {Object.>} + * @type {Object>} */ const DOCUMENT_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2245,7 +2245,7 @@ function writeExtendedData(node, namesAndValues, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const ICON_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -2258,7 +2258,7 @@ const ICON_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const ICON_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2308,7 +2308,7 @@ function writeIcon(node, icon, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const ICON_STYLE_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -2318,7 +2318,7 @@ const ICON_STYLE_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const ICON_STYLE_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2388,7 +2388,7 @@ function writeIconStyle(node, style, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const LABEL_STYLE_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -2398,7 +2398,7 @@ const LABEL_STYLE_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const LABEL_STYLE_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2434,7 +2434,7 @@ function writeLabelStyle(node, style, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const LINE_STYLE_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -2444,7 +2444,7 @@ const LINE_STYLE_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const LINE_STYLE_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2474,7 +2474,7 @@ function writeLineStyle(node, style, objectStack) { /** * @const - * @type {Object.} + * @type {Object} */ const GEOMETRY_TYPE_TO_NODENAME = { 'Point': 'Point', @@ -2538,7 +2538,7 @@ const POLYGON_NODE_FACTORY = makeSimpleNodeFactory('Polygon'); /** * @const - * @type {Object.>} + * @type {Object>} */ const MULTI_GEOMETRY_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2590,7 +2590,7 @@ function writeMultiGeometry(node, geometry, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const BOUNDARY_IS_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2614,7 +2614,7 @@ function writeBoundaryIs(node, linearRing, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const PLACEMARK_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2637,7 +2637,7 @@ const PLACEMARK_SERIALIZERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const PLACEMARK_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -2723,7 +2723,7 @@ function writePlacemark(node, feature, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const PRIMITIVE_GEOMETRY_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -2733,7 +2733,7 @@ const PRIMITIVE_GEOMETRY_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const PRIMITIVE_GEOMETRY_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2769,7 +2769,7 @@ function writePrimitiveGeometry(node, geometry, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const POLYGON_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2820,7 +2820,7 @@ function writePolygon(node, polygon, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const POLY_STYLE_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { @@ -2861,7 +2861,7 @@ function writeScaleTextNode(node, scale) { /** * @const - * @type {Object.>} + * @type {Object>} */ const STYLE_SEQUENCE = makeStructureNS( NAMESPACE_URIS, [ @@ -2871,7 +2871,7 @@ const STYLE_SEQUENCE = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const STYLE_SERIALIZERS = makeStructureNS( NAMESPACE_URIS, { diff --git a/src/ol/format/MVT.js b/src/ol/format/MVT.js index 57145a2611..7e8b259a0f 100644 --- a/src/ol/format/MVT.js +++ b/src/ol/format/MVT.js @@ -23,7 +23,7 @@ import RenderFeature from '../render/Feature.js'; /** * @typedef {Object} Options - * @property {function((module:ol/geom/Geometry|Object.)=)|function(module:ol/geom/GeometryType,Array,(Array|Array>),Object.,number)} [featureClass] + * @property {function((module:ol/geom/Geometry|Object)=)|function(module:ol/geom/GeometryType,Array,(Array|Array>),Object,number)} [featureClass] * Class for features returned by {@link module:ol/format/MVT#readFeatures}. Set to * {@link module:ol/Feature~Feature} to get full editing and geometry support at the cost of * decreased rendering performance. The default is {@link module:ol/render/Feature~RenderFeature}, @@ -64,9 +64,9 @@ class MVT extends FeatureFormat { /** * @private - * @type {function((module:ol/geom/Geometry|Object.)=)| + * @type {function((module:ol/geom/Geometry|Object)=)| * function(module:ol/geom/GeometryType,Array, - * (Array|Array>),Object.,number)} + * (Array|Array>),Object,number)} */ this.featureClass_ = options.featureClass ? options.featureClass : RenderFeature; diff --git a/src/ol/format/OSMXML.js b/src/ol/format/OSMXML.js index bb4d0762bc..8d9678afd4 100644 --- a/src/ol/format/OSMXML.js +++ b/src/ol/format/OSMXML.js @@ -24,7 +24,7 @@ const NAMESPACE_URIS = [null]; /** * @const - * @type {Object.>} + * @type {Object>} */ const WAY_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -35,7 +35,7 @@ const WAY_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -123,7 +123,7 @@ class OSMXML extends XMLFeature { /** * @const - * @type {Object.>} + * @type {Object>} */ const NODE_PARSERS = makeStructureNS( NAMESPACE_URIS, { diff --git a/src/ol/format/OWS.js b/src/ol/format/OWS.js index 5cec38342d..9dc919c847 100644 --- a/src/ol/format/OWS.js +++ b/src/ol/format/OWS.js @@ -16,7 +16,7 @@ const NAMESPACE_URIS = [null, 'http://www.opengis.net/ows/1.1']; /** * @const - * @type {Object.>} + * @type {Object>} */ const PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -56,7 +56,7 @@ class OWS extends XML { /** * @const - * @type {Object.>} + * @type {Object>} */ const ADDRESS_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -71,7 +71,7 @@ const ADDRESS_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const ALLOWED_VALUES_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -81,7 +81,7 @@ const ALLOWED_VALUES_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const CONSTRAINT_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -91,7 +91,7 @@ const CONSTRAINT_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const CONTACT_INFO_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -102,7 +102,7 @@ const CONTACT_INFO_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const DCP_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -112,7 +112,7 @@ const DCP_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const HTTP_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -123,7 +123,7 @@ const HTTP_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const OPERATION_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -133,7 +133,7 @@ const OPERATION_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const OPERATIONS_METADATA_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -143,7 +143,7 @@ const OPERATIONS_METADATA_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const PHONE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -154,7 +154,7 @@ const PHONE_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const REQUEST_METHOD_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -164,7 +164,7 @@ const REQUEST_METHOD_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const SERVICE_CONTACT_PARSERS = makeStructureNS( @@ -177,7 +177,7 @@ const SERVICE_CONTACT_PARSERS = /** * @const - * @type {Object.>} + * @type {Object>} */ const SERVICE_IDENTIFICATION_PARSERS = makeStructureNS( @@ -193,7 +193,7 @@ const SERVICE_IDENTIFICATION_PARSERS = /** * @const - * @type {Object.>} + * @type {Object>} */ const SERVICE_PROVIDER_PARSERS = makeStructureNS( diff --git a/src/ol/format/TopoJSON.js b/src/ol/format/TopoJSON.js index a5fd9635fd..9cae65ed65 100644 --- a/src/ol/format/TopoJSON.js +++ b/src/ol/format/TopoJSON.js @@ -157,7 +157,7 @@ class TopoJSON extends JSONFeature { /** * @const - * @type {Object.} + * @type {Object} */ const GEOMETRY_READERS = { 'Point': readPointGeometry, diff --git a/src/ol/format/WFS.js b/src/ol/format/WFS.js index 5103f1dace..c3cf9f4dbb 100644 --- a/src/ol/format/WFS.js +++ b/src/ol/format/WFS.js @@ -18,7 +18,7 @@ import {createElementNS, isDocument, isNode, makeArrayPusher, makeChildAppender, /** * @const - * @type {Object.>} + * @type {Object>} */ const FEATURE_COLLECTION_PARSERS = { 'http://www.opengis.net/gml': { @@ -30,7 +30,7 @@ const FEATURE_COLLECTION_PARSERS = { /** * @const - * @type {Object.>} + * @type {Object>} */ const TRANSACTION_SUMMARY_PARSERS = { 'http://www.opengis.net/wfs': { @@ -43,7 +43,7 @@ const TRANSACTION_SUMMARY_PARSERS = { /** * @const - * @type {Object.>} + * @type {Object>} */ const TRANSACTION_RESPONSE_PARSERS = { 'http://www.opengis.net/wfs': { @@ -56,7 +56,7 @@ const TRANSACTION_RESPONSE_PARSERS = { /** - * @type {Object.>} + * @type {Object>} */ const QUERY_SERIALIZERS = { 'http://www.opengis.net/wfs': { @@ -66,7 +66,7 @@ const QUERY_SERIALIZERS = { /** - * @type {Object.>} + * @type {Object>} */ const TRANSACTION_SERIALIZERS = { 'http://www.opengis.net/wfs': { @@ -81,7 +81,7 @@ const TRANSACTION_SERIALIZERS = { /** * @typedef {Object} Options - * @property {Object.|string} [featureNS] The namespace URI used for features. + * @property {Object|string} [featureNS] The namespace URI used for features. * @property {Array|string} [featureType] The feature type to parse. Only used for read operations. * @property {module:ol/format/GMLBase} [gmlFormat] The GML format to use to parse the response. Default is `ol/format/GML3`. * @property {string} [schemaLocation] Optional schemaLocation to use for serialization, this will override the default. @@ -178,7 +178,7 @@ const FESNS = 'http://www.opengis.net/fes'; /** - * @type {Object.} + * @type {Object} */ const SCHEMA_LOCATIONS = { '1.1.0': 'http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd', @@ -220,7 +220,7 @@ class WFS extends XMLFeature { /** * @private - * @type {Object.|string|undefined} + * @type {Object|string|undefined} */ this.featureNS_ = options.featureNS; @@ -549,7 +549,7 @@ function readTransactionSummary(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const OGC_FID_PARSERS = { 'http://www.opengis.net/ogc': { @@ -571,7 +571,7 @@ function fidParser(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object>} */ const INSERT_RESULTS_PARSERS = { 'http://www.opengis.net/wfs': { @@ -751,7 +751,7 @@ function writeNative(node, nativeElement, objectStack) { /** - * @type {Object.>} + * @type {Object>} */ const GETFEATURE_SERIALIZERS = { 'http://www.opengis.net/wfs': { diff --git a/src/ol/format/WKT.js b/src/ol/format/WKT.js index 468a93ee07..6121bddb07 100644 --- a/src/ol/format/WKT.js +++ b/src/ol/format/WKT.js @@ -85,7 +85,7 @@ const TokenType = { /** * @const - * @type {Object.} + * @type {Object} */ const WKTGeometryType = {}; for (const type in GeometryType) { @@ -838,7 +838,7 @@ function encodeGeometryLayout(geom) { /** * @const - * @type {Object.} + * @type {Object} */ const GeometryEncoder = { 'Point': encodePointGeometry, diff --git a/src/ol/format/WMSCapabilities.js b/src/ol/format/WMSCapabilities.js index 2d14b3d155..089cd4123d 100644 --- a/src/ol/format/WMSCapabilities.js +++ b/src/ol/format/WMSCapabilities.js @@ -20,7 +20,7 @@ const NAMESPACE_URIS = [ /** * @const - * @type {Object.>} + * @type {Object>} */ const PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -31,7 +31,7 @@ const PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const CAPABILITY_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -84,7 +84,7 @@ class WMSCapabilities extends XML { /** * @const - * @type {Object.>} + * @type {Object>} */ const SERVICE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -104,7 +104,7 @@ const SERVICE_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const CONTACT_INFORMATION_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -119,7 +119,7 @@ const CONTACT_INFORMATION_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const CONTACT_PERSON_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -130,7 +130,7 @@ const CONTACT_PERSON_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const CONTACT_ADDRESS_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -145,7 +145,7 @@ const CONTACT_ADDRESS_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const EXCEPTION_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -155,7 +155,7 @@ const EXCEPTION_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const LAYER_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -182,7 +182,7 @@ const LAYER_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const ATTRIBUTION_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -194,7 +194,7 @@ const ATTRIBUTION_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS = makeStructureNS(NAMESPACE_URIS, { @@ -207,7 +207,7 @@ const EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS = /** * @const - * @type {Object.>} + * @type {Object>} */ const REQUEST_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -219,7 +219,7 @@ const REQUEST_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const OPERATIONTYPE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -230,7 +230,7 @@ const OPERATIONTYPE_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const DCPTYPE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -240,7 +240,7 @@ const DCPTYPE_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const HTTP_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -251,7 +251,7 @@ const HTTP_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const STYLE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -266,7 +266,7 @@ const STYLE_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const FORMAT_ONLINERESOURCE_PARSERS = makeStructureNS(NAMESPACE_URIS, { @@ -277,7 +277,7 @@ const FORMAT_ONLINERESOURCE_PARSERS = /** * @const - * @type {Object.>} + * @type {Object>} */ const KEYWORDLIST_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -429,7 +429,7 @@ function readCapabilityLayer(node, objectStack) { * @return {Object|undefined} Layer object. */ function readLayer(node, objectStack) { - const parentLayerObject = /** @type {!Object.} */ (objectStack[objectStack.length - 1]); + const parentLayerObject = /** @type {!Object} */ (objectStack[objectStack.length - 1]); const layerObject = pushParseAndPop({}, LAYER_PARSERS, node, objectStack); diff --git a/src/ol/format/WMTSCapabilities.js b/src/ol/format/WMTSCapabilities.js index 300fd40564..30967421b5 100644 --- a/src/ol/format/WMTSCapabilities.js +++ b/src/ol/format/WMTSCapabilities.js @@ -32,7 +32,7 @@ const OWS_NAMESPACE_URIS = [ /** * @const - * @type {Object.>} + * @type {Object>} */ const PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -87,7 +87,7 @@ class WMTSCapabilities extends XML { /** * @const - * @type {Object.>} + * @type {Object>} */ const CONTENTS_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -98,7 +98,7 @@ const CONTENTS_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const LAYER_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -117,7 +117,7 @@ const LAYER_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const STYLE_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -130,7 +130,7 @@ const STYLE_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TMS_LINKS_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -140,7 +140,7 @@ const TMS_LINKS_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TMS_LIMITS_LIST_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -150,7 +150,7 @@ const TMS_LIMITS_LIST_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TMS_LIMITS_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -164,7 +164,7 @@ const TMS_LIMITS_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const DIMENSION_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -177,7 +177,7 @@ const DIMENSION_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const WGS84_BBOX_READERS = makeStructureNS( OWS_NAMESPACE_URIS, { @@ -188,7 +188,7 @@ const WGS84_BBOX_READERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TMS_PARSERS = makeStructureNS( NAMESPACE_URIS, { @@ -202,7 +202,7 @@ const TMS_PARSERS = makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object>} */ const TM_PARSERS = makeStructureNS( NAMESPACE_URIS, { diff --git a/src/ol/geom/Geometry.js b/src/ol/geom/Geometry.js index d5b979cde2..00717fd682 100644 --- a/src/ol/geom/Geometry.js +++ b/src/ol/geom/Geometry.js @@ -47,7 +47,7 @@ class Geometry extends BaseObject { /** * @protected - * @type {Object.} + * @type {Object} */ this.simplifiedGeometryCache = {}; diff --git a/src/ol/geom/flat/geodesic.js b/src/ol/geom/flat/geodesic.js index 19d9131e1d..9753e80ef8 100644 --- a/src/ol/geom/flat/geodesic.js +++ b/src/ol/geom/flat/geodesic.js @@ -32,7 +32,7 @@ function line(interpolate, transform, squaredTolerance) { /** @type {Array} */ const fractionStack = [1, 0]; - /** @type {!Object.} */ + /** @type {!Object} */ const fractions = {}; let maxIterations = 1e5; diff --git a/src/ol/interaction/Modify.js b/src/ol/interaction/Modify.js index 723de5ca24..f953b2e0c8 100644 --- a/src/ol/interaction/Modify.js +++ b/src/ol/interaction/Modify.js @@ -203,7 +203,7 @@ class Modify extends PointerInteraction { /** * Segments intersecting {@link this.vertexFeature_} by segment uid. - * @type {Object.} + * @type {Object} * @private */ this.vertexSegments_ = null; @@ -281,7 +281,7 @@ class Modify extends PointerInteraction { /** * @const * @private - * @type {!Object.} + * @type {!Object} */ this.SEGMENT_WRITERS_ = { 'Point': this.writePointGeometry_, diff --git a/src/ol/interaction/Pointer.js b/src/ol/interaction/Pointer.js index a3d694dfc7..f3e3e52e94 100644 --- a/src/ol/interaction/Pointer.js +++ b/src/ol/interaction/Pointer.js @@ -130,7 +130,7 @@ class PointerInteraction extends Interaction { this.stopDown = options.stopDown ? options.stopDown : stopDown; /** - * @type {!Object.} + * @type {!Object} * @private */ this.trackedPointers_ = {}; diff --git a/src/ol/interaction/Select.js b/src/ol/interaction/Select.js index 3daa5d7b8c..3cdf2a3430 100644 --- a/src/ol/interaction/Select.js +++ b/src/ol/interaction/Select.js @@ -251,7 +251,7 @@ class Select extends Interaction { * An association between selected feature (key) * and layer (value) * @private - * @type {Object.} + * @type {Object} */ this.featureLayerAssociation_ = {}; diff --git a/src/ol/interaction/Snap.js b/src/ol/interaction/Snap.js index 27f76a6e0c..eac861a732 100644 --- a/src/ol/interaction/Snap.js +++ b/src/ol/interaction/Snap.js @@ -111,7 +111,7 @@ class Snap extends PointerInteraction { this.featuresListenerKeys_ = []; /** - * @type {Object.} + * @type {Object} * @private */ this.featureChangeListenerKeys_ = {}; @@ -119,7 +119,7 @@ class Snap extends PointerInteraction { /** * Extents are preserved so indexed segment can be quickly removed * when its feature geometry changes - * @type {Object.} + * @type {Object} * @private */ this.indexedFeaturesExtents_ = {}; @@ -128,7 +128,7 @@ class Snap extends PointerInteraction { * If a feature geometry changes while a pointer drag|move event occurs, the * feature doesn't get updated right away. It will be at the next 'pointerup' * event fired. - * @type {!Object.} + * @type {!Object} * @private */ this.pendingFeatures_ = {}; @@ -165,7 +165,7 @@ class Snap extends PointerInteraction { /** * @const * @private - * @type {Object.} + * @type {Object} */ this.SEGMENT_WRITERS_ = { 'Point': this.writePointGeometry_, diff --git a/src/ol/layer/Base.js b/src/ol/layer/Base.js index 78138435dd..2cc30365c5 100644 --- a/src/ol/layer/Base.js +++ b/src/ol/layer/Base.js @@ -41,7 +41,7 @@ class BaseLayer extends BaseObject { super(); /** - * @type {Object.} + * @type {Object} */ const properties = assign({}, options); properties[LayerProperty.OPACITY] = diff --git a/src/ol/layer/Group.js b/src/ol/layer/Group.js index a2c358d75e..af0d61eb6a 100644 --- a/src/ol/layer/Group.js +++ b/src/ol/layer/Group.js @@ -70,7 +70,7 @@ class LayerGroup extends BaseLayer { /** * @private - * @type {Object.>} + * @type {Object>} */ this.listenerKeys_ = {}; diff --git a/src/ol/pointer/EventSource.js b/src/ol/pointer/EventSource.js index e5af64a733..9edcafefaf 100644 --- a/src/ol/pointer/EventSource.js +++ b/src/ol/pointer/EventSource.js @@ -6,7 +6,7 @@ class EventSource { /** * @param {module:ol/pointer/PointerEventHandler} dispatcher Event handler. - * @param {!Object.} mapping Event mapping. + * @param {!Object} mapping Event mapping. */ constructor(dispatcher, mapping) { @@ -18,7 +18,7 @@ class EventSource { /** * @private * @const - * @type {!Object.} + * @type {!Object} */ this.mapping_ = mapping; } diff --git a/src/ol/pointer/MouseSource.js b/src/ol/pointer/MouseSource.js index 0fad374de8..5d6ff08ade 100644 --- a/src/ol/pointer/MouseSource.js +++ b/src/ol/pointer/MouseSource.js @@ -148,7 +148,7 @@ class MouseSource extends EventSource { /** * @const - * @type {!Object.} + * @type {!Object} */ this.pointerMap = dispatcher.pointerMap; diff --git a/src/ol/pointer/MsSource.js b/src/ol/pointer/MsSource.js index 8987a737fe..6a3a547734 100644 --- a/src/ol/pointer/MsSource.js +++ b/src/ol/pointer/MsSource.js @@ -157,7 +157,7 @@ class MsSource extends EventSource { /** * @const - * @type {!Object.} + * @type {!Object} */ this.pointerMap = dispatcher.pointerMap; } diff --git a/src/ol/pointer/PointerEvent.js b/src/ol/pointer/PointerEvent.js index acaffe16c7..11dce303c8 100644 --- a/src/ol/pointer/PointerEvent.js +++ b/src/ol/pointer/PointerEvent.js @@ -52,7 +52,7 @@ class PointerEvent extends Event { * * @param {string} type The type of the event to create. * @param {Event} originalEvent The event. - * @param {Object.=} opt_eventDict An optional dictionary of + * @param {Object=} opt_eventDict An optional dictionary of * initial event properties. */ constructor(type, originalEvent, opt_eventDict) { @@ -202,7 +202,7 @@ class PointerEvent extends Event { /** * @private - * @param {Object.} eventDict The event dictionary. + * @param {Object} eventDict The event dictionary. * @return {number} Button indicator. */ getButtons_(eventDict) { @@ -243,7 +243,7 @@ class PointerEvent extends Event { /** * @private - * @param {Object.} eventDict The event dictionary. + * @param {Object} eventDict The event dictionary. * @param {number} buttons Button indicator. * @return {number} The pressure. */ diff --git a/src/ol/pointer/PointerEventHandler.js b/src/ol/pointer/PointerEventHandler.js index 69c0d1afa4..a40a5803ad 100644 --- a/src/ol/pointer/PointerEventHandler.js +++ b/src/ol/pointer/PointerEventHandler.js @@ -100,12 +100,12 @@ class PointerEventHandler extends EventTarget { /** * @const - * @type {!Object.} + * @type {!Object} */ this.pointerMap = {}; /** - * @type {Object.} + * @type {Object} * @private */ this.eventMap_ = {}; diff --git a/src/ol/pointer/TouchSource.js b/src/ol/pointer/TouchSource.js index b5331144a4..7dcc608337 100644 --- a/src/ol/pointer/TouchSource.js +++ b/src/ol/pointer/TouchSource.js @@ -114,7 +114,7 @@ class TouchSource extends EventSource { /** * @const - * @type {!Object.} + * @type {!Object} */ this.pointerMap = dispatcher.pointerMap; diff --git a/src/ol/proj/Units.js b/src/ol/proj/Units.js index 91aeefb9ea..e1b0cc9d87 100644 --- a/src/ol/proj/Units.js +++ b/src/ol/proj/Units.js @@ -20,7 +20,7 @@ const Units = { /** * Meters per unit lookup table. * @const - * @type {Object.} + * @type {Object} * @api */ export const METERS_PER_UNIT = {}; diff --git a/src/ol/proj/projections.js b/src/ol/proj/projections.js index e08af1e932..a2ff96d4f7 100644 --- a/src/ol/proj/projections.js +++ b/src/ol/proj/projections.js @@ -4,7 +4,7 @@ /** - * @type {Object.} + * @type {Object} */ let cache = {}; diff --git a/src/ol/proj/transforms.js b/src/ol/proj/transforms.js index c2d82e5220..45a1a2a152 100644 --- a/src/ol/proj/transforms.js +++ b/src/ol/proj/transforms.js @@ -6,7 +6,7 @@ import {isEmpty} from '../obj.js'; /** * @private - * @type {!Object.>} + * @type {!Object>} */ let transforms = {}; diff --git a/src/ol/render/Feature.js b/src/ol/render/Feature.js index 78168d8470..be69445104 100644 --- a/src/ol/render/Feature.js +++ b/src/ol/render/Feature.js @@ -28,7 +28,7 @@ const tmpTransform = createTransform(); * @param {Array} flatCoordinates Flat coordinates. These always need * to be right-handed for polygons. * @param {Array|Array>} ends Ends or Endss. - * @param {Object.} properties Properties. + * @param {Object} properties Properties. * @param {number|string|undefined} id Feature id. */ class RenderFeature { @@ -77,7 +77,7 @@ class RenderFeature { /** * @private - * @type {Object.} + * @type {Object} */ this.properties_ = properties; @@ -194,7 +194,7 @@ class RenderFeature { /** * Get the feature properties. - * @return {Object.} Feature properties. + * @return {Object} Feature properties. * @api */ getProperties() { diff --git a/src/ol/render/canvas.js b/src/ol/render/canvas.js index 6cc9a40aed..9f01072668 100644 --- a/src/ol/render/canvas.js +++ b/src/ol/render/canvas.js @@ -163,7 +163,7 @@ export const labelCache = new LRUCache(); /** - * @type {!Object.} + * @type {!Object} */ export const checkedFonts = {}; @@ -175,7 +175,7 @@ let measureContext = null; /** - * @type {!Object.} + * @type {!Object} */ export const textHeights = {}; diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js index d7c29ac623..17e33d8236 100644 --- a/src/ol/render/canvas/Replay.js +++ b/src/ol/render/canvas/Replay.js @@ -134,7 +134,7 @@ class CanvasReplay extends VectorContext { /** * @private - * @type {!Object.|Array>>} + * @type {!Object|Array>>} */ this.coordinateCache_ = {}; @@ -530,7 +530,7 @@ class CanvasReplay extends VectorContext { * @private * @param {CanvasRenderingContext2D} context Context. * @param {module:ol/transform~Transform} transform Transform. - * @param {Object.} skippedFeaturesHash Ids of features + * @param {Object} skippedFeaturesHash Ids of features * to skip. * @param {Array<*>} instructions Instructions array. * @param {function((module:ol/Feature|module:ol/render/Feature)): T|undefined} featureCallback Feature callback. @@ -851,7 +851,7 @@ class CanvasReplay extends VectorContext { * @param {CanvasRenderingContext2D} context Context. * @param {module:ol/transform~Transform} transform Transform. * @param {number} viewRotation View rotation. - * @param {Object.} skippedFeaturesHash Ids of features + * @param {Object} skippedFeaturesHash Ids of features * to skip. */ replay(context, transform, viewRotation, skippedFeaturesHash) { @@ -864,7 +864,7 @@ class CanvasReplay extends VectorContext { * @param {CanvasRenderingContext2D} context Context. * @param {module:ol/transform~Transform} transform Transform. * @param {number} viewRotation View rotation. - * @param {Object.} skippedFeaturesHash Ids of features + * @param {Object} skippedFeaturesHash Ids of features * to skip. * @param {function((module:ol/Feature|module:ol/render/Feature)): T=} opt_featureCallback * Feature callback. diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/ReplayGroup.js index de3fa4e9c3..0e431c6288 100644 --- a/src/ol/render/canvas/ReplayGroup.js +++ b/src/ol/render/canvas/ReplayGroup.js @@ -19,7 +19,7 @@ import {create as createTransform, compose as composeTransform} from '../../tran /** - * @type {Object.)>} */ @@ -104,7 +104,7 @@ class CanvasReplayGroup extends ReplayGroup { /** * @private - * @type {!Object.>} + * @type {!Object>} */ this.replaysByZIndex_ = {}; @@ -186,9 +186,9 @@ class CanvasReplayGroup extends ReplayGroup { * @param {number} resolution Resolution. * @param {number} rotation Rotation. * @param {number} hitTolerance Hit tolerance in pixels. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @param {function((module:ol/Feature|module:ol/render/Feature)): T} callback Feature callback. - * @param {Object.} declutterReplays Declutter replays. + * @param {Object} declutterReplays Declutter replays. * @return {T|undefined} Callback result. * @template T */ @@ -335,7 +335,7 @@ class CanvasReplayGroup extends ReplayGroup { } /** - * @return {Object.>} Replays. + * @return {Object>} Replays. */ getReplays() { return this.replaysByZIndex_; @@ -352,10 +352,10 @@ class CanvasReplayGroup extends ReplayGroup { * @param {CanvasRenderingContext2D} context Context. * @param {module:ol/transform~Transform} transform Transform. * @param {number} viewRotation View rotation. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @param {Array=} opt_replayTypes Ordered replay types to replay. * Default is {@link module:ol/render/replay~ORDER} - * @param {Object.=} opt_declutterReplays Declutter replays. + * @param {Object=} opt_declutterReplays Declutter replays. */ replay( context, @@ -407,7 +407,7 @@ class CanvasReplayGroup extends ReplayGroup { /** * This cache is used for storing calculated pixel circles for increasing performance. * It is a static property to allow each Replaygroup to access it. - * @type {Object.>>} + * @type {Object>>} */ const circleArrayCache = { 0: [[true]] @@ -483,7 +483,7 @@ export function getCircleArray(radius) { /** - * @param {!Object.>} declutterReplays Declutter replays. + * @param {!Object>} declutterReplays Declutter replays. * @param {CanvasRenderingContext2D} context Context. * @param {number} rotation Rotation. */ diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextReplay.js index 31ebb46a5d..c7bec1ec27 100644 --- a/src/ol/render/canvas/TextReplay.js +++ b/src/ol/render/canvas/TextReplay.js @@ -75,7 +75,7 @@ class CanvasTextReplay extends CanvasReplay { this.textFillState_ = null; /** - * @type {!Object.} + * @type {!Object} */ this.fillStates = {}; @@ -86,7 +86,7 @@ class CanvasTextReplay extends CanvasReplay { this.textStrokeState_ = null; /** - * @type {!Object.} + * @type {!Object} */ this.strokeStates = {}; @@ -97,7 +97,7 @@ class CanvasTextReplay extends CanvasReplay { this.textState_ = /** @type {module:ol/render/canvas~TextState} */ ({}); /** - * @type {!Object.} + * @type {!Object} */ this.textStates = {}; @@ -121,7 +121,7 @@ class CanvasTextReplay extends CanvasReplay { /** * @private - * @type {Object.>} + * @type {Object>} */ this.widths_ = {}; diff --git a/src/ol/render/webgl/ImageReplay.js b/src/ol/render/webgl/ImageReplay.js index f4641e4f76..1cd8d40e35 100644 --- a/src/ol/render/webgl/ImageReplay.js +++ b/src/ol/render/webgl/ImageReplay.js @@ -81,7 +81,7 @@ class WebGLImageReplay extends WebGLTextureReplay { this.indicesBuffer = new WebGLBuffer(indices); // create textures - /** @type {Object.} */ + /** @type {Object} */ const texturePerImage = {}; this.createTextures(this.textures_, this.images_, texturePerImage, gl); diff --git a/src/ol/render/webgl/Replay.js b/src/ol/render/webgl/Replay.js index 4a545bf5ef..ea67f50f29 100644 --- a/src/ol/render/webgl/Replay.js +++ b/src/ol/render/webgl/Replay.js @@ -160,7 +160,7 @@ class WebGLReplay extends VectorContext { * @protected * @param {WebGLRenderingContext} gl gl. * @param {module:ol/webgl/Context} context Context. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @param {boolean} hitDetection Hit detection mode. */ drawReplay(gl, context, skippedFeaturesHash, hitDetection) {} @@ -170,7 +170,7 @@ class WebGLReplay extends VectorContext { * @protected * @param {WebGLRenderingContext} gl gl. * @param {module:ol/webgl/Context} context Context. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @param {function((module:ol/Feature|module:ol/render/Feature)): T|undefined} featureCallback Feature callback. * @param {module:ol/extent~Extent=} opt_hitExtent Hit extent: Only features intersecting this extent are checked. * @return {T|undefined} Callback result. @@ -182,7 +182,7 @@ class WebGLReplay extends VectorContext { * @protected * @param {WebGLRenderingContext} gl gl. * @param {module:ol/webgl/Context} context Context. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @param {function((module:ol/Feature|module:ol/render/Feature)): T|undefined} featureCallback Feature callback. * @param {boolean} oneByOne Draw features one-by-one for the hit-detecion. * @param {module:ol/extent~Extent=} opt_hitExtent Hit extent: Only features intersecting this extent are checked. @@ -205,7 +205,7 @@ class WebGLReplay extends VectorContext { * @protected * @param {WebGLRenderingContext} gl gl. * @param {module:ol/webgl/Context} context Context. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @param {function((module:ol/Feature|module:ol/render/Feature)): T|undefined} featureCallback Feature callback. * @return {T|undefined} Callback result. * @template T @@ -230,7 +230,7 @@ class WebGLReplay extends VectorContext { * @param {module:ol/size~Size} size Size. * @param {number} pixelRatio Pixel ratio. * @param {number} opacity Global opacity. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @param {function((module:ol/Feature|module:ol/render/Feature)): T|undefined} featureCallback Feature callback. * @param {boolean} oneByOne Draw features one-by-one for the hit-detecion. * @param {module:ol/extent~Extent=} opt_hitExtent Hit extent: Only features intersecting this extent are checked. diff --git a/src/ol/render/webgl/ReplayGroup.js b/src/ol/render/webgl/ReplayGroup.js index edd2f380ec..a3edaf6e53 100644 --- a/src/ol/render/webgl/ReplayGroup.js +++ b/src/ol/render/webgl/ReplayGroup.js @@ -19,7 +19,7 @@ import WebGLTextReplay from '../webgl/TextReplay.js'; const HIT_DETECTION_SIZE = [1, 1]; /** - * @type {Object.} */ @@ -61,8 +61,8 @@ class WebGLReplayGroup extends ReplayGroup { /** * @private - * @type {!Object.>} + * @type {!Object>} */ this.replaysByZIndex_ = {}; @@ -148,7 +148,7 @@ class WebGLReplayGroup extends ReplayGroup { * @param {module:ol/size~Size} size Size. * @param {number} pixelRatio Pixel ratio. * @param {number} opacity Global opacity. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. */ replay( context, @@ -188,7 +188,7 @@ class WebGLReplayGroup extends ReplayGroup { * @param {module:ol/size~Size} size Size. * @param {number} pixelRatio Pixel ratio. * @param {number} opacity Global opacity. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @param {function((module:ol/Feature|module:ol/render/Feature)): T|undefined} featureCallback Feature callback. * @param {boolean} oneByOne Draw features one-by-one for the hit-detecion. * @param {module:ol/extent~Extent=} opt_hitExtent Hit extent: Only features intersecting @@ -242,7 +242,7 @@ class WebGLReplayGroup extends ReplayGroup { * @param {module:ol/size~Size} size Size. * @param {number} pixelRatio Pixel ratio. * @param {number} opacity Global opacity. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @param {function((module:ol/Feature|module:ol/render/Feature)): T|undefined} callback Feature callback. * @return {T|undefined} Callback result. * @template T @@ -303,7 +303,7 @@ class WebGLReplayGroup extends ReplayGroup { * @param {module:ol/size~Size} size Size. * @param {number} pixelRatio Pixel ratio. * @param {number} opacity Global opacity. - * @param {Object.} skippedFeaturesHash Ids of features to skip. + * @param {Object} skippedFeaturesHash Ids of features to skip. * @return {boolean} Is there a feature at the given coordinate? */ hasFeatureAtCoordinate( diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js index 4d55b73ea6..3d4b1c73b1 100644 --- a/src/ol/render/webgl/TextReplay.js +++ b/src/ol/render/webgl/TextReplay.js @@ -17,7 +17,7 @@ import WebGLBuffer from '../../webgl/Buffer.js'; /** * @typedef {Object} GlyphAtlas * @property {module:ol/style/AtlasManager} atlas - * @property {Object.} width + * @property {Object} width * @property {number} height */ @@ -106,7 +106,7 @@ class WebGLTextReplay extends WebGLTextureReplay { /** * @private - * @type {Object.} + * @type {Object} */ this.atlases_ = {}; @@ -313,7 +313,7 @@ class WebGLTextReplay extends WebGLTextureReplay { this.indicesBuffer = new WebGLBuffer(this.indices); // create textures - /** @type {Object.} */ + /** @type {Object} */ const texturePerImage = {}; this.createTextures(this.textures_, this.images_, texturePerImage, gl); diff --git a/src/ol/render/webgl/TextureReplay.js b/src/ol/render/webgl/TextureReplay.js index a851d6c56b..fae060a64e 100644 --- a/src/ol/render/webgl/TextureReplay.js +++ b/src/ol/render/webgl/TextureReplay.js @@ -235,7 +235,7 @@ class WebGLTextureReplay extends WebGLReplay { * @protected * @param {Array} textures Textures. * @param {Array} images Images. - * @param {!Object.} texturePerImage Texture cache. + * @param {!Object} texturePerImage Texture cache. * @param {WebGLRenderingContext} gl Gl. */ createTextures(textures, images, texturePerImage, gl) { @@ -351,7 +351,7 @@ class WebGLTextureReplay extends WebGLReplay { * @protected * @param {WebGLRenderingContext} gl gl. * @param {module:ol/webgl/Context} context Context. - * @param {Object.} skippedFeaturesHash Ids of features + * @param {Object} skippedFeaturesHash Ids of features * to skip. * @param {Array} textures Textures. * @param {Array} groupIndices Texture group indices. diff --git a/src/ol/renderer/Layer.js b/src/ol/renderer/Layer.js index 56e2bf55d4..963d398c65 100644 --- a/src/ol/renderer/Layer.js +++ b/src/ol/renderer/Layer.js @@ -31,7 +31,7 @@ class LayerRenderer extends Observable { * Create a function that adds loaded tiles to the tile lookup. * @param {module:ol/source/Tile} source Tile source. * @param {module:ol/proj/Projection} projection Projection of the tiles. - * @param {Object.>} tiles Lookup of loaded tiles by zoom level. + * @param {Object>} tiles Lookup of loaded tiles by zoom level. * @return {function(number, module:ol/TileRange):boolean} A function that can be * called with a zoom level and a tile range to add loaded tiles to the lookup. * @protected @@ -130,7 +130,7 @@ class LayerRenderer extends Observable { } /** - * @param {!Object.>} usedTiles Used tiles. + * @param {!Object>} usedTiles Used tiles. * @param {module:ol/source/Tile} tileSource Tile source. * @param {number} z Z. * @param {module:ol/TileRange} tileRange Tile range. diff --git a/src/ol/renderer/Map.js b/src/ol/renderer/Map.js index 9ab550daef..b303a2111a 100644 --- a/src/ol/renderer/Map.js +++ b/src/ol/renderer/Map.js @@ -28,13 +28,13 @@ class MapRenderer extends Disposable { /** * @private - * @type {!Object.} + * @type {!Object} */ this.layerRenderers_ = {}; /** * @private - * @type {Object.} + * @type {Object} */ this.layerRendererListeners_ = {}; @@ -242,7 +242,7 @@ class MapRenderer extends Disposable { /** * @protected - * @return {Object.} Layer renderers. + * @return {Object} Layer renderers. */ getLayerRenderers() { return this.layerRenderers_; diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index 8ca712dfe8..c7a332a280 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -163,7 +163,7 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer { const tilePixelRatio = tileSource.getTilePixelRatio(pixelRatio); /** - * @type {Object.>} + * @type {Object>} */ const tilesToDrawByZ = {}; tilesToDrawByZ[z] = {}; diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index d007af9a2b..18d7d2dcc4 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -234,7 +234,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { const resolution = frameState.viewState.resolution; const rotation = frameState.viewState.rotation; const layer = /** @type {module:ol/layer/Vector} */ (this.getLayer()); - /** @type {!Object.} */ + /** @type {!Object} */ const features = {}; const result = this.replayGroup_.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {}, /** diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index 21ea643d28..b3057fdc78 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -28,7 +28,7 @@ import { /** - * @type {!Object.>} + * @type {!Object>} */ const IMAGE_REPLAYS = { 'image': [ReplayType.POLYGON, ReplayType.CIRCLE, @@ -38,7 +38,7 @@ const IMAGE_REPLAYS = { /** - * @type {!Object.>} + * @type {!Object>} */ const VECTOR_REPLAYS = { 'image': [ReplayType.DEFAULT], @@ -234,7 +234,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { const rotation = frameState.viewState.rotation; hitTolerance = hitTolerance == undefined ? 0 : hitTolerance; const layer = this.getLayer(); - /** @type {!Object.} */ + /** @type {!Object} */ const features = {}; /** @type {Array} */ diff --git a/src/ol/renderer/vector.js b/src/ol/renderer/vector.js index de3ca3b9cd..0ec2d23408 100644 --- a/src/ol/renderer/vector.js +++ b/src/ol/renderer/vector.js @@ -16,7 +16,7 @@ const SIMPLIFY_TOLERANCE = 0.5; /** * @const - * @type {Object.} */ diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index 6335cd3b62..67cd173116 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -214,7 +214,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer { gl.uniform1i(this.locations_.u_texture, 0); /** - * @type {Object.>} + * @type {Object>} */ const tilesToDrawByZ = {}; tilesToDrawByZ[z] = {}; diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js index 47e875a6f4..a91807103f 100644 --- a/src/ol/renderer/webgl/VectorLayer.js +++ b/src/ol/renderer/webgl/VectorLayer.js @@ -117,7 +117,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer { const viewState = frameState.viewState; const layer = this.getLayer(); const layerState = this.layerState_; - /** @type {!Object.} */ + /** @type {!Object} */ const features = {}; return this.replayGroup_.forEachFeatureAtCoordinate(coordinate, context, viewState.center, viewState.resolution, viewState.rotation, diff --git a/src/ol/reproj/Triangulation.js b/src/ol/reproj/Triangulation.js index 9872d8df5b..459a018fc9 100644 --- a/src/ol/reproj/Triangulation.js +++ b/src/ol/reproj/Triangulation.js @@ -64,7 +64,7 @@ class Triangulation { */ this.targetProj_ = targetProj; - /** @type {!Object.} */ + /** @type {!Object} */ let transformInvCache = {}; const transformInv = getTransform(this.targetProj_, this.sourceProj_); diff --git a/src/ol/source/CartoDB.js b/src/ol/source/CartoDB.js index df6baefcf1..a8e5af91ad 100644 --- a/src/ol/source/CartoDB.js +++ b/src/ol/source/CartoDB.js @@ -71,7 +71,7 @@ class CartoDB extends XYZ { this.config_ = options.config || {}; /** - * @type {!Object.} + * @type {!Object} * @private */ this.templateCache_ = {}; diff --git a/src/ol/source/Cluster.js b/src/ol/source/Cluster.js index c8f7d17396..f4238d4129 100644 --- a/src/ol/source/Cluster.js +++ b/src/ol/source/Cluster.js @@ -159,7 +159,7 @@ class Cluster extends VectorSource { const features = this.source.getFeatures(); /** - * @type {!Object.} + * @type {!Object} */ const clustered = {}; diff --git a/src/ol/source/ImageArcGISRest.js b/src/ol/source/ImageArcGISRest.js index 1a98caa48d..5cce76bcd6 100644 --- a/src/ol/source/ImageArcGISRest.js +++ b/src/ol/source/ImageArcGISRest.js @@ -23,7 +23,7 @@ import {appendParams} from '../uri.js'; * the remote server. * @property {module:ol/Image~LoadFunction} [imageLoadFunction] Optional function to load an image given * a URL. - * @property {Object.} params ArcGIS Rest parameters. This field is optional. Service + * @property {Object} params ArcGIS Rest parameters. This field is optional. Service * defaults will be used for any fields not specified. `FORMAT` is `PNG32` by default. `F` is * `IMAGE` by default. `TRANSPARENT` is `true` by default. `BBOX, `SIZE`, `BBOXSR`, and `IMAGESR` * will be set dynamically. Set `LAYERS` to override the default service layer visibility. See diff --git a/src/ol/source/ImageMapGuide.js b/src/ol/source/ImageMapGuide.js index 0ff28a005e..8a821a3345 100644 --- a/src/ol/source/ImageMapGuide.js +++ b/src/ol/source/ImageMapGuide.js @@ -195,7 +195,7 @@ class ImageMapGuide extends ImageSource { /** * @param {string} baseUrl The mapagent url. - * @param {Object.} params Request parameters. + * @param {Object} params Request parameters. * @param {module:ol/extent~Extent} extent Extent. * @param {module:ol/size~Size} size Size. * @param {module:ol/proj/Projection} projection Projection. diff --git a/src/ol/source/ImageWMS.js b/src/ol/source/ImageWMS.js index a73ad2716b..544348afbb 100644 --- a/src/ol/source/ImageWMS.js +++ b/src/ol/source/ImageWMS.js @@ -37,7 +37,7 @@ const GETFEATUREINFO_IMAGE_SIZE = [101, 101]; * @property {module:ol/source/WMSServerType|string} [serverType] The type of * the remote WMS server: `mapserver`, `geoserver` or `qgis`. Only needed if `hidpi` is `true`. * @property {module:ol/Image~LoadFunction} [imageLoadFunction] Optional function to load an image given a URL. - * @property {Object.} params WMS request parameters. + * @property {Object} params WMS request parameters. * At least a `LAYERS` param is required. `STYLES` is * `''` by default. `VERSION` is `1.3.0` by default. `WIDTH`, `HEIGHT`, `BBOX` * and `CRS` (`SRS` for WMS version < 1.3.0) will be set dynamically. diff --git a/src/ol/source/Source.js b/src/ol/source/Source.js index c6dacdcf47..110f80b843 100644 --- a/src/ol/source/Source.js +++ b/src/ol/source/Source.js @@ -180,7 +180,7 @@ class Source extends BaseObject { * @param {number} resolution Resolution. * @param {number} rotation Rotation. * @param {number} hitTolerance Hit tolerance in pixels. - * @param {Object.} skippedFeatureUids Skipped feature uids. + * @param {Object} skippedFeatureUids Skipped feature uids. * @param {function((module:ol/Feature|module:ol/render/Feature)): T} callback Feature callback. * @return {T|undefined} Callback result. * @template T diff --git a/src/ol/source/Stamen.js b/src/ol/source/Stamen.js index 3c42e9aff9..3a04f2c60f 100644 --- a/src/ol/source/Stamen.js +++ b/src/ol/source/Stamen.js @@ -19,7 +19,7 @@ const ATTRIBUTIONS = [ /** - * @type {Object.} + * @type {Object} */ const LayerConfig = { 'terrain': { @@ -70,7 +70,7 @@ const LayerConfig = { /** - * @type {Object.} + * @type {Object} */ const ProviderConfig = { 'terrain': { diff --git a/src/ol/source/Tile.js b/src/ol/source/Tile.js index 7d03fe5111..f7ea700086 100644 --- a/src/ol/source/Tile.js +++ b/src/ol/source/Tile.js @@ -102,7 +102,7 @@ class TileSource extends Source { /** * @param {module:ol/proj/Projection} projection Projection. - * @param {!Object.} usedTiles Used tiles. + * @param {!Object} usedTiles Used tiles. */ expireCache(projection, usedTiles) { const tileCache = this.getTileCacheForProjection(projection); diff --git a/src/ol/source/TileArcGISRest.js b/src/ol/source/TileArcGISRest.js index 2c5cc65995..25d56847f0 100644 --- a/src/ol/source/TileArcGISRest.js +++ b/src/ol/source/TileArcGISRest.js @@ -19,7 +19,7 @@ import {appendParams} from '../uri.js'; * or if you want to access pixel data with the Canvas renderer. See * https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image * for more detail. - * @property {Object.} [params] ArcGIS Rest parameters. This field is optional. Service defaults will be + * @property {Object} [params] ArcGIS Rest parameters. This field is optional. Service defaults will be * used for any fields not specified. `FORMAT` is `PNG32` by default. `F` is `IMAGE` by * default. `TRANSPARENT` is `true` by default. `BBOX, `SIZE`, `BBOXSR`, * and `IMAGESR` will be set dynamically. Set `LAYERS` to diff --git a/src/ol/source/TileImage.js b/src/ol/source/TileImage.js index 77d599ccee..5f3f433110 100644 --- a/src/ol/source/TileImage.js +++ b/src/ol/source/TileImage.js @@ -102,13 +102,13 @@ class TileImage extends UrlTile { /** * @protected - * @type {!Object.} + * @type {!Object} */ this.tileCacheForProjection = {}; /** * @protected - * @type {!Object.} + * @type {!Object} */ this.tileGridForProjection = {}; diff --git a/src/ol/source/TileWMS.js b/src/ol/source/TileWMS.js index 12fe4e41c8..66d8765b8c 100644 --- a/src/ol/source/TileWMS.js +++ b/src/ol/source/TileWMS.js @@ -25,7 +25,7 @@ import {appendParams} from '../uri.js'; * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to * access pixel data with the Canvas renderer. See * https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail. - * @property {Object.} params WMS request parameters. + * @property {Object} params WMS request parameters. * At least a `LAYERS` param is required. `STYLES` is * `''` by default. `VERSION` is `1.3.0` by default. `WIDTH`, `HEIGHT`, `BBOX` * and `CRS` (`SRS` for WMS version < 1.3.0) will be set dynamically. diff --git a/src/ol/source/UTFGrid.js b/src/ol/source/UTFGrid.js index 19fafd1720..d023140681 100644 --- a/src/ol/source/UTFGrid.js +++ b/src/ol/source/UTFGrid.js @@ -63,7 +63,7 @@ export class CustomTile extends Tile { /** * @private - * @type {Object.|undefined} + * @type {Object|undefined} */ this.data_ = null; diff --git a/src/ol/source/UrlTile.js b/src/ol/source/UrlTile.js index c5ff0f4382..0982ce6429 100644 --- a/src/ol/source/UrlTile.js +++ b/src/ol/source/UrlTile.js @@ -82,7 +82,7 @@ class UrlTile extends TileSource { /** * @private - * @type {!Object.} + * @type {!Object} */ this.tileLoadingKeys_ = {}; diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js index 82b067b31c..bd6b3589b1 100644 --- a/src/ol/source/Vector.js +++ b/src/ol/source/Vector.js @@ -227,27 +227,27 @@ class VectorSource extends Source { /** * @private - * @type {!Object.} + * @type {!Object} */ this.nullGeometryFeatures_ = {}; /** * A lookup of features by id (the return from feature.getId()). * @private - * @type {!Object.} + * @type {!Object} */ this.idIndex_ = {}; /** * A lookup of features without id (keyed by getUid(feature)). * @private - * @type {!Object.} + * @type {!Object} */ this.undefIdIndex_ = {}; /** * @private - * @type {Object.>} + * @type {Object>} */ this.featureChangeKeys_ = {}; diff --git a/src/ol/source/VectorTile.js b/src/ol/source/VectorTile.js index 65e16d549a..b33a803acf 100644 --- a/src/ol/source/VectorTile.js +++ b/src/ol/source/VectorTile.js @@ -111,7 +111,7 @@ class VectorTile extends UrlTile { /** * @private - * @type {Object.} + * @type {Object} */ this.sourceTiles_ = {}; @@ -130,7 +130,7 @@ class VectorTile extends UrlTile { /** * @private - * @type {Object.} + * @type {Object} */ this.tileGrids_ = {}; diff --git a/src/ol/structs/LRUCache.js b/src/ol/structs/LRUCache.js index b8ce54812a..3544cc7309 100644 --- a/src/ol/structs/LRUCache.js +++ b/src/ol/structs/LRUCache.js @@ -47,7 +47,7 @@ class LRUCache extends EventTarget { /** * @private - * @type {!Object.} + * @type {!Object} */ this.entries_ = {}; diff --git a/src/ol/structs/PriorityQueue.js b/src/ol/structs/PriorityQueue.js index 8f3ca694da..a8385264db 100644 --- a/src/ol/structs/PriorityQueue.js +++ b/src/ol/structs/PriorityQueue.js @@ -56,7 +56,7 @@ class PriorityQueue { this.priorities_ = []; /** - * @type {!Object.} + * @type {!Object} * @private */ this.queuedElements_ = {}; diff --git a/src/ol/structs/RBush.js b/src/ol/structs/RBush.js index 96b6260009..73ac9102b3 100644 --- a/src/ol/structs/RBush.js +++ b/src/ol/structs/RBush.js @@ -37,7 +37,7 @@ class RBush { * A mapping between the objects added to this rbush wrapper * and the objects that are actually added to the internal rbush. * @private - * @type {Object.} + * @type {Object} */ this.items_ = {}; diff --git a/src/ol/style/Atlas.js b/src/ol/style/Atlas.js index ca8ff398f2..cbfc8d3b52 100644 --- a/src/ol/style/Atlas.js +++ b/src/ol/style/Atlas.js @@ -64,7 +64,7 @@ class Atlas { /** * @private - * @type {Object.} + * @type {Object} */ this.entries_ = {}; diff --git a/src/ol/style/IconImageCache.js b/src/ol/style/IconImageCache.js index 013d4d8c04..6166c1807b 100644 --- a/src/ol/style/IconImageCache.js +++ b/src/ol/style/IconImageCache.js @@ -11,7 +11,7 @@ class IconImageCache { constructor() { /** - * @type {!Object.} + * @type {!Object} * @private */ this.cache_ = {}; diff --git a/src/ol/style/Style.js b/src/ol/style/Style.js index 4e812e1416..0fa9097f03 100644 --- a/src/ol/style/Style.js +++ b/src/ol/style/Style.js @@ -466,10 +466,10 @@ export function createDefaultStyle(feature, resolution) { /** * Default styles for editing features. - * @return {Object.>} Styles + * @return {Object>} Styles */ export function createEditingStyle() { - /** @type {Object.>} */ + /** @type {Object>} */ const styles = {}; const white = [255, 255, 255, 1]; const blue = [0, 153, 255, 1]; diff --git a/src/ol/webgl/Context.js b/src/ol/webgl/Context.js index 2dc1fe7a57..adef6a7e8a 100644 --- a/src/ol/webgl/Context.js +++ b/src/ol/webgl/Context.js @@ -45,19 +45,19 @@ class WebGLContext extends Disposable { /** * @private - * @type {!Object.} + * @type {!Object} */ this.bufferCache_ = {}; /** * @private - * @type {!Object.} + * @type {!Object} */ this.shaderCache_ = {}; /** * @private - * @type {!Object.} + * @type {!Object} */ this.programCache_ = {}; diff --git a/src/ol/xml.js b/src/ol/xml.js index a3105b1632..a1fb814cd2 100644 --- a/src/ol/xml.js +++ b/src/ol/xml.js @@ -354,7 +354,7 @@ export const OBJECT_PROPERTY_NODE_FACTORY = makeSimpleNodeFactory(); * Create an array of `values` to be used with {@link module:ol/xml~serialize} or * {@link module:ol/xml~pushSerializeAndPop}, where `orderedKeys` has to be provided as * `opt_key` argument. - * @param {Object.} object Key-value pairs for the sequence. Keys can + * @param {Object} object Key-value pairs for the sequence. Keys can * be a subset of the `orderedKeys`. * @param {Array} orderedKeys Keys in the order of the sequence. * @return {Array} Values in the order of the sequence. The resulting array @@ -378,13 +378,13 @@ export function makeSequence(object, orderedKeys) { * values are version specific. * @param {Array} namespaceURIs Namespace URIs. * @param {T} structure Structure. - * @param {Object.=} opt_structureNS Namespaced structure to add to. - * @return {Object.} Namespaced structure. + * @param {Object=} opt_structureNS Namespaced structure to add to. + * @return {Object} Namespaced structure. * @template T */ export function makeStructureNS(namespaceURIs, structure, opt_structureNS) { /** - * @type {Object.} + * @type {Object} */ const structureNS = opt_structureNS !== undefined ? opt_structureNS : {}; let i, ii; @@ -397,7 +397,7 @@ export function makeStructureNS(namespaceURIs, structure, opt_structureNS) { /** * Parse a node using the parsers and object stack. - * @param {Object.>} parsersNS + * @param {Object>} parsersNS * Parsers by namespace. * @param {Node} node Node. * @param {Array<*>} objectStack Object stack. @@ -420,7 +420,7 @@ export function parseNode(parsersNS, node, objectStack, opt_this) { /** * Push an object on top of the stack, parse and return the popped object. * @param {T} object Object. - * @param {Object.>} parsersNS + * @param {Object>} parsersNS * Parsers by namespace. * @param {Node} node Node. * @param {Array<*>} objectStack Object stack. @@ -437,7 +437,7 @@ export function pushParseAndPop(object, parsersNS, node, objectStack, opt_this) /** * Walk through an array of `values` and call a serializer for each value. - * @param {Object.>} serializersNS + * @param {Object>} serializersNS * Namespaced serializers. * @param {function(this: T, *, Array<*>, (string|undefined)): (Node|undefined)} nodeFactory * Node factory. The `nodeFactory` creates the node whose namespace and name @@ -477,7 +477,7 @@ export function serialize( /** * @param {O} object Object. - * @param {Object.>} serializersNS + * @param {Object>} serializersNS * Namespaced serializers. * @param {function(this: T, *, Array<*>, (string|undefined)): (Node|undefined)} nodeFactory * Node factory. The `nodeFactory` creates the node whose namespace and name diff --git a/tasks/generate-index.js b/tasks/generate-index.js index b13cdaaf43..4c91f6f111 100644 --- a/tasks/generate-index.js +++ b/tasks/generate-index.js @@ -41,7 +41,7 @@ function getImports(symbols) { /** * Generate code to export a named symbol. * @param {string} name Symbol name. - * @param {Object.} namespaces Already defined namespaces. + * @param {Object} namespaces Already defined namespaces. * @return {string} Export code. */ function formatSymbolExport(name, namespaces) { @@ -65,7 +65,7 @@ function formatSymbolExport(name, namespaces) { /** * Generate export code given a list symbol names. * @param {Array} symbols List of symbols. - * @param {Object.} namespaces Already defined namespaces. + * @param {Object} namespaces Already defined namespaces. * @param {Array} imports List of all imports. * @return {string} Export code. */ diff --git a/test/spec/ol/source/tile.test.js b/test/spec/ol/source/tile.test.js index b8b14bbb51..53856d9550 100644 --- a/test/spec/ol/source/tile.test.js +++ b/test/spec/ol/source/tile.test.js @@ -12,7 +12,7 @@ import TileGrid from '../../../../src/ol/tilegrid/TileGrid.js'; * Tile source for tests that uses a EPSG:4326 based grid with 4 resolutions and * 256x256 tiles. * - * @param {Object.} tileStates Lookup of tile key to + * @param {Object} tileStates Lookup of tile key to * tile state. */ class MockTile extends TileSource {