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

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.<number, Object.<string, module:ol/Tile>>} tiles Lookup of loaded tiles by zoom level.
+   * @param {Object<number, Object<string, module:ol/Tile>>} 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.<string, !Object.<string, module:ol/TileRange>>} usedTiles Used tiles.
+   * @param {!Object<string, !Object<string, module:ol/TileRange>>} usedTiles Used tiles.
    * @param {module:ol/source/Tile} tileSource Tile source.
    * @param {number} z Z.
    * @param {module:ol/TileRange} tileRange Tile range.

src/ol/renderer/Map.js

@@ -28,13 +28,13 @@ class MapRenderer extends Disposable {
 
     /**
      * @private
-     * @type {!Object.<string, module:ol/renderer/Layer>}
+     * @type {!Object<string, module:ol/renderer/Layer>}
      */
     this.layerRenderers_ = {};
 
     /**
      * @private
-     * @type {Object.<string, module:ol/events~EventsKey>}
+     * @type {Object<string, module:ol/events~EventsKey>}
      */
     this.layerRendererListeners_ = {};
 
@@ -242,7 +242,7 @@ class MapRenderer extends Disposable {
 
   /**
    * @protected
-   * @return {Object.<string, module:ol/renderer/Layer>} Layer renderers.
+   * @return {Object<string, module:ol/renderer/Layer>} Layer renderers.
    */
   getLayerRenderers() {
     return this.layerRenderers_;

src/ol/renderer/canvas/TileLayer.js

@@ -163,7 +163,7 @@ class CanvasTileLayerRenderer extends IntermediateCanvasRenderer {
     const tilePixelRatio = tileSource.getTilePixelRatio(pixelRatio);
 
     /**
-     * @type {Object.<number, Object.<string, module:ol/Tile>>}
+     * @type {Object<number, Object<string, module:ol/Tile>>}
      */
     const tilesToDrawByZ = {};
     tilesToDrawByZ[z] = {};

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.<string, boolean>} */
+      /** @type {!Object<string, boolean>} */
       const features = {};
       const result = this.replayGroup_.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {},
         /**

src/ol/renderer/canvas/VectorTileLayer.js

@@ -28,7 +28,7 @@ import {
 
 
 /**
- * @type {!Object.<string, Array<module:ol/render/ReplayType>>}
+ * @type {!Object<string, Array<module:ol/render/ReplayType>>}
  */
 const IMAGE_REPLAYS = {
   'image': [ReplayType.POLYGON, ReplayType.CIRCLE,
@@ -38,7 +38,7 @@ const IMAGE_REPLAYS = {
 
 
 /**
- * @type {!Object.<string, Array<module:ol/render/ReplayType>>}
+ * @type {!Object<string, Array<module:ol/render/ReplayType>>}
  */
 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.<string, boolean>} */
+    /** @type {!Object<string, boolean>} */
     const features = {};
 
     /** @type {Array<module:ol/VectorImageTile>} */

src/ol/renderer/vector.js

@@ -16,7 +16,7 @@ const SIMPLIFY_TOLERANCE = 0.5;
 
 /**
  * @const
- * @type {Object.<module:ol/geom/GeometryType,
+ * @type {Object<module:ol/geom/GeometryType,
  *                function(module:ol/render/ReplayGroup, module:ol/geom/Geometry,
  *                         module:ol/style/Style, Object)>}
  */

src/ol/renderer/webgl/TileLayer.js

@@ -214,7 +214,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
       gl.uniform1i(this.locations_.u_texture, 0);
 
       /**
-       * @type {Object.<number, Object.<string, module:ol/Tile>>}
+       * @type {Object<number, Object<string, module:ol/Tile>>}
        */
       const tilesToDrawByZ = {};
       tilesToDrawByZ[z] = {};

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.<string, boolean>} */
+      /** @type {!Object<string, boolean>} */
       const features = {};
       return this.replayGroup_.forEachFeatureAtCoordinate(coordinate,
         context, viewState.center, viewState.resolution, viewState.rotation,