diff --git a/src/ol/render/VectorContext.js b/src/ol/render/VectorContext.js index b3ed2a5f45..993c8d5896 100644 --- a/src/ol/render/VectorContext.js +++ b/src/ol/render/VectorContext.js @@ -9,7 +9,7 @@ * @struct * @api */ -var _ol_render_VectorContext_ = function() { +var VectorContext = function() { }; @@ -20,7 +20,7 @@ var _ol_render_VectorContext_ = function() { * @param {ol.Feature|ol.render.Feature} feature Feature. * @param {Function} renderer Renderer. */ -_ol_render_VectorContext_.prototype.drawCustom = function(geometry, feature, renderer) {}; +VectorContext.prototype.drawCustom = function(geometry, feature, renderer) {}; /** @@ -28,7 +28,7 @@ _ol_render_VectorContext_.prototype.drawCustom = function(geometry, feature, ren * * @param {ol.geom.Geometry} geometry The geometry to render. */ -_ol_render_VectorContext_.prototype.drawGeometry = function(geometry) {}; +VectorContext.prototype.drawGeometry = function(geometry) {}; /** @@ -36,21 +36,21 @@ _ol_render_VectorContext_.prototype.drawGeometry = function(geometry) {}; * * @param {ol.style.Style} style The rendering style. */ -_ol_render_VectorContext_.prototype.setStyle = function(style) {}; +VectorContext.prototype.setStyle = function(style) {}; /** * @param {ol.geom.Circle} circleGeometry Circle geometry. * @param {ol.Feature} feature Feature. */ -_ol_render_VectorContext_.prototype.drawCircle = function(circleGeometry, feature) {}; +VectorContext.prototype.drawCircle = function(circleGeometry, feature) {}; /** * @param {ol.Feature} feature Feature. * @param {ol.style.Style} style Style. */ -_ol_render_VectorContext_.prototype.drawFeature = function(feature, style) {}; +VectorContext.prototype.drawFeature = function(feature, style) {}; /** @@ -58,7 +58,7 @@ _ol_render_VectorContext_.prototype.drawFeature = function(feature, style) {}; * collection. * @param {ol.Feature} feature Feature. */ -_ol_render_VectorContext_.prototype.drawGeometryCollection = function(geometryCollectionGeometry, feature) {}; +VectorContext.prototype.drawGeometryCollection = function(geometryCollectionGeometry, feature) {}; /** @@ -66,7 +66,7 @@ _ol_render_VectorContext_.prototype.drawGeometryCollection = function(geometryCo * string geometry. * @param {ol.Feature|ol.render.Feature} feature Feature. */ -_ol_render_VectorContext_.prototype.drawLineString = function(lineStringGeometry, feature) {}; +VectorContext.prototype.drawLineString = function(lineStringGeometry, feature) {}; /** @@ -74,7 +74,7 @@ _ol_render_VectorContext_.prototype.drawLineString = function(lineStringGeometry * MultiLineString geometry. * @param {ol.Feature|ol.render.Feature} feature Feature. */ -_ol_render_VectorContext_.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) {}; +VectorContext.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) {}; /** @@ -82,21 +82,21 @@ _ol_render_VectorContext_.prototype.drawMultiLineString = function(multiLineStri * geometry. * @param {ol.Feature|ol.render.Feature} feature Feature. */ -_ol_render_VectorContext_.prototype.drawMultiPoint = function(multiPointGeometry, feature) {}; +VectorContext.prototype.drawMultiPoint = function(multiPointGeometry, feature) {}; /** * @param {ol.geom.MultiPolygon} multiPolygonGeometry MultiPolygon geometry. * @param {ol.Feature|ol.render.Feature} feature Feature. */ -_ol_render_VectorContext_.prototype.drawMultiPolygon = function(multiPolygonGeometry, feature) {}; +VectorContext.prototype.drawMultiPolygon = function(multiPolygonGeometry, feature) {}; /** * @param {ol.geom.Point|ol.render.Feature} pointGeometry Point geometry. * @param {ol.Feature|ol.render.Feature} feature Feature. */ -_ol_render_VectorContext_.prototype.drawPoint = function(pointGeometry, feature) {}; +VectorContext.prototype.drawPoint = function(pointGeometry, feature) {}; /** @@ -104,33 +104,33 @@ _ol_render_VectorContext_.prototype.drawPoint = function(pointGeometry, feature) * geometry. * @param {ol.Feature|ol.render.Feature} feature Feature. */ -_ol_render_VectorContext_.prototype.drawPolygon = function(polygonGeometry, feature) {}; +VectorContext.prototype.drawPolygon = function(polygonGeometry, feature) {}; /** * @param {ol.geom.Geometry|ol.render.Feature} geometry Geometry. * @param {ol.Feature|ol.render.Feature} feature Feature. */ -_ol_render_VectorContext_.prototype.drawText = function(geometry, feature) {}; +VectorContext.prototype.drawText = function(geometry, feature) {}; /** * @param {ol.style.Fill} fillStyle Fill style. * @param {ol.style.Stroke} strokeStyle Stroke style. */ -_ol_render_VectorContext_.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {}; +VectorContext.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {}; /** * @param {ol.style.Image} imageStyle Image style. * @param {ol.DeclutterGroup=} opt_declutterGroup Declutter. */ -_ol_render_VectorContext_.prototype.setImageStyle = function(imageStyle, opt_declutterGroup) {}; +VectorContext.prototype.setImageStyle = function(imageStyle, opt_declutterGroup) {}; /** * @param {ol.style.Text} textStyle Text style. * @param {ol.DeclutterGroup=} opt_declutterGroup Declutter. */ -_ol_render_VectorContext_.prototype.setTextStyle = function(textStyle, opt_declutterGroup) {}; -export default _ol_render_VectorContext_; +VectorContext.prototype.setTextStyle = function(textStyle, opt_declutterGroup) {}; +export default VectorContext; diff --git a/src/ol/render/canvas/Immediate.js b/src/ol/render/canvas/Immediate.js index 2cbcc9d964..6492841c27 100644 --- a/src/ol/render/canvas/Immediate.js +++ b/src/ol/render/canvas/Immediate.js @@ -13,7 +13,7 @@ import GeometryType from '../../geom/GeometryType.js'; import SimpleGeometry from '../../geom/SimpleGeometry.js'; import _ol_geom_flat_transform_ from '../../geom/flat/transform.js'; import _ol_has_ from '../../has.js'; -import _ol_render_VectorContext_ from '../VectorContext.js'; +import VectorContext from '../VectorContext.js'; import _ol_render_canvas_ from '../canvas.js'; import _ol_transform_ from '../../transform.js'; @@ -36,7 +36,7 @@ import _ol_transform_ from '../../transform.js'; * @struct */ var _ol_render_canvas_Immediate_ = function(context, pixelRatio, extent, transform, viewRotation) { - _ol_render_VectorContext_.call(this); + VectorContext.call(this); /** * @private @@ -238,7 +238,7 @@ var _ol_render_canvas_Immediate_ = function(context, pixelRatio, extent, transfo }; -inherits(_ol_render_canvas_Immediate_, _ol_render_VectorContext_); +inherits(_ol_render_canvas_Immediate_, VectorContext); /** diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js index cd4264e15c..c26cb50a9e 100644 --- a/src/ol/render/canvas/Replay.js +++ b/src/ol/render/canvas/Replay.js @@ -14,7 +14,7 @@ import _ol_geom_flat_textpath_ from '../../geom/flat/textpath.js'; import _ol_geom_flat_transform_ from '../../geom/flat/transform.js'; import _ol_has_ from '../../has.js'; import _ol_obj_ from '../../obj.js'; -import _ol_render_VectorContext_ from '../VectorContext.js'; +import VectorContext from '../VectorContext.js'; import _ol_render_canvas_ from '../canvas.js'; import _ol_render_canvas_Instruction_ from '../canvas/Instruction.js'; import _ol_render_replay_ from '../replay.js'; @@ -32,7 +32,7 @@ import _ol_transform_ from '../../transform.js'; * @struct */ var _ol_render_canvas_Replay_ = function(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) { - _ol_render_VectorContext_.call(this); + VectorContext.call(this); /** * @type {?} @@ -168,7 +168,7 @@ var _ol_render_canvas_Replay_ = function(tolerance, maxExtent, resolution, pixel this.resetTransform_ = _ol_transform_.create(); }; -inherits(_ol_render_canvas_Replay_, _ol_render_VectorContext_); +inherits(_ol_render_canvas_Replay_, VectorContext); /** diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js index 5f7fa5006b..8c80efae84 100644 --- a/src/ol/render/webgl/Immediate.js +++ b/src/ol/render/webgl/Immediate.js @@ -5,7 +5,7 @@ import {inherits} from '../../index.js'; import {intersects} from '../../extent.js'; import GeometryType from '../../geom/GeometryType.js'; import ReplayType from '../ReplayType.js'; -import _ol_render_VectorContext_ from '../VectorContext.js'; +import VectorContext from '../VectorContext.js'; import _ol_render_webgl_ReplayGroup_ from '../webgl/ReplayGroup.js'; /** @@ -21,7 +21,7 @@ import _ol_render_webgl_ReplayGroup_ from '../webgl/ReplayGroup.js'; * @struct */ var _ol_render_webgl_Immediate_ = function(context, center, resolution, rotation, size, extent, pixelRatio) { - _ol_render_VectorContext_.call(this); + VectorContext.call(this); /** * @private @@ -84,7 +84,7 @@ var _ol_render_webgl_Immediate_ = function(context, center, resolution, rotation }; -inherits(_ol_render_webgl_Immediate_, _ol_render_VectorContext_); +inherits(_ol_render_webgl_Immediate_, VectorContext); /** diff --git a/src/ol/render/webgl/Replay.js b/src/ol/render/webgl/Replay.js index 33fdbd83e3..2f985a925a 100644 --- a/src/ol/render/webgl/Replay.js +++ b/src/ol/render/webgl/Replay.js @@ -3,7 +3,7 @@ */ import {inherits} from '../../index.js'; import {getCenter} from '../../extent.js'; -import _ol_render_VectorContext_ from '../VectorContext.js'; +import VectorContext from '../VectorContext.js'; import _ol_transform_ from '../../transform.js'; import {create, fromTransform} from '../../vec/mat4.js'; import _ol_webgl_ from '../../webgl.js'; @@ -17,7 +17,7 @@ import _ol_webgl_ from '../../webgl.js'; * @struct */ var _ol_render_webgl_Replay_ = function(tolerance, maxExtent) { - _ol_render_VectorContext_.call(this); + VectorContext.call(this); /** * @protected @@ -113,7 +113,7 @@ var _ol_render_webgl_Replay_ = function(tolerance, maxExtent) { }; -inherits(_ol_render_webgl_Replay_, _ol_render_VectorContext_); +inherits(_ol_render_webgl_Replay_, VectorContext); /** diff --git a/test/rendering/ol/render.test.js b/test/rendering/ol/render.test.js index b8d84ca5f8..8469c168a5 100644 --- a/test/rendering/ol/render.test.js +++ b/test/rendering/ol/render.test.js @@ -2,7 +2,7 @@ import LineString from '../../../src/ol/geom/LineString.js'; import Point from '../../../src/ol/geom/Point.js'; import Polygon from '../../../src/ol/geom/Polygon.js'; import _ol_render_ from '../../../src/ol/render.js'; -import _ol_render_VectorContext_ from '../../../src/ol/render/VectorContext.js'; +import VectorContext from '../../../src/ol/render/VectorContext.js'; import _ol_render_canvas_Immediate_ from '../../../src/ol/render/canvas/Immediate.js'; import _ol_style_Circle_ from '../../../src/ol/style/Circle.js'; import _ol_style_Fill_ from '../../../src/ol/style/Fill.js'; @@ -22,7 +22,7 @@ describe('ol.render', function() { pixelRatio: 1, size: [100, 100] }); - expect(vectorContext).to.be.a(_ol_render_VectorContext_); + expect(vectorContext).to.be.a(VectorContext); expect(vectorContext).to.be.a(_ol_render_canvas_Immediate_); }); diff --git a/test/spec/ol/render/canvas/immediate.test.js b/test/spec/ol/render/canvas/immediate.test.js index 84c6674524..f4a321e5d0 100644 --- a/test/spec/ol/render/canvas/immediate.test.js +++ b/test/spec/ol/render/canvas/immediate.test.js @@ -6,7 +6,7 @@ import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js'; import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js'; import Point from '../../../../../src/ol/geom/Point.js'; import Polygon from '../../../../../src/ol/geom/Polygon.js'; -import _ol_render_VectorContext_ from '../../../../../src/ol/render/VectorContext.js'; +import VectorContext from '../../../../../src/ol/render/VectorContext.js'; import _ol_render_canvas_Immediate_ from '../../../../../src/ol/render/canvas/Immediate.js'; import _ol_style_Circle_ from '../../../../../src/ol/style/Circle.js'; import _ol_style_Fill_ from '../../../../../src/ol/style/Fill.js'; @@ -32,7 +32,7 @@ describe('ol.render.canvas.Immediate', function() { it('creates an instance', function() { var instance = new _ol_render_canvas_Immediate_(); expect(instance).to.be.a(_ol_render_canvas_Immediate_); - expect(instance).to.be.a(_ol_render_VectorContext_); + expect(instance).to.be.a(VectorContext); }); });