ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shorter module paths for default exports

Browse Source
This commit is contained in:
ahocevar
2018-04-25 17:23:56 +02:00
parent 6cb115d6a4
commit 440d1ad3e1
233 changed files with 2136 additions and 2042 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/webgl/ImageLayer.js
+10 -10
View File
@@ -26,7 +26,7 @@ import {createTexture} from '../../webgl/Context.js';
* @constructor
* @extends {ol.renderer.webgl.Layer}
* @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
* @param {module:ol/layer/Image~ImageLayer} imageLayer Tile layer.
* @param {module:ol/layer/Image} imageLayer Tile layer.
* @api
*/
const WebGLImageLayerRenderer = function(mapRenderer, imageLayer) {
@@ -36,7 +36,7 @@ const WebGLImageLayerRenderer = function(mapRenderer, imageLayer) {
/**
* The last rendered image.
* @private
* @type {?module:ol/ImageBase~ImageBase}
* @type {?module:ol/ImageBase}
*/
this.image_ = null;
@@ -59,7 +59,7 @@ inherits(WebGLImageLayerRenderer, WebGLLayerRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLImageLayerRenderer['handles'] = function(layer) {
@@ -70,19 +70,19 @@ WebGLImageLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.ImageLayer} The layer renderer.
*/
WebGLImageLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLImageLayerRenderer(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {module:ol/layer/Image~ImageLayer} */ (layer)
/** @type {module:ol/layer/Image} */ (layer)
);
};
/**
* @param {module:ol/ImageBase~ImageBase} image Image.
* @param {module:ol/ImageBase} image Image.
* @private
* @return {WebGLTexture} Texture.
*/
@@ -113,9 +113,9 @@ WebGLImageLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordina
coordinate, resolution, rotation, hitTolerance, skippedFeatureUids,
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @return {?} Callback result.
*/
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
return callback.call(thisArg, feature, layer);
});
@@ -137,7 +137,7 @@ WebGLImageLayerRenderer.prototype.prepareFrame = function(frameState, layerState
let image = this.image_;
let texture = this.texture;
const imageLayer = /** @type {module:ol/layer/Image~ImageLayer} */ (this.getLayer());
const imageLayer = /** @type {module:ol/layer/Image} */ (this.getLayer());
const imageSource = imageLayer.getSource();
const hints = frameState.viewHints;
src/ol/renderer/webgl/Layer.js
+6 -6
View File
@@ -20,7 +20,7 @@ import {createEmptyTexture} from '../../webgl/Context.js';
* @abstract
* @extends {ol.renderer.Layer}
* @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
* @param {module:ol/layer/Layer~Layer} layer Layer.
* @param {module:ol/layer/Layer} layer Layer.
*/
const WebGLLayerRenderer = function(mapRenderer, layer) {
@@ -34,7 +34,7 @@ const WebGLLayerRenderer = function(mapRenderer, layer) {
/**
* @private
* @type {module:ol/webgl/Buffer~WebGLBuffer}
* @type {module:ol/webgl/Buffer}
*/
this.arrayBuffer_ = new WebGLBuffer([
-1, -1, 0, 0,
@@ -139,7 +139,7 @@ WebGLLayerRenderer.prototype.bindFramebuffer = function(frameState, framebufferD
/**
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
*/
WebGLLayerRenderer.prototype.composeFrame = function(frameState, layerState, context) {
@@ -183,7 +183,7 @@ WebGLLayerRenderer.prototype.composeFrame = function(frameState, layerState, con
/**
* @param {module:ol/render/EventType~EventType} type Event type.
* @param {module:ol/webgl/Context~WebGLContext} context WebGL context.
* @param {module:ol/webgl/Context} context WebGL context.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @private
*/
@@ -245,7 +245,7 @@ WebGLLayerRenderer.prototype.handleWebGLContextLost = function() {
* @abstract
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @param {module:ol/layer/Layer~State} layerState Layer state.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @return {boolean} whether composeFrame should be called.
*/
WebGLLayerRenderer.prototype.prepareFrame = function(frameState, layerState, context) {};
@@ -255,7 +255,7 @@ WebGLLayerRenderer.prototype.prepareFrame = function(frameState, layerState, con
* @abstract
* @param {module:ol~Pixel} pixel Pixel.
* @param {module:ol/PluggableMap~FrameState} frameState FrameState.
* @param {function(this: S, module:ol/layer/Layer~Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* @param {function(this: S, module:ol/layer/Layer, (Uint8ClampedArray|Uint8Array)): T} callback Layer
* callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
* @return {T|undefined} Callback result.
src/ol/renderer/webgl/Map.js
+20 -18
View File
@@ -41,7 +41,7 @@ const WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK = 1024;
/**
* @constructor
* @extends {ol.renderer.Map}
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/PluggableMap} map Map.
* @api
*/
const WebGLMapRenderer = function(map) {
@@ -99,7 +99,7 @@ const WebGLMapRenderer = function(map) {
/**
* @private
* @type {module:ol/webgl/Context~WebGLContext}
* @type {module:ol/webgl/Context}
*/
this.context_ = new WebGLContext(this.canvas_, this.gl_);
@@ -126,29 +126,31 @@ const WebGLMapRenderer = function(map) {
*/
this.tileTextureQueue_ = new PriorityQueue(
/**
* @param {Array.<*>} element Element.
* @return {number} Priority.
* @this {ol.renderer.webgl.Map}
*/
(function(element) {
* @param {Array.<*>} element Element.
* @return {number} Priority.
* @this {ol.renderer.webgl.Map}
*/
function(element) {
const tileCenter = /** @type {module:ol/coordinate~Coordinate} */ (element[1]);
const tileResolution = /** @type {number} */ (element[2]);
const deltaX = tileCenter[0] - this.focus_[0];
const deltaY = tileCenter[1] - this.focus_[1];
return 65536 * Math.log(tileResolution) +
Math.sqrt(deltaX * deltaX + deltaY * deltaY) / tileResolution;
}).bind(this),
}.bind(this),
/**
* @param {Array.<*>} element Element.
* @return {string} Key.
*/
* @param {Array.<*>} element Element.
* @return {string} Key.
*/
function(element) {
return /** @type {module:ol/Tile~Tile} */ (element[0]).getKey();
return (
/** @type {module:ol/Tile} */ (element[0]).getKey()
);
});
/**
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/PluggableMap} map Map.
* @param {?module:ol/PluggableMap~FrameState} frameState Frame state.
* @return {boolean} false.
* @this {ol.renderer.webgl.Map}
@@ -158,7 +160,7 @@ const WebGLMapRenderer = function(map) {
if (!this.tileTextureQueue_.isEmpty()) {
this.tileTextureQueue_.reprioritize();
const element = this.tileTextureQueue_.dequeue();
const tile = /** @type {module:ol/Tile~Tile} */ (element[0]);
const tile = /** @type {module:ol/Tile} */ (element[0]);
const tileSize = /** @type {module:ol/size~Size} */ (element[3]);
const tileGutter = /** @type {number} */ (element[4]);
this.bindTileTexture(
@@ -296,7 +298,7 @@ WebGLMapRenderer.prototype.disposeInternal = function() {
/**
* @param {module:ol/PluggableMap~PluggableMap} map Map.
* @param {module:ol/PluggableMap} map Map.
* @param {module:ol/PluggableMap~FrameState} frameState Frame state.
* @private
*/
@@ -321,7 +323,7 @@ WebGLMapRenderer.prototype.expireCache_ = function(map, frameState) {
/**
* @return {module:ol/webgl/Context~WebGLContext} The context.
* @return {module:ol/webgl/Context} The context.
*/
WebGLMapRenderer.prototype.getContext = function() {
return this.context_;
@@ -345,7 +347,7 @@ WebGLMapRenderer.prototype.getTileTextureQueue = function() {
/**
* @param {module:ol/events/Event~Event} event Event.
* @param {module:ol/events/Event} event Event.
* @protected
*/
WebGLMapRenderer.prototype.handleWebGLContextLost = function(event) {
@@ -387,7 +389,7 @@ WebGLMapRenderer.prototype.initializeGL_ = function() {
/**
* @param {module:ol/Tile~Tile} tile Tile.
* @param {module:ol/Tile} tile Tile.
* @return {boolean} Is tile texture loaded.
*/
WebGLMapRenderer.prototype.isTileTextureLoaded = function(tile) {
src/ol/renderer/webgl/TileLayer.js
+15 -14
View File
@@ -29,7 +29,7 @@ import WebGLBuffer from '../../webgl/Buffer.js';
* @constructor
* @extends {ol.renderer.webgl.Layer}
* @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
* @param {module:ol/layer/Tile~TileLayer} tileLayer Tile layer.
* @param {module:ol/layer/Tile} tileLayer Tile layer.
* @api
*/
const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
@@ -38,13 +38,13 @@ const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
/**
* @private
* @type {module:ol/webgl/Fragment~WebGLFragment}
* @type {module:ol/webgl/Fragment}
*/
this.fragmentShader_ = fragment;
/**
* @private
* @type {module:ol/webgl/Vertex~WebGLVertex}
* @type {module:ol/webgl/Vertex}
*/
this.vertexShader_ = vertex;
@@ -56,7 +56,7 @@ const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
/**
* @private
* @type {module:ol/webgl/Buffer~WebGLBuffer}
* @type {module:ol/webgl/Buffer}
*/
this.renderArrayBuffer_ = new WebGLBuffer([
0, 0, 0, 1,
@@ -67,7 +67,7 @@ const WebGLTileLayerRenderer = function(mapRenderer, tileLayer) {
/**
* @private
* @type {module:ol/TileRange~TileRange}
* @type {module:ol/TileRange}
*/
this.renderedTileRange_ = null;
@@ -96,7 +96,7 @@ inherits(WebGLTileLayerRenderer, WebGLLayerRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLTileLayerRenderer['handles'] = function(layer) {
@@ -107,13 +107,13 @@ WebGLTileLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.TileLayer} The layer renderer.
*/
WebGLTileLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLTileLayerRenderer(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {module:ol/layer/Tile~TileLayer} */ (layer)
/** @type {module:ol/layer/Tile} */ (layer)
);
};
@@ -137,7 +137,7 @@ WebGLTileLayerRenderer.prototype.createLoadedTileFinder = function(source, proje
return (
/**
* @param {number} zoom Zoom level.
* @param {module:ol/TileRange~TileRange} tileRange Tile range.
* @param {module:ol/TileRange} tileRange Tile range.
* @return {boolean} The tile range is fully loaded.
*/
function(zoom, tileRange) {
@@ -152,7 +152,8 @@ WebGLTileLayerRenderer.prototype.createLoadedTileFinder = function(source, proje
return loaded;
}
return source.forEachLoadedTile(projection, zoom, tileRange, callback);
});
}
);
};
@@ -176,7 +177,7 @@ WebGLTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState,
const viewState = frameState.viewState;
const projection = viewState.projection;
const tileLayer = /** @type {module:ol/layer/Tile~TileLayer} */ (this.getLayer());
const tileLayer = /** @type {module:ol/layer/Tile} */ (this.getLayer());
const tileSource = tileLayer.getSource();
const tileGrid = tileSource.getTileGridForProjection(projection);
const z = tileGrid.getZForResolution(viewState.resolution);
@@ -240,7 +241,7 @@ WebGLTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState,
gl.uniform1i(this.locations_.u_texture, 0);
/**
* @type {Object.<number, Object.<string, module:ol/Tile~Tile>>}
* @type {Object.<number, Object.<string, module:ol/Tile>>}
*/
const tilesToDrawByZ = {};
tilesToDrawByZ[z] = {};
@@ -342,8 +343,8 @@ WebGLTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState,
frameState, tileSource, tileGrid, pixelRatio, projection, extent, z,
tileLayer.getPreload(),
/**
* @param {module:ol/Tile~Tile} tile Tile.
*/
* @param {module:ol/Tile} tile Tile.
*/
function(tile) {
if (tile.getState() == TileState.LOADED &&
!mapRenderer.isTileTextureLoaded(tile) &&
src/ol/renderer/webgl/VectorLayer.js
+13 -13
View File
@@ -14,7 +14,7 @@ import {apply as applyTransform} from '../../transform.js';
* @constructor
* @extends {ol.renderer.webgl.Layer}
* @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
* @param {module:ol/layer/Vector~VectorLayer} vectorLayer Vector layer.
* @param {module:ol/layer/Vector} vectorLayer Vector layer.
* @api
*/
const WebGLVectorLayerRenderer = function(mapRenderer, vectorLayer) {
@@ -47,7 +47,7 @@ const WebGLVectorLayerRenderer = function(mapRenderer, vectorLayer) {
/**
* @private
* @type {function(module:ol/Feature~Feature, module:ol/Feature~Feature): number|null}
* @type {function(module:ol/Feature, module:ol/Feature): number|null}
*/
this.renderedRenderOrder_ = null;
@@ -71,7 +71,7 @@ inherits(WebGLVectorLayerRenderer, WebGLLayerRenderer);
/**
* Determine if this renderer handles the provided layer.
* @param {module:ol/layer/Layer~Layer} layer The candidate layer.
* @param {module:ol/layer/Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLVectorLayerRenderer['handles'] = function(layer) {
@@ -82,13 +82,13 @@ WebGLVectorLayerRenderer['handles'] = function(layer) {
/**
* Create a layer renderer.
* @param {ol.renderer.Map} mapRenderer The map renderer.
* @param {module:ol/layer/Layer~Layer} layer The layer to be rendererd.
* @param {module:ol/layer/Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.VectorLayer} The layer renderer.
*/
WebGLVectorLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLVectorLayerRenderer(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {module:ol/layer/Vector~VectorLayer} */ (layer)
/** @type {module:ol/layer/Vector} */ (layer)
);
};
@@ -148,7 +148,7 @@ WebGLVectorLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordin
frameState.size, frameState.pixelRatio, layerState.opacity,
{},
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @return {?} Callback result.
*/
function(feature) {
@@ -198,7 +198,7 @@ WebGLVectorLayerRenderer.prototype.forEachLayerAtPixel = function(pixel, frameSt
/**
* Handle changes in image style state.
* @param {module:ol/events/Event~Event} event Image style change event.
* @param {module:ol/events/Event} event Image style change event.
* @private
*/
WebGLVectorLayerRenderer.prototype.handleStyleImageChange_ = function(event) {
@@ -210,7 +210,7 @@ WebGLVectorLayerRenderer.prototype.handleStyleImageChange_ = function(event) {
* @inheritDoc
*/
WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerState, context) {
const vectorLayer = /** @type {module:ol/layer/Vector~VectorLayer} */ (this.getLayer());
const vectorLayer = /** @type {module:ol/layer/Vector} */ (this.getLayer());
const vectorSource = vectorLayer.getSource();
const animating = frameState.viewHints[ViewHint.ANIMATING];
@@ -259,7 +259,7 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
extent, vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection);
/**
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/Feature} feature Feature.
* @this {ol.renderer.webgl.VectorLayer}
*/
const render = function(feature) {
@@ -275,11 +275,11 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
}
};
if (vectorLayerRenderOrder) {
/** @type {Array.<module:ol/Feature~Feature>} */
/** @type {Array.<module:ol/Feature>} */
const features = [];
vectorSource.forEachFeatureInExtent(extent,
/**
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/Feature} feature Feature.
*/
function(feature) {
features.push(feature);
@@ -302,10 +302,10 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
/**
* @param {module:ol/Feature~Feature} feature Feature.
* @param {module:ol/Feature} feature Feature.
* @param {number} resolution Resolution.
* @param {number} pixelRatio Pixel ratio.
* @param {(module:ol/style/Style~Style|Array.<module:ol/style/Style~Style>)} styles The style or array of
* @param {(module:ol/style/Style|Array.<module:ol/style/Style>)} styles The style or array of
* styles.
* @param {ol.render.webgl.ReplayGroup} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.