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

Merge pull request #7705 from fredj/rename

Browse Source 
More renaming
This commit is contained in:
Frédéric Junod
2018-01-15 14:49:25 +01:00
committed by GitHub
parent d8a2a393fc 106fe3c138
commit c7570d052c
44 changed files with 528 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/format/wmtscapabilities.test.js
+3 -3
View File
@@ -1,11 +1,11 @@
import _ol_format_WMTSCapabilities_ from '../../../../src/ol/format/WMTSCapabilities.js';
import WMTSCapabilities from '../../../../src/ol/format/WMTSCapabilities.js';
describe('ol.format.WMTSCapabilities', function() {
describe('when parsing ogcsample.xml', function() {
const parser = new _ol_format_WMTSCapabilities_();
const parser = new WMTSCapabilities();
let capabilities;
before(function(done) {
afterLoadText('spec/ol/format/wmts/ogcsample.xml', function(xml) {
@@ -116,7 +116,7 @@ describe('ol.format.WMTSCapabilities', function() {
describe('when parsing ign.xml', function() {
const parser = new _ol_format_WMTSCapabilities_();
const parser = new WMTSCapabilities();
let capabilities;
before(function(done) {
afterLoadText('spec/ol/format/wmts/ign.xml', function(xml) {
test/spec/ol/interaction/translate.test.js
+9 -9
View File
@@ -4,7 +4,7 @@ import Map from '../../../../src/ol/Map.js';
import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
import View from '../../../../src/ol/View.js';
import Point from '../../../../src/ol/geom/Point.js';
import _ol_interaction_Translate_ from '../../../../src/ol/interaction/Translate.js';
import Translate from '../../../../src/ol/interaction/Translate.js';
import Interaction from '../../../../src/ol/interaction/Interaction.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import PointerEvent from '../../../../src/ol/pointer/PointerEvent.js';
@@ -109,11 +109,11 @@ describe('ol.interaction.Translate', function() {
const endevent = events[events.length - 1];
// first event should be translatestart
expect(startevent).to.be.an(_ol_interaction_Translate_.Event);
expect(startevent).to.be.an(Translate.Event);
expect(startevent.type).to.eql('translatestart');
// last event should be translateend
expect(endevent).to.be.an(_ol_interaction_Translate_.Event);
expect(endevent).to.be.an(Translate.Event);
expect(endevent.type).to.eql('translateend');
// make sure we get change events to events array
@@ -132,10 +132,10 @@ describe('ol.interaction.Translate', function() {
describe('constructor', function() {
it('creates a new interaction', function() {
const translate = new _ol_interaction_Translate_({
const translate = new Translate({
features: features
});
expect(translate).to.be.a(_ol_interaction_Translate_);
expect(translate).to.be.a(Translate);
expect(translate).to.be.a(Interaction);
});
@@ -144,7 +144,7 @@ describe('ol.interaction.Translate', function() {
describe('setActive', function() {
it('works when the map is not set', function() {
const translate = new _ol_interaction_Translate_({
const translate = new Translate({
features: features
});
expect(translate.getActive()).to.be(true);
@@ -158,7 +158,7 @@ describe('ol.interaction.Translate', function() {
let translate;
beforeEach(function() {
translate = new _ol_interaction_Translate_({
translate = new Translate({
features: new Collection([features[0]])
});
map.addInteraction(translate);
@@ -197,7 +197,7 @@ describe('ol.interaction.Translate', function() {
let translate;
beforeEach(function() {
translate = new _ol_interaction_Translate_();
translate = new Translate();
map.addInteraction(translate);
});
@@ -219,7 +219,7 @@ describe('ol.interaction.Translate', function() {
let element, translate;
beforeEach(function() {
translate = new _ol_interaction_Translate_();
translate = new Translate();
map.addInteraction(translate);
element = map.getViewport();
});
test/spec/ol/render/canvas/replaygroup.test.js
+2 -2
View File
@@ -1,4 +1,4 @@
import _ol_render_canvas_ReplayGroup_ from '../../../../../src/ol/render/canvas/ReplayGroup.js';
import CanvasReplayGroup from '../../../../../src/ol/render/canvas/ReplayGroup.js';
describe('ol.render.canvas.ReplayGroup', function() {
@@ -8,7 +8,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
const radius = 10;
const minRadiusSq = Math.pow(radius - Math.SQRT2, 2);
const maxRadiusSq = Math.pow(radius + Math.SQRT2, 2);
const circleArray = _ol_render_canvas_ReplayGroup_.getCircleArray_(radius);
const circleArray = CanvasReplayGroup.getCircleArray_(radius);
const size = radius * 2 + 1;
expect(circleArray.length).to.be(size);
test/spec/ol/render/canvas/textreplay.test.js
+3 -3
View File
@@ -1,13 +1,13 @@
import Feature from '../../../../../src/ol/Feature.js';
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import Polygon from '../../../../../src/ol/geom/Polygon.js';
import _ol_render_canvas_TextReplay_ from '../../../../../src/ol/render/canvas/TextReplay.js';
import CanvasTextReplay from '../../../../../src/ol/render/canvas/TextReplay.js';
import Text from '../../../../../src/ol/style/Text.js';
describe('ol.render.canvas.TextReplay', function() {
it('renders polygon labels only when they fit', function() {
const replay = new _ol_render_canvas_TextReplay_(1, [-180, -90, 180, 90], 0.02, 1, true);
const replay = new CanvasTextReplay(1, [-180, -90, 180, 90], 0.02, 1, true);
const geometry = new Polygon([[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]);
const feature = new Feature(geometry);
@@ -25,7 +25,7 @@ describe('ol.render.canvas.TextReplay', function() {
});
it('renders multipolygon labels only when they fit', function() {
const replay = new _ol_render_canvas_TextReplay_(1, [-180, -90, 180, 90], 0.02, 1, true);
const replay = new CanvasTextReplay(1, [-180, -90, 180, 90], 0.02, 1, true);
const geometry = new MultiPolygon([
[[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]],
[[[1, 1], [1, 2], [2, 2], [2, 1], [1, 1]]]
test/spec/ol/render/webgl/circlereplay.test.js
+2 -2
View File
@@ -1,7 +1,7 @@
import {getUid} from '../../../../../src/ol/index.js';
import Feature from '../../../../../src/ol/Feature.js';
import Circle from '../../../../../src/ol/geom/Circle.js';
import _ol_render_webgl_CircleReplay_ from '../../../../../src/ol/render/webgl/CircleReplay.js';
import WebGLCircleReplay from '../../../../../src/ol/render/webgl/CircleReplay.js';
import _ol_render_webgl_circlereplay_defaultshader_ from '../../../../../src/ol/render/webgl/circlereplay/defaultshader.js';
import _ol_render_webgl_circlereplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/circlereplay/defaultshader/Locations.js';
import Fill from '../../../../../src/ol/style/Fill.js';
@@ -21,7 +21,7 @@ describe('ol.render.webgl.CircleReplay', function() {
beforeEach(function() {
const tolerance = 0.1;
const maxExtent = [-10000, -20000, 10000, 20000];
replay = new _ol_render_webgl_CircleReplay_(tolerance, maxExtent);
replay = new WebGLCircleReplay(tolerance, maxExtent);
});
describe('#setFillStrokeStyle', function() {
test/spec/ol/render/webgl/imagereplay.test.js
+2 -2
View File
@@ -1,6 +1,6 @@
import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js';
import Point from '../../../../../src/ol/geom/Point.js';
import _ol_render_webgl_ImageReplay_ from '../../../../../src/ol/render/webgl/ImageReplay.js';
import WebGLImageReplay from '../../../../../src/ol/render/webgl/ImageReplay.js';
import ImageStyle from '../../../../../src/ol/style/Image.js';
describe('ol.render.webgl.ImageReplay', function() {
@@ -40,7 +40,7 @@ describe('ol.render.webgl.ImageReplay', function() {
beforeEach(function() {
const tolerance = 0.1;
const maxExtent = [-10000, -20000, 10000, 20000];
replay = new _ol_render_webgl_ImageReplay_(tolerance, maxExtent);
replay = new WebGLImageReplay(tolerance, maxExtent);
});
describe('#setImageStyle', function() {
test/spec/ol/render/webgl/immediate.test.js
+54 -54
View File
@@ -7,11 +7,11 @@ 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_webgl_CircleReplay_ from '../../../../../src/ol/render/webgl/CircleReplay.js';
import _ol_render_webgl_ImageReplay_ from '../../../../../src/ol/render/webgl/ImageReplay.js';
import WebGLCircleReplay from '../../../../../src/ol/render/webgl/CircleReplay.js';
import WebGLImageReplay from '../../../../../src/ol/render/webgl/ImageReplay.js';
import _ol_render_webgl_Immediate_ from '../../../../../src/ol/render/webgl/Immediate.js';
import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/webgl/LineStringReplay.js';
import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/PolygonReplay.js';
import WebGLLineStringReplay from '../../../../../src/ol/render/webgl/LineStringReplay.js';
import WebGLPolygonReplay from '../../../../../src/ol/render/webgl/PolygonReplay.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';
@@ -111,7 +111,7 @@ describe('ol.render.webgl.Immediate', function() {
return function() {};
});
sinon.spy(ctor.prototype.getDeleteResourcesFunction);
if (ctor === _ol_render_webgl_ImageReplay_) {
if (ctor === WebGLImageReplay) {
tmpObj.setImageStyle = ctor.prototype.setImageStyle;
ctor.prototype.setImageStyle = sinon.spy();
} else {
@@ -132,140 +132,140 @@ describe('ol.render.webgl.Immediate', function() {
describe('#drawPoint', function() {
let tmpObj;
beforeEach(function() {
tmpObj = mock(_ol_render_webgl_ImageReplay_, 'drawPoint');
tmpObj = mock(WebGLImageReplay, 'drawPoint');
});
it('draws a point', function() {
context.drawGeometry(point);
expect(_ol_render_webgl_ImageReplay_.prototype.setImageStyle.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.drawPoint.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.finish.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.replay.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.setImageStyle.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.drawPoint.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.finish.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.replay.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
});
after(function() {
restore(_ol_render_webgl_ImageReplay_, tmpObj);
restore(WebGLImageReplay, tmpObj);
});
});
describe('#drawMultiPoint', function() {
let tmpObj;
beforeEach(function() {
tmpObj = mock(_ol_render_webgl_ImageReplay_, 'drawMultiPoint');
tmpObj = mock(WebGLImageReplay, 'drawMultiPoint');
});
it('draws a multi point', function() {
context.drawGeometry(multiPoint);
expect(_ol_render_webgl_ImageReplay_.prototype.setImageStyle.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.drawMultiPoint.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.finish.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.replay.calledOnce).to.be(true);
expect(_ol_render_webgl_ImageReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.setImageStyle.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.drawMultiPoint.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.finish.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.replay.calledOnce).to.be(true);
expect(WebGLImageReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
});
after(function() {
restore(_ol_render_webgl_ImageReplay_, tmpObj);
restore(WebGLImageReplay, tmpObj);
});
});
describe('#drawLineString', function() {
let tmpObj;
beforeEach(function() {
tmpObj = mock(_ol_render_webgl_LineStringReplay_, 'drawLineString');
tmpObj = mock(WebGLLineStringReplay, 'drawLineString');
});
it('draws a line string', function() {
context.drawGeometry(line);
expect(_ol_render_webgl_LineStringReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(_ol_render_webgl_LineStringReplay_.prototype.drawLineString.calledOnce).to.be(true);
expect(_ol_render_webgl_LineStringReplay_.prototype.finish.calledOnce).to.be(true);
expect(_ol_render_webgl_LineStringReplay_.prototype.replay.calledOnce).to.be(true);
expect(_ol_render_webgl_LineStringReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.drawLineString.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.finish.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.replay.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
});
after(function() {
restore(_ol_render_webgl_LineStringReplay_, tmpObj);
restore(WebGLLineStringReplay, tmpObj);
});
});
describe('#drawMultiLineString', function() {
let tmpObj;
beforeEach(function() {
tmpObj = mock(_ol_render_webgl_LineStringReplay_, 'drawMultiLineString');
tmpObj = mock(WebGLLineStringReplay, 'drawMultiLineString');
});
it('draws a multi line string', function() {
context.drawGeometry(multiLine);
expect(_ol_render_webgl_LineStringReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(_ol_render_webgl_LineStringReplay_.prototype.drawMultiLineString.calledOnce).to.be(true);
expect(_ol_render_webgl_LineStringReplay_.prototype.finish.calledOnce).to.be(true);
expect(_ol_render_webgl_LineStringReplay_.prototype.replay.calledOnce).to.be(true);
expect(_ol_render_webgl_LineStringReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.drawMultiLineString.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.finish.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.replay.calledOnce).to.be(true);
expect(WebGLLineStringReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
});
after(function() {
restore(_ol_render_webgl_LineStringReplay_, tmpObj);
restore(WebGLLineStringReplay, tmpObj);
});
});
describe('#drawPolygon', function() {
let tmpObj;
beforeEach(function() {
tmpObj = mock(_ol_render_webgl_PolygonReplay_, 'drawPolygon');
tmpObj = mock(WebGLPolygonReplay, 'drawPolygon');
});
it('draws a polygon', function() {
context.drawGeometry(polygon);
expect(_ol_render_webgl_PolygonReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(_ol_render_webgl_PolygonReplay_.prototype.drawPolygon.calledOnce).to.be(true);
expect(_ol_render_webgl_PolygonReplay_.prototype.finish.calledOnce).to.be(true);
expect(_ol_render_webgl_PolygonReplay_.prototype.replay.calledOnce).to.be(true);
expect(_ol_render_webgl_PolygonReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.drawPolygon.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.finish.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.replay.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
});
after(function() {
restore(_ol_render_webgl_PolygonReplay_, tmpObj);
restore(WebGLPolygonReplay, tmpObj);
});
});
describe('#drawMultiPolygon', function() {
let tmpObj;
beforeEach(function() {
tmpObj = mock(_ol_render_webgl_PolygonReplay_, 'drawMultiPolygon');
tmpObj = mock(WebGLPolygonReplay, 'drawMultiPolygon');
});
it('draws a multi polygon', function() {
context.drawGeometry(multiPolygon);
expect(_ol_render_webgl_PolygonReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(_ol_render_webgl_PolygonReplay_.prototype.drawMultiPolygon.calledOnce).to.be(true);
expect(_ol_render_webgl_PolygonReplay_.prototype.finish.calledOnce).to.be(true);
expect(_ol_render_webgl_PolygonReplay_.prototype.replay.calledOnce).to.be(true);
expect(_ol_render_webgl_PolygonReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.drawMultiPolygon.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.finish.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.replay.calledOnce).to.be(true);
expect(WebGLPolygonReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
});
after(function() {
restore(_ol_render_webgl_PolygonReplay_, tmpObj);
restore(WebGLPolygonReplay, tmpObj);
});
});
describe('#drawCircle', function() {
let tmpObj;
beforeEach(function() {
tmpObj = mock(_ol_render_webgl_CircleReplay_, 'drawCircle');
tmpObj = mock(WebGLCircleReplay, 'drawCircle');
});
it('draws a circle', function() {
context.drawGeometry(circle);
expect(_ol_render_webgl_CircleReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(_ol_render_webgl_CircleReplay_.prototype.drawCircle.calledOnce).to.be(true);
expect(_ol_render_webgl_CircleReplay_.prototype.finish.calledOnce).to.be(true);
expect(_ol_render_webgl_CircleReplay_.prototype.replay.calledOnce).to.be(true);
expect(_ol_render_webgl_CircleReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
expect(WebGLCircleReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
expect(WebGLCircleReplay.prototype.drawCircle.calledOnce).to.be(true);
expect(WebGLCircleReplay.prototype.finish.calledOnce).to.be(true);
expect(WebGLCircleReplay.prototype.replay.calledOnce).to.be(true);
expect(WebGLCircleReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
});
after(function() {
restore(_ol_render_webgl_CircleReplay_, tmpObj);
restore(WebGLCircleReplay, tmpObj);
});
});
});
test/spec/ol/render/webgl/index.test.js
+2 -2
View File
@@ -1,9 +1,9 @@
import _ol_render_webgl_Replay_ from '../../../../../src/ol/render/webgl/Replay.js';
import WebGLReplay from '../../../../../src/ol/render/webgl/Replay.js';
describe('ol.render.Replay', function() {
let replay;
beforeEach(function() {
replay = new _ol_render_webgl_Replay_(5, [-180, -90, 180, 90]);
replay = new WebGLReplay(5, [-180, -90, 180, 90]);
});
test/spec/ol/render/webgl/linestringreplay.test.js
+2 -2
View File
@@ -2,7 +2,7 @@ import {getUid} from '../../../../../src/ol/index.js';
import Feature from '../../../../../src/ol/Feature.js';
import LineString from '../../../../../src/ol/geom/LineString.js';
import MultiLineString from '../../../../../src/ol/geom/MultiLineString.js';
import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/webgl/LineStringReplay.js';
import WebGLLineStringReplay from '../../../../../src/ol/render/webgl/LineStringReplay.js';
import _ol_render_webgl_linestringreplay_defaultshader_ from '../../../../../src/ol/render/webgl/linestringreplay/defaultshader.js';
import _ol_render_webgl_linestringreplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/linestringreplay/defaultshader/Locations.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
@@ -23,7 +23,7 @@ describe('ol.render.webgl.LineStringReplay', function() {
beforeEach(function() {
const tolerance = 0.1;
const maxExtent = [-10000, -20000, 10000, 20000];
replay = new _ol_render_webgl_LineStringReplay_(tolerance, maxExtent);
replay = new WebGLLineStringReplay(tolerance, maxExtent);
});
describe('#setFillStrokeStyle', function() {
test/spec/ol/render/webgl/polygonreplay.test.js
+2 -2
View File
@@ -2,7 +2,7 @@ import {getUid} from '../../../../../src/ol/index.js';
import Feature from '../../../../../src/ol/Feature.js';
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import Polygon from '../../../../../src/ol/geom/Polygon.js';
import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/PolygonReplay.js';
import WebGLPolygonReplay from '../../../../../src/ol/render/webgl/PolygonReplay.js';
import _ol_render_webgl_polygonreplay_defaultshader_ from '../../../../../src/ol/render/webgl/polygonreplay/defaultshader.js';
import _ol_render_webgl_polygonreplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/polygonreplay/defaultshader/Locations.js';
import LinkedList from '../../../../../src/ol/structs/LinkedList.js';
@@ -23,7 +23,7 @@ describe('ol.render.webgl.PolygonReplay', function() {
beforeEach(function() {
const tolerance = 0.1;
const maxExtent = [-10000, -20000, 10000, 20000];
replay = new _ol_render_webgl_PolygonReplay_(tolerance, maxExtent);
replay = new WebGLPolygonReplay(tolerance, maxExtent);
});
describe('#drawPolygon', function() {
test/spec/ol/render/webgl/textreplay.test.js
+2 -2
View File
@@ -1,6 +1,6 @@
import {createCanvasContext2D} from '../../../../../src/ol/dom.js';
import Point from '../../../../../src/ol/geom/Point.js';
import _ol_render_webgl_TextReplay_ from '../../../../../src/ol/render/webgl/TextReplay.js';
import WebGLTextReplay from '../../../../../src/ol/render/webgl/TextReplay.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
import Text from '../../../../../src/ol/style/Text.js';
@@ -28,7 +28,7 @@ describe('ol.render.webgl.TextReplay', function() {
beforeEach(function() {
const tolerance = 0.1;
const maxExtent = [-10000, -20000, 10000, 20000];
replay = new _ol_render_webgl_TextReplay_(tolerance, maxExtent);
replay = new WebGLTextReplay(tolerance, maxExtent);
});
describe('#setTextStyle', function() {
test/spec/ol/render/webgl/texturereplay.test.js
+2 -2
View File
@@ -1,4 +1,4 @@
import _ol_render_webgl_TextureReplay_ from '../../../../../src/ol/render/webgl/TextureReplay.js';
import WebGLTextureReplay from '../../../../../src/ol/render/webgl/TextureReplay.js';
import _ol_render_webgl_texturereplay_defaultshader_ from '../../../../../src/ol/render/webgl/texturereplay/defaultshader.js';
import _ol_render_webgl_texturereplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/texturereplay/defaultshader/Locations.js';
@@ -8,7 +8,7 @@ describe('ol.render.webgl.TextureReplay', function() {
beforeEach(function() {
const tolerance = 0.1;
const maxExtent = [-10000, -20000, 10000, 20000];
replay = new _ol_render_webgl_TextureReplay_(tolerance, maxExtent);
replay = new WebGLTextureReplay(tolerance, maxExtent);
});
describe('#setUpProgram', function() {
test/spec/ol/renderer/canvas/replay.test.js
+13 -13
View File
@@ -7,10 +7,10 @@ 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_canvas_LineStringReplay_ from '../../../../../src/ol/render/canvas/LineStringReplay.js';
import _ol_render_canvas_PolygonReplay_ from '../../../../../src/ol/render/canvas/PolygonReplay.js';
import _ol_render_canvas_Replay_ from '../../../../../src/ol/render/canvas/Replay.js';
import _ol_render_canvas_ReplayGroup_ from '../../../../../src/ol/render/canvas/ReplayGroup.js';
import CanvasLineStringReplay from '../../../../../src/ol/render/canvas/LineStringReplay.js';
import CanvasPolygonReplay from '../../../../../src/ol/render/canvas/PolygonReplay.js';
import CanvasReplay from '../../../../../src/ol/render/canvas/Replay.js';
import CanvasReplayGroup from '../../../../../src/ol/render/canvas/ReplayGroup.js';
import _ol_renderer_vector_ from '../../../../../src/ol/renderer/vector.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
@@ -28,7 +28,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
beforeEach(function() {
transform = _ol_transform_.create();
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, false);
replay = new CanvasReplayGroup(1, [-180, -90, 180, 90], 1, 1, false);
feature0 = new Feature(new Polygon(
[[[-90, 0], [-45, 45], [0, 0], [1, 1], [0, -45], [-90, 0]]]));
feature1 = new Feature(new Polygon(
@@ -172,7 +172,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('does not batch when overlaps is set to true', function() {
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, true);
replay = new CanvasReplayGroup(1, [-180, -90, 180, 90], 1, 1, true);
_ol_renderer_vector_.renderFeature(replay, feature1, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature2, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style1, 1);
@@ -184,7 +184,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
it('applies the pixelRatio to the linedash array and offset', function() {
// replay with a pixelRatio of 2
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 2, true);
replay = new CanvasReplayGroup(1, [-180, -90, 180, 90], 1, 2, true);
let lineDash, lineDashCount = 0,
lineDashOffset, lineDashOffsetCount = 0;
@@ -241,7 +241,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
[polygon.getGeometry().getCoordinates(), polygon.getGeometry().getCoordinates()]));
const geometrycollection = new Feature(new GeometryCollection(
[point.getGeometry(), linestring.getGeometry(), polygon.getGeometry()]));
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, true);
replay = new CanvasReplayGroup(1, [-180, -90, 180, 90], 1, 1, true);
_ol_renderer_vector_.renderFeature(replay, point, style, 1);
_ol_renderer_vector_.renderFeature(replay, multipoint, style, 1);
_ol_renderer_vector_.renderFeature(replay, linestring, style, 1);
@@ -285,8 +285,8 @@ describe('ol.render.canvas.Replay', function() {
it('creates a new replay batch', function() {
const tolerance = 10;
const extent = [-180, -90, 180, 90];
const replay = new _ol_render_canvas_Replay_(tolerance, extent, 1, 1, true);
expect(replay).to.be.a(_ol_render_canvas_Replay_);
const replay = new CanvasReplay(tolerance, extent, 1, 1, true);
expect(replay).to.be.a(CanvasReplay);
});
});
@@ -295,7 +295,7 @@ describe('ol.render.canvas.Replay', function() {
let replay;
beforeEach(function() {
replay = new _ol_render_canvas_Replay_(1, [-180, -90, 180, 90], 1, 1, true);
replay = new CanvasReplay(1, [-180, -90, 180, 90], 1, 1, true);
});
it('appends coordinates that are within the max extent', function() {
@@ -446,7 +446,7 @@ describe('ol.render.canvas.LineStringReplay', function() {
const tolerance = 1;
const extent = [-180, -90, 180, 90];
const resolution = 10;
const replay = new _ol_render_canvas_LineStringReplay_(tolerance, extent,
const replay = new CanvasLineStringReplay(tolerance, extent,
resolution);
const stroke = new Stroke({
width: 2
@@ -468,7 +468,7 @@ describe('ol.render.canvas.PolygonReplay', function() {
const tolerance = 1;
const extent = [-180, -90, 180, 90];
const resolution = 10;
replay = new _ol_render_canvas_PolygonReplay_(tolerance, extent,
replay = new CanvasPolygonReplay(tolerance, extent,
resolution);
});
test/spec/ol/renderer/vector.test.js
+2 -2
View File
@@ -6,7 +6,7 @@ import Polygon from '../../../../src/ol/geom/Polygon.js';
import MultiLineString from '../../../../src/ol/geom/MultiLineString.js';
import MultiPoint from '../../../../src/ol/geom/MultiPoint.js';
import MultiPolygon from '../../../../src/ol/geom/MultiPolygon.js';
import _ol_render_canvas_ReplayGroup_ from '../../../../src/ol/render/canvas/ReplayGroup.js';
import CanvasReplayGroup from '../../../../src/ol/render/canvas/ReplayGroup.js';
import _ol_renderer_vector_ from '../../../../src/ol/renderer/vector.js';
import Fill from '../../../../src/ol/style/Fill.js';
import Icon from '../../../../src/ol/style/Icon.js';
@@ -22,7 +22,7 @@ describe('ol.renderer.vector', function() {
let iconStyleLoadSpy;
beforeEach(function() {
replayGroup = new _ol_render_canvas_ReplayGroup_(1);
replayGroup = new CanvasReplayGroup(1);
feature = new Feature();
iconStyle = new Icon({
src: 'http://example.com/icon.png'
test/spec/ol/source/wmts.test.js
+3 -3
View File
@@ -1,4 +1,4 @@
import _ol_format_WMTSCapabilities_ from '../../../../src/ol/format/WMTSCapabilities.js';
import WMTSCapabilities from '../../../../src/ol/format/WMTSCapabilities.js';
import {get as getProjection} from '../../../../src/ol/proj.js';
import Projection from '../../../../src/ol/proj/Projection.js';
import WMTSTileGrid from '../../../../src/ol/tilegrid/WMTS.js';
@@ -8,7 +8,7 @@ import WMTS from '../../../../src/ol/source/WMTS.js';
describe('ol.source.WMTS', function() {
describe('when creating options from capabilities', function() {
const parser = new _ol_format_WMTSCapabilities_();
const parser = new WMTSCapabilities();
let capabilities, content;
before(function(done) {
afterLoadText('spec/ol/format/wmts/ogcsample.xml', function(xml) {
@@ -232,7 +232,7 @@ describe('ol.source.WMTS', function() {
});
describe('when creating options from Esri capabilities', function() {
const parser = new _ol_format_WMTSCapabilities_();
const parser = new WMTSCapabilities();
let capabilities;
before(function(done) {
afterLoadText('spec/ol/format/wmts/arcgis.xml', function(xml) {
test/spec/ol/tilegrid/wmts.test.js
+3 -3
View File
@@ -1,11 +1,11 @@
import _ol_format_WMTSCapabilities_ from '../../../../src/ol/format/WMTSCapabilities.js';
import WMTSCapabilities from '../../../../src/ol/format/WMTSCapabilities.js';
import {createFromCapabilitiesMatrixSet} from '../../../../src/ol/tilegrid/WMTS.js';
describe('ol.tilegrid.WMTS', function() {
describe('when creating tileGrid from capabilities', function() {
const parser = new _ol_format_WMTSCapabilities_();
const parser = new WMTSCapabilities();
let capabilities;
before(function(done) {
afterLoadText('spec/ol/format/wmts/ogcsample.xml', function(xml) {
@@ -58,7 +58,7 @@ describe('ol.tilegrid.WMTS', function() {
describe('when creating tileGrid from capabilities with and without TileMatrixSetLimits',
function() {
const parser = new _ol_format_WMTSCapabilities_();
const parser = new WMTSCapabilities();
let capabilities;
before(function(done) {
afterLoadText('spec/ol/format/wmts/ign.xml', function(xml) {