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/render/webgl/CircleReplay.js
+1 -1
View File
@@ -311,7 +311,7 @@ WebGLCircleReplay.prototype.drawHitDetectionReplayOneByOne = function(gl, contex
/**
* @private
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {Object} skippedFeaturesHash Ids of features to skip.
*/
WebGLCircleReplay.prototype.drawReplaySkipping_ = function(gl, context, skippedFeaturesHash) {
src/ol/render/webgl/Immediate.js
+17 -17
View File
@@ -10,8 +10,8 @@ import WebGLReplayGroup from '../webgl/ReplayGroup.js';
/**
* @constructor
* @extends {module:ol/render/VectorContext~VectorContext}
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @extends {module:ol/render/VectorContext}
* @param {module:ol/webgl/Context} context Context.
* @param {module:ol/coordinate~Coordinate} center Center.
* @param {number} resolution Resolution.
* @param {number} rotation Rotation.
@@ -60,25 +60,25 @@ const WebGLImmediateRenderer = function(context, center, resolution, rotation, s
/**
* @private
* @type {module:ol/style/Image~ImageStyle}
* @type {module:ol/style/Image}
*/
this.imageStyle_ = null;
/**
* @private
* @type {module:ol/style/Fill~Fill}
* @type {module:ol/style/Fill}
*/
this.fillStyle_ = null;
/**
* @private
* @type {module:ol/style/Stroke~Stroke}
* @type {module:ol/style/Stroke}
*/
this.strokeStyle_ = null;
/**
* @private
* @type {module:ol/style/Text~Text}
* @type {module:ol/style/Text}
*/
this.textStyle_ = null;
@@ -89,7 +89,7 @@ inherits(WebGLImmediateRenderer, VectorContext);
/**
* @param {ol.render.webgl.ReplayGroup} replayGroup Replay group.
* @param {module:ol/geom/Geometry~Geometry|module:ol/render/Feature~RenderFeature} geometry Geometry.
* @param {module:ol/geom/Geometry|module:ol/render/Feature} geometry Geometry.
* @private
*/
WebGLImmediateRenderer.prototype.drawText_ = function(replayGroup, geometry) {
@@ -115,7 +115,7 @@ WebGLImmediateRenderer.prototype.drawText_ = function(replayGroup, geometry) {
* Set the rendering style. Note that since this is an immediate rendering API,
* any `zIndex` on the provided style will be ignored.
*
* @param {module:ol/style/Style~Style} style The rendering style.
* @param {module:ol/style/Style} style The rendering style.
* @override
* @api
*/
@@ -130,7 +130,7 @@ WebGLImmediateRenderer.prototype.setStyle = function(style) {
* Render a geometry into the canvas. Call
* {@link ol.render.webgl.Immediate#setStyle} first to set the rendering style.
*
* @param {module:ol/geom/Geometry~Geometry|module:ol/render/Feature~RenderFeature} geometry The geometry to render.
* @param {module:ol/geom/Geometry|module:ol/render/Feature} geometry The geometry to render.
* @override
* @api
*/
@@ -138,28 +138,28 @@ WebGLImmediateRenderer.prototype.drawGeometry = function(geometry) {
const type = geometry.getType();
switch (type) {
case GeometryType.POINT:
this.drawPoint(/** @type {module:ol/geom/Point~Point} */ (geometry), null);
this.drawPoint(/** @type {module:ol/geom/Point} */ (geometry), null);
break;
case GeometryType.LINE_STRING:
this.drawLineString(/** @type {module:ol/geom/LineString~LineString} */ (geometry), null);
this.drawLineString(/** @type {module:ol/geom/LineString} */ (geometry), null);
break;
case GeometryType.POLYGON:
this.drawPolygon(/** @type {module:ol/geom/Polygon~Polygon} */ (geometry), null);
this.drawPolygon(/** @type {module:ol/geom/Polygon} */ (geometry), null);
break;
case GeometryType.MULTI_POINT:
this.drawMultiPoint(/** @type {module:ol/geom/MultiPoint~MultiPoint} */ (geometry), null);
this.drawMultiPoint(/** @type {module:ol/geom/MultiPoint} */ (geometry), null);
break;
case GeometryType.MULTI_LINE_STRING:
this.drawMultiLineString(/** @type {module:ol/geom/MultiLineString~MultiLineString} */ (geometry), null);
this.drawMultiLineString(/** @type {module:ol/geom/MultiLineString} */ (geometry), null);
break;
case GeometryType.MULTI_POLYGON:
this.drawMultiPolygon(/** @type {module:ol/geom/MultiPolygon~MultiPolygon} */ (geometry), null);
this.drawMultiPolygon(/** @type {module:ol/geom/MultiPolygon} */ (geometry), null);
break;
case GeometryType.GEOMETRY_COLLECTION:
this.drawGeometryCollection(/** @type {module:ol/geom/GeometryCollection~GeometryCollection} */ (geometry), null);
this.drawGeometryCollection(/** @type {module:ol/geom/GeometryCollection} */ (geometry), null);
break;
case GeometryType.CIRCLE:
this.drawCircle(/** @type {module:ol/geom/Circle~Circle} */ (geometry), null);
this.drawCircle(/** @type {module:ol/geom/Circle} */ (geometry), null);
break;
default:
// pass
src/ol/render/webgl/LineStringReplay.js
+2 -2
View File
@@ -396,7 +396,7 @@ WebGLLineStringReplay.prototype.drawPolygonCoordinates = function(
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @param {number=} opt_index Index count.
*/
WebGLLineStringReplay.prototype.setPolygonStyle = function(feature, opt_index) {
@@ -549,7 +549,7 @@ WebGLLineStringReplay.prototype.drawReplay = function(gl, context, skippedFeatur
/**
* @private
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {Object} skippedFeaturesHash Ids of features to skip.
*/
WebGLLineStringReplay.prototype.drawReplaySkipping_ = function(gl, context, skippedFeaturesHash) {
src/ol/render/webgl/PolygonReplay.js
+1 -1
View File
@@ -1002,7 +1002,7 @@ WebGLPolygonReplay.prototype.drawHitDetectionReplayOneByOne = function(gl, conte
/**
* @private
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {Object} skippedFeaturesHash Ids of features to skip.
*/
WebGLPolygonReplay.prototype.drawReplaySkipping_ = function(gl, context, skippedFeaturesHash) {
src/ol/render/webgl/Replay.js
+17 -17
View File
@@ -18,7 +18,7 @@ import {ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, TRIANGLES,
/**
* @constructor
* @abstract
* @extends {module:ol/render/VectorContext~VectorContext}
* @extends {module:ol/render/VectorContext}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @struct
@@ -81,7 +81,7 @@ const WebGLReplay = function(tolerance, maxExtent) {
/**
* @protected
* @type {?module:ol/webgl/Buffer~WebGLBuffer}
* @type {?module:ol/webgl/Buffer}
*/
this.indicesBuffer = null;
@@ -95,7 +95,7 @@ const WebGLReplay = function(tolerance, maxExtent) {
/**
* Start index per feature (the feature).
* @protected
* @type {Array.<module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature>}
* @type {Array.<module:ol/Feature|module:ol/render/Feature>}
*/
this.startIndicesFeature = [];
@@ -107,7 +107,7 @@ const WebGLReplay = function(tolerance, maxExtent) {
/**
* @protected
* @type {?module:ol/webgl/Buffer~WebGLBuffer}
* @type {?module:ol/webgl/Buffer}
*/
this.verticesBuffer = null;
@@ -125,7 +125,7 @@ inherits(WebGLReplay, VectorContext);
/**
* @abstract
* @param {module:ol/webgl/Context~WebGLContext} context WebGL context.
* @param {module:ol/webgl/Context} context WebGL context.
* @return {function()} Delete resources function.
*/
WebGLReplay.prototype.getDeleteResourcesFunction = function(context) {};
@@ -133,7 +133,7 @@ WebGLReplay.prototype.getDeleteResourcesFunction = function(context) {};
/**
* @abstract
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
*/
WebGLReplay.prototype.finish = function(context) {};
@@ -142,7 +142,7 @@ WebGLReplay.prototype.finish = function(context) {};
* @abstract
* @protected
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {module:ol/size~Size} size Size.
* @param {number} pixelRatio Pixel ratio.
* @return {ol.render.webgl.circlereplay.defaultshader.Locations|
@@ -169,7 +169,7 @@ WebGLReplay.prototype.shutDownProgram = function(gl, locations) {};
* @abstract
* @protected
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {Object.<string, boolean>} skippedFeaturesHash Ids of features to skip.
* @param {boolean} hitDetection Hit detection mode.
*/
@@ -180,9 +180,9 @@ WebGLReplay.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hi
* @abstract
* @protected
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {Object.<string, boolean>} skippedFeaturesHash Ids of features to skip.
* @param {function((module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature)): T|undefined} featureCallback Feature callback.
* @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.
* @template T
@@ -193,9 +193,9 @@ WebGLReplay.prototype.drawHitDetectionReplayOneByOne = function(gl, context, ski
/**
* @protected
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {Object.<string, boolean>} skippedFeaturesHash Ids of features to skip.
* @param {function((module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature)): T|undefined} featureCallback Feature callback.
* @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.
@@ -219,9 +219,9 @@ WebGLReplay.prototype.drawHitDetectionReplay = function(gl, context, skippedFeat
/**
* @protected
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {Object.<string, boolean>} skippedFeaturesHash Ids of features to skip.
* @param {function((module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature)): T|undefined} featureCallback Feature callback.
* @param {function((module:ol/Feature|module:ol/render/Feature)): T|undefined} featureCallback Feature callback.
* @return {T|undefined} Callback result.
* @template T
*/
@@ -240,7 +240,7 @@ WebGLReplay.prototype.drawHitDetectionReplayAll = function(gl, context, skippedF
/**
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {module:ol/coordinate~Coordinate} center Center.
* @param {number} resolution Resolution.
* @param {number} rotation Rotation.
@@ -248,7 +248,7 @@ WebGLReplay.prototype.drawHitDetectionReplayAll = function(gl, context, skippedF
* @param {number} pixelRatio Pixel ratio.
* @param {number} opacity Global opacity.
* @param {Object.<string, boolean>} skippedFeaturesHash Ids of features to skip.
* @param {function((module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature)): T|undefined} featureCallback Feature callback.
* @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.
@@ -347,7 +347,7 @@ WebGLReplay.prototype.replay = function(context,
/**
* @protected
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {number} start Start index.
* @param {number} end End index.
*/
src/ol/render/webgl/ReplayGroup.js
+12 -12
View File
@@ -34,7 +34,7 @@ const BATCH_CONSTRUCTORS = {
/**
* @constructor
* @extends {module:ol/render/ReplayGroup~ReplayGroup}
* @extends {module:ol/render/ReplayGroup}
* @param {number} tolerance Tolerance.
* @param {module:ol/extent~Extent} maxExtent Max extent.
* @param {number=} opt_renderBuffer Render buffer.
@@ -74,14 +74,14 @@ inherits(WebGLReplayGroup, ReplayGroup);
/**
* @param {module:ol/style/Style~Style} style Style.
* @param {module:ol/style/Style} style Style.
* @param {boolean} group Group with previous replay.
*/
WebGLReplayGroup.prototype.addDeclutter = function(style, group) {};
/**
* @param {module:ol/webgl/Context~WebGLContext} context WebGL context.
* @param {module:ol/webgl/Context} context WebGL context.
* @return {function()} Delete resources function.
*/
WebGLReplayGroup.prototype.getDeleteResourcesFunction = function(context) {
@@ -106,7 +106,7 @@ WebGLReplayGroup.prototype.getDeleteResourcesFunction = function(context) {
/**
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
*/
WebGLReplayGroup.prototype.finish = function(context) {
let zKey;
@@ -151,7 +151,7 @@ WebGLReplayGroup.prototype.isEmpty = function() {
/**
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {module:ol/coordinate~Coordinate} center Center.
* @param {number} resolution Resolution.
* @param {number} rotation Rotation.
@@ -185,7 +185,7 @@ WebGLReplayGroup.prototype.replay = function(context,
/**
* @private
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {module:ol/coordinate~Coordinate} center Center.
* @param {number} resolution Resolution.
* @param {number} rotation Rotation.
@@ -193,7 +193,7 @@ WebGLReplayGroup.prototype.replay = function(context,
* @param {number} pixelRatio Pixel ratio.
* @param {number} opacity Global opacity.
* @param {Object.<string, boolean>} skippedFeaturesHash Ids of features to skip.
* @param {function((module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature)): T|undefined} featureCallback Feature callback.
* @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.
@@ -230,7 +230,7 @@ WebGLReplayGroup.prototype.replayHitDetection_ = function(context,
/**
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {module:ol/coordinate~Coordinate} center Center.
* @param {number} resolution Resolution.
* @param {number} rotation Rotation.
@@ -238,7 +238,7 @@ WebGLReplayGroup.prototype.replayHitDetection_ = function(context,
* @param {number} pixelRatio Pixel ratio.
* @param {number} opacity Global opacity.
* @param {Object.<string, boolean>} skippedFeaturesHash Ids of features to skip.
* @param {function((module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature)): T|undefined} callback Feature callback.
* @param {function((module:ol/Feature|module:ol/render/Feature)): T|undefined} callback Feature callback.
* @return {T|undefined} Callback result.
* @template T
*/
@@ -265,7 +265,7 @@ WebGLReplayGroup.prototype.forEachFeatureAtCoordinate = function(
coordinate, resolution, rotation, HIT_DETECTION_SIZE,
pixelRatio, opacity, skippedFeaturesHash,
/**
* @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) {
@@ -284,7 +284,7 @@ WebGLReplayGroup.prototype.forEachFeatureAtCoordinate = function(
/**
* @param {module:ol/coordinate~Coordinate} coordinate Coordinate.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {module:ol/coordinate~Coordinate} center Center.
* @param {number} resolution Resolution.
* @param {number} rotation Rotation.
@@ -305,7 +305,7 @@ WebGLReplayGroup.prototype.hasFeatureAtCoordinate = function(
coordinate, resolution, rotation, HIT_DETECTION_SIZE,
pixelRatio, opacity, skippedFeaturesHash,
/**
* @param {module:ol/Feature~Feature|module:ol/render/Feature~RenderFeature} feature Feature.
* @param {module:ol/Feature|module:ol/render/Feature} feature Feature.
* @return {boolean} Is there a feature?
*/
function(feature) {
src/ol/render/webgl/TextReplay.js
+6 -6
View File
@@ -16,7 +16,7 @@ import WebGLBuffer from '../../webgl/Buffer.js';
/**
* @typedef {Object} GlyphAtlas
* @property {module:ol/style/AtlasManager~AtlasManager} atlas
* @property {module:ol/style/AtlasManager} atlas
* @property {Object.<string, number>} width
* @property {number} height
*/
@@ -144,20 +144,20 @@ WebGLTextReplay.prototype.drawText = function(geometry, feature) {
stride = geometry.getStride();
break;
case GeometryType.CIRCLE:
flatCoordinates = /** @type {module:ol/geom/Circle~Circle} */ (geometry).getCenter();
flatCoordinates = /** @type {module:ol/geom/Circle} */ (geometry).getCenter();
break;
case GeometryType.LINE_STRING:
flatCoordinates = /** @type {module:ol/geom/LineString~LineString} */ (geometry).getFlatMidpoint();
flatCoordinates = /** @type {module:ol/geom/LineString} */ (geometry).getFlatMidpoint();
break;
case GeometryType.MULTI_LINE_STRING:
flatCoordinates = /** @type {module:ol/geom/MultiLineString~MultiLineString} */ (geometry).getFlatMidpoints();
flatCoordinates = /** @type {module:ol/geom/MultiLineString} */ (geometry).getFlatMidpoints();
end = flatCoordinates.length;
break;
case GeometryType.POLYGON:
flatCoordinates = /** @type {module:ol/geom/Polygon~Polygon} */ (geometry).getFlatInteriorPoint();
flatCoordinates = /** @type {module:ol/geom/Polygon} */ (geometry).getFlatInteriorPoint();
break;
case GeometryType.MULTI_POLYGON:
flatCoordinates = /** @type {module:ol/geom/MultiPolygon~MultiPolygon} */ (geometry).getFlatInteriorPoints();
flatCoordinates = /** @type {module:ol/geom/MultiPolygon} */ (geometry).getFlatInteriorPoints();
end = flatCoordinates.length;
break;
default:
src/ol/render/webgl/TextureReplay.js
+1 -1
View File
@@ -362,7 +362,7 @@ WebGLTextureReplay.prototype.drawReplay = function(gl, context, skippedFeaturesH
*
* @protected
* @param {WebGLRenderingContext} gl gl.
* @param {module:ol/webgl/Context~WebGLContext} context Context.
* @param {module:ol/webgl/Context} context Context.
* @param {Object.<string, boolean>} skippedFeaturesHash Ids of features
* to skip.
* @param {Array.<WebGLTexture>} textures Textures.