Use Object<Foo, Bar> instead of Object.<Foo, Bar>

This commit is contained in:
Tim Schaub
2018-07-25 18:33:49 -07:00
parent d12ef20b12
commit affbf59b77
92 changed files with 334 additions and 334 deletions

View File

@@ -71,7 +71,7 @@ class CartoDB extends XYZ {
this.config_ = options.config || {};
/**
* @type {!Object.<string, CartoDBLayerInfo>}
* @type {!Object<string, CartoDBLayerInfo>}
* @private
*/
this.templateCache_ = {};

View File

@@ -159,7 +159,7 @@ class Cluster extends VectorSource {
const features = this.source.getFeatures();
/**
* @type {!Object.<string, boolean>}
* @type {!Object<string, boolean>}
*/
const clustered = {};

View File

@@ -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.<string,*>} params ArcGIS Rest parameters. This field is optional. Service
* @property {Object<string,*>} 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

View File

@@ -195,7 +195,7 @@ class ImageMapGuide extends ImageSource {
/**
* @param {string} baseUrl The mapagent url.
* @param {Object.<string, string|number>} params Request parameters.
* @param {Object<string, string|number>} params Request parameters.
* @param {module:ol/extent~Extent} extent Extent.
* @param {module:ol/size~Size} size Size.
* @param {module:ol/proj/Projection} projection Projection.

View File

@@ -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.<string,*>} params WMS request parameters.
* @property {Object<string,*>} 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.

View File

@@ -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.<string, boolean>} skippedFeatureUids Skipped feature uids.
* @param {Object<string, boolean>} skippedFeatureUids Skipped feature uids.
* @param {function((module:ol/Feature|module:ol/render/Feature)): T} callback Feature callback.
* @return {T|undefined} Callback result.
* @template T

View File

@@ -19,7 +19,7 @@ const ATTRIBUTIONS = [
/**
* @type {Object.<string, {extension: string, opaque: boolean}>}
* @type {Object<string, {extension: string, opaque: boolean}>}
*/
const LayerConfig = {
'terrain': {
@@ -70,7 +70,7 @@ const LayerConfig = {
/**
* @type {Object.<string, {minZoom: number, maxZoom: number}>}
* @type {Object<string, {minZoom: number, maxZoom: number}>}
*/
const ProviderConfig = {
'terrain': {

View File

@@ -102,7 +102,7 @@ class TileSource extends Source {
/**
* @param {module:ol/proj/Projection} projection Projection.
* @param {!Object.<string, module:ol/TileRange>} usedTiles Used tiles.
* @param {!Object<string, module:ol/TileRange>} usedTiles Used tiles.
*/
expireCache(projection, usedTiles) {
const tileCache = this.getTileCacheForProjection(projection);

View File

@@ -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.<string,*>} [params] ArcGIS Rest parameters. This field is optional. Service defaults will be
* @property {Object<string,*>} [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

View File

@@ -102,13 +102,13 @@ class TileImage extends UrlTile {
/**
* @protected
* @type {!Object.<string, module:ol/TileCache>}
* @type {!Object<string, module:ol/TileCache>}
*/
this.tileCacheForProjection = {};
/**
* @protected
* @type {!Object.<string, module:ol/tilegrid/TileGrid>}
* @type {!Object<string, module:ol/tilegrid/TileGrid>}
*/
this.tileGridForProjection = {};

View File

@@ -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.<string,*>} params WMS request parameters.
* @property {Object<string,*>} 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.

View File

@@ -63,7 +63,7 @@ export class CustomTile extends Tile {
/**
* @private
* @type {Object.<string, Object>|undefined}
* @type {Object<string, Object>|undefined}
*/
this.data_ = null;

View File

@@ -82,7 +82,7 @@ class UrlTile extends TileSource {
/**
* @private
* @type {!Object.<number, boolean>}
* @type {!Object<number, boolean>}
*/
this.tileLoadingKeys_ = {};

View File

@@ -227,27 +227,27 @@ class VectorSource extends Source {
/**
* @private
* @type {!Object.<string, module:ol/Feature>}
* @type {!Object<string, module:ol/Feature>}
*/
this.nullGeometryFeatures_ = {};
/**
* A lookup of features by id (the return from feature.getId()).
* @private
* @type {!Object.<string, module:ol/Feature>}
* @type {!Object<string, module:ol/Feature>}
*/
this.idIndex_ = {};
/**
* A lookup of features without id (keyed by getUid(feature)).
* @private
* @type {!Object.<string, module:ol/Feature>}
* @type {!Object<string, module:ol/Feature>}
*/
this.undefIdIndex_ = {};
/**
* @private
* @type {Object.<string, Array<module:ol/events~EventsKey>>}
* @type {Object<string, Array<module:ol/events~EventsKey>>}
*/
this.featureChangeKeys_ = {};

View File

@@ -111,7 +111,7 @@ class VectorTile extends UrlTile {
/**
* @private
* @type {Object.<string, module:ol/VectorTile>}
* @type {Object<string, module:ol/VectorTile>}
*/
this.sourceTiles_ = {};
@@ -130,7 +130,7 @@ class VectorTile extends UrlTile {
/**
* @private
* @type {Object.<string, module:ol/tilegrid/TileGrid>}
* @type {Object<string, module:ol/tilegrid/TileGrid>}
*/
this.tileGrids_ = {};