diff --git a/examples/earthquake-custom-symbol.js b/examples/earthquake-custom-symbol.js index 4bfbf58736..5d2ae04bdd 100644 --- a/examples/earthquake-custom-symbol.js +++ b/examples/earthquake-custom-symbol.js @@ -4,7 +4,7 @@ import KML from '../src/ol/format/KML.js'; import Polygon from '../src/ol/geom/Polygon.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import _ol_render_ from '../src/ol/render.js'; +import {toContext} from '../src/ol/render.js'; import Stamen from '../src/ol/source/Stamen.js'; import VectorSource from '../src/ol/source/Vector.js'; import Fill from '../src/ol/style/Fill.js'; @@ -32,7 +32,7 @@ const styleFunction = function(feature) { if (!style) { const canvas = /** @type {HTMLCanvasElement} */ (document.createElement('canvas')); - const vectorContext = _ol_render_.toContext( + const vectorContext = toContext( /** @type {CanvasRenderingContext2D} */ (canvas.getContext('2d')), {size: [size, size], pixelRatio: 1}); vectorContext.setStyle(new Style({ diff --git a/examples/render-geometry.js b/examples/render-geometry.js index 97f6d5a70d..d165de09f7 100644 --- a/examples/render-geometry.js +++ b/examples/render-geometry.js @@ -1,7 +1,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 {toContext} from '../src/ol/render.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; @@ -9,7 +9,7 @@ import Style from '../src/ol/style/Style.js'; const canvas = document.getElementById('canvas'); -const vectorContext = _ol_render_.toContext(canvas.getContext('2d'), {size: [100, 100]}); +const vectorContext = toContext(canvas.getContext('2d'), {size: [100, 100]}); const fill = new Fill({color: 'blue'}); const stroke = new Stroke({color: 'black'}); diff --git a/src/ol/render.js b/src/ol/render.js index b32ac483ef..40a997821d 100644 --- a/src/ol/render.js +++ b/src/ol/render.js @@ -4,7 +4,6 @@ import _ol_has_ from './has.js'; import _ol_transform_ from './transform.js'; import CanvasImmediateRenderer from './render/canvas/Immediate.js'; -const _ol_render_ = {}; /** @@ -27,7 +26,7 @@ const _ol_render_ = {}; * @return {ol.render.canvas.Immediate} Canvas Immediate. * @api */ -_ol_render_.toContext = function(context, opt_options) { +export function toContext(context, opt_options) { const canvas = context.canvas; const options = opt_options ? opt_options : {}; const pixelRatio = options.pixelRatio || _ol_has_.DEVICE_PIXEL_RATIO; @@ -40,7 +39,5 @@ _ol_render_.toContext = function(context, opt_options) { } const extent = [0, 0, canvas.width, canvas.height]; const transform = _ol_transform_.scale(_ol_transform_.create(), pixelRatio, pixelRatio); - return new CanvasImmediateRenderer(context, pixelRatio, extent, transform, - 0); -}; -export default _ol_render_; + return new CanvasImmediateRenderer(context, pixelRatio, extent, transform, 0); +} diff --git a/test/rendering/ol/render.test.js b/test/rendering/ol/render.test.js index eadba2ebf6..6a516ec91e 100644 --- a/test/rendering/ol/render.test.js +++ b/test/rendering/ol/render.test.js @@ -1,7 +1,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 {toContext} from '../../../src/ol/render.js'; import VectorContext from '../../../src/ol/render/VectorContext.js'; import CanvasImmediateRenderer from '../../../src/ol/render/canvas/Immediate.js'; import CircleStyle from '../../../src/ol/style/Circle.js'; @@ -18,7 +18,7 @@ describe('ol.render', function() { describe('ol.render.toContext()', function() { it('creates a vector context from a Canvas 2d context', function() { - const vectorContext = _ol_render_.toContext(getContext(), { + const vectorContext = toContext(getContext(), { pixelRatio: 1, size: [100, 100] }); @@ -28,7 +28,7 @@ describe('ol.render', function() { it('can be used to render a point geometry', function(done) { const context = getContext(); - const vectorContext = _ol_render_.toContext(context, { + const vectorContext = toContext(context, { pixelRatio: 1, size: [100, 100] }); @@ -52,7 +52,7 @@ describe('ol.render', function() { it('can be used to render a linestring geometry', function(done) { const context = getContext(); - const vectorContext = _ol_render_.toContext(context, { + const vectorContext = toContext(context, { pixelRatio: 1, size: [100, 100] }); @@ -76,7 +76,7 @@ describe('ol.render', function() { it('respects lineCap for linestring', function(done) { const context = getContext(); - const vectorContext = _ol_render_.toContext(context, { + const vectorContext = toContext(context, { pixelRatio: 1, size: [100, 100] }); @@ -101,7 +101,7 @@ describe('ol.render', function() { it('respects lineJoin for linestring', function(done) { const context = getContext(); - const vectorContext = _ol_render_.toContext(context, { + const vectorContext = toContext(context, { pixelRatio: 1, size: [100, 100] }); @@ -126,7 +126,7 @@ describe('ol.render', function() { it('can be used to render a polygon geometry', function(done) { const context = getContext(); - const vectorContext = _ol_render_.toContext(context, { + const vectorContext = toContext(context, { pixelRatio: 1, size: [100, 100] }); @@ -155,7 +155,7 @@ describe('ol.render', function() { it('supports lineDash styles', function(done) { const context = getContext(); - const vectorContext = _ol_render_.toContext(context, { + const vectorContext = toContext(context, { pixelRatio: 1, size: [100, 100] }); @@ -180,7 +180,7 @@ describe('ol.render', function() { it('supports lineDashOffset', function(done) { const context = getContext(); - const vectorContext = _ol_render_.toContext(context, { + const vectorContext = toContext(context, { pixelRatio: 1, size: [100, 100] }); diff --git a/test/spec/ol/render.test.js b/test/spec/ol/render.test.js index 718cc5ed1e..991d722f84 100644 --- a/test/spec/ol/render.test.js +++ b/test/spec/ol/render.test.js @@ -1,6 +1,6 @@ import {equals} from '../../../src/ol/array.js'; import _ol_has_ from '../../../src/ol/has.js'; -import _ol_render_ from '../../../src/ol/render.js'; +import {toContext} from '../../../src/ol/render.js'; import CanvasImmediateRenderer from '../../../src/ol/render/canvas/Immediate.js'; import _ol_transform_ from '../../../src/ol/transform.js'; @@ -11,7 +11,7 @@ describe('ol.render', function() { it('creates an ol.render.canvas.Immediate and sets defaults', function() { const canvas = document.createElement('canvas'); - const render = _ol_render_.toContext(canvas.getContext('2d')); + const render = toContext(canvas.getContext('2d')); expect(render).to.be.a(CanvasImmediateRenderer); expect(render.pixelRatio_).to.be(_ol_has_.DEVICE_PIXEL_RATIO); }); @@ -20,7 +20,7 @@ describe('ol.render', function() { const canvas = document.createElement('canvas'); const pixelRatio = 1.5; const size = [100, 50]; - const render = _ol_render_.toContext(canvas.getContext('2d'), + const render = toContext(canvas.getContext('2d'), {pixelRatio: pixelRatio, size: size}); expect(render.pixelRatio_).to.be(pixelRatio); expect(render.extent_).to.eql(