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

Rename _ol_geom_Circle_ to Circle

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 08:57:52 -07:00
parent 9d396280b0
commit ac7985a5ad
15 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/spec/ol/render/canvas/immediate.test.js
View File

@@ -1,4 +1,4 @@
import _ol_geom_Circle_ from '../../../../../src/ol/geom/Circle.js';
import Circle from '../../../../../src/ol/geom/Circle.js';
import _ol_geom_GeometryCollection_ from '../../../../../src/ol/geom/GeometryCollection.js';
import LineString from '../../../../../src/ol/geom/LineString.js';
import MultiLineString from '../../../../../src/ol/geom/MultiLineString.js';
@@ -154,7 +154,7 @@ describe('ol.render.canvas.Immediate', function() {
var context = new _ol_render_canvas_Immediate_(getMockContext(), 1, extent);
sinon.spy(context, 'drawCircle');
var geometry = new _ol_geom_Circle_([0, 0]);
var geometry = new Circle([0, 0]);
context.drawGeometry(geometry);
expect(context.drawCircle.calledOnce).to.be(true);

14
test/spec/ol/render/webgl/circlereplay.test.js
View File

@@ -1,6 +1,6 @@
import {getUid} from '../../../../../src/ol/index.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_geom_Circle_ from '../../../../../src/ol/geom/Circle.js';
import Circle from '../../../../../src/ol/geom/Circle.js';
import _ol_render_webgl_CircleReplay_ 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';
@@ -48,7 +48,7 @@ describe('ol.render.webgl.CircleReplay', function() {
describe('#drawCircle', function() {
it('sets the buffer data', function() {
var circle = new _ol_geom_Circle_([0, 0], 5000);
var circle = new Circle([0, 0], 5000);
replay.setFillStrokeStyle(fillStyle, strokeStyle);
replay.drawCircle(circle, null);
@@ -61,7 +61,7 @@ describe('ol.render.webgl.CircleReplay', function() {
});
it('does not draw if radius is zero', function() {
var circle = new _ol_geom_Circle_([0, 0], 0);
var circle = new Circle([0, 0], 0);
replay.drawCircle(circle, null);
expect(replay.vertices).to.have.length(0);
@@ -71,7 +71,7 @@ describe('ol.render.webgl.CircleReplay', function() {
});
it('resets state and removes style if it belongs to a zero radius circle', function() {
var circle = new _ol_geom_Circle_([0, 0], 0);
var circle = new Circle([0, 0], 0);
replay.setFillStrokeStyle(fillStyle, strokeStyle);
replay.setFillStrokeStyle(null, strokeStyle);
@@ -174,13 +174,13 @@ describe('ol.render.webgl.CircleReplay', function() {
describe('#drawReplay', function() {
var gl, context;
var feature1 = new _ol_Feature_({
geometry: new _ol_geom_Circle_([0, 0], 5000)
geometry: new Circle([0, 0], 5000)
});
var feature2 = new _ol_Feature_({
geometry: new _ol_geom_Circle_([10, 10], 5000)
geometry: new Circle([10, 10], 5000)
});
var feature3 = new _ol_Feature_({
geometry: new _ol_geom_Circle_([20, 20], 5000)
geometry: new Circle([20, 20], 5000)
});
beforeEach(function() {
gl = {};

6
test/spec/ol/render/webgl/immediate.test.js
View File

@@ -1,5 +1,5 @@
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_geom_Circle_ from '../../../../../src/ol/geom/Circle.js';
import Circle from '../../../../../src/ol/geom/Circle.js';
import _ol_geom_GeometryCollection_ from '../../../../../src/ol/geom/GeometryCollection.js';
import LineString from '../../../../../src/ol/geom/LineString.js';
import MultiLineString from '../../../../../src/ol/geom/MultiLineString.js';
@@ -26,7 +26,7 @@ describe('ol.render.webgl.Immediate', function() {
fill: new _ol_style_Fill_(),
stroke: new _ol_style_Stroke_()
});
circle = new _ol_geom_Circle_([0, 0], 5);
circle = new Circle([0, 0], 5);
line = new LineString([[0, 0], [5, 5]]);
multiLine = new MultiLineString([[[0, 0], [5, 5]]]);
point = new Point([0, 0]);
@@ -75,7 +75,7 @@ describe('ol.render.webgl.Immediate', function() {
it('does nothing if geometry is out of bounds', function() {
feat = new _ol_Feature_({
geometry: new _ol_geom_Circle_([540, 540], 1)
geometry: new Circle([540, 540], 1)
});
context.drawFeature(feat, style);
expect(context.setStyle.called).to.be(false);