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

Rename _ol_style_RegularShape_ to RegularShape

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 13:26:51 -07:00
parent c5a4be2edd
commit 16c8d2c246
8 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/rendering/ol/style/regularshape.test.js
View File

@@ -5,7 +5,7 @@ import View from '../../../../src/ol/View.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import VectorSource from '../../../../src/ol/source/Vector.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js';
import RegularShape from '../../../../src/ol/style/RegularShape.js';
import Style from '../../../../src/ol/style/Style.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
@@ -47,7 +47,7 @@ describe('ol.rendering.style.RegularShape', function() {
});
// square
feature.setStyle(new Style({
image: new _ol_style_RegularShape_({
image: new RegularShape({
fill: fill,
stroke: stroke,
points: 4,
@@ -62,7 +62,7 @@ describe('ol.rendering.style.RegularShape', function() {
});
// triangle
feature.setStyle(new Style({
image: new _ol_style_RegularShape_({
image: new RegularShape({
fill: fill,
stroke: stroke,
points: 3,
@@ -78,7 +78,7 @@ describe('ol.rendering.style.RegularShape', function() {
});
// star
feature.setStyle(new Style({
image: new _ol_style_RegularShape_({
image: new RegularShape({
fill: fill,
stroke: stroke,
points: 5,
@@ -94,7 +94,7 @@ describe('ol.rendering.style.RegularShape', function() {
});
// cross
feature.setStyle(new Style({
image: new _ol_style_RegularShape_({
image: new RegularShape({
fill: fill,
stroke: stroke,
points: 4,

56
test/spec/ol/style/regularshape.test.js
View File

@@ -1,5 +1,5 @@
import AtlasManager from '../../../../src/ol/style/AtlasManager.js';
import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js';
import RegularShape from '../../../../src/ol/style/RegularShape.js';
import Fill from '../../../../src/ol/style/Fill.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
@@ -9,7 +9,7 @@ describe('ol.style.RegularShape', function() {
describe('#constructor', function() {
it('can use rotateWithView', function() {
var style = new _ol_style_RegularShape_({
var style = new RegularShape({
rotateWithView: true,
radius: 0
});
@@ -17,7 +17,7 @@ describe('ol.style.RegularShape', function() {
});
it('can use radius', function() {
var style = new _ol_style_RegularShape_({
var style = new RegularShape({
radius: 5,
radius2: 10
});
@@ -26,7 +26,7 @@ describe('ol.style.RegularShape', function() {
});
it('can use radius1 as an alias for radius', function() {
var style = new _ol_style_RegularShape_({
var style = new RegularShape({
radius1: 5,
radius2: 10
});
@@ -35,7 +35,7 @@ describe('ol.style.RegularShape', function() {
});
it('creates a canvas if no atlas is used (no fill-style)', function() {
var style = new _ol_style_RegularShape_({radius: 10});
var style = new RegularShape({radius: 10});
expect(style.getImage()).to.be.an(HTMLCanvasElement);
expect(style.getSize()).to.eql([21, 21]);
expect(style.getImageSize()).to.eql([21, 21]);
@@ -48,7 +48,7 @@ describe('ol.style.RegularShape', function() {
});
it('creates a canvas if no atlas is used (fill-style)', function() {
var style = new _ol_style_RegularShape_({
var style = new RegularShape({
radius: 10,
fill: new Fill({
color: '#FFFF00'
@@ -67,7 +67,7 @@ describe('ol.style.RegularShape', function() {
it('adds itself to an atlas manager (no fill-style)', function() {
var atlasManager = new AtlasManager({initialSize: 512});
var style = new _ol_style_RegularShape_(
var style = new RegularShape(
{radius: 10, atlasManager: atlasManager});
expect(style.getImage()).to.be.an(HTMLCanvasElement);
expect(style.getSize()).to.eql([21, 21]);
@@ -82,7 +82,7 @@ describe('ol.style.RegularShape', function() {
it('adds itself to an atlas manager (fill-style)', function() {
var atlasManager = new AtlasManager({initialSize: 512});
var style = new _ol_style_RegularShape_({
var style = new RegularShape({
radius: 10,
atlasManager: atlasManager,
fill: new Fill({
@@ -104,16 +104,16 @@ describe('ol.style.RegularShape', function() {
describe('#clone', function() {
it('creates a new ol.style.RegularShape', function() {
var original = new _ol_style_RegularShape_({
var original = new RegularShape({
points: 5
});
var clone = original.clone();
expect(clone).to.be.an(_ol_style_RegularShape_);
expect(clone).to.be.an(RegularShape);
expect(clone).to.not.be(original);
});
it('copies all values', function() {
var original = new _ol_style_RegularShape_({
var original = new RegularShape({
fill: new Fill({
color: '#319FD3'
}),
@@ -145,7 +145,7 @@ describe('ol.style.RegularShape', function() {
});
it('the clone does not reference the same objects as the original', function() {
var original = new _ol_style_RegularShape_({
var original = new RegularShape({
fill: new Fill({
color: '#319FD3'
}),
@@ -168,11 +168,11 @@ describe('ol.style.RegularShape', function() {
describe('#getChecksum', function() {
it('calculates not the same hash code (radius)', function() {
var style1 = new _ol_style_RegularShape_({
var style1 = new RegularShape({
radius: 4,
radius2: 5
});
var style2 = new _ol_style_RegularShape_({
var style2 = new RegularShape({
radius: 3,
radius2: 5
});
@@ -180,11 +180,11 @@ describe('ol.style.RegularShape', function() {
});
it('calculates not the same hash code (radius2)', function() {
var style1 = new _ol_style_RegularShape_({
var style1 = new RegularShape({
radius: 4,
radius2: 5
});
var style2 = new _ol_style_RegularShape_({
var style2 = new RegularShape({
radius: 4,
radius2: 6
});
@@ -192,23 +192,23 @@ describe('ol.style.RegularShape', function() {
});
it('calculates the same hash code (radius)', function() {
var style1 = new _ol_style_RegularShape_({
var style1 = new RegularShape({
radius: 5
});
var style2 = new _ol_style_RegularShape_({
var style2 = new RegularShape({
radius: 5
});
expect(style1.getChecksum()).to.eql(style2.getChecksum());
});
it('calculates not the same hash code (color)', function() {
var style1 = new _ol_style_RegularShape_({
var style1 = new RegularShape({
radius: 5,
fill: new Fill({
color: '#319FD3'
})
});
var style2 = new _ol_style_RegularShape_({
var style2 = new RegularShape({
radius: 5,
stroke: new Stroke({
color: '#319FD3'
@@ -218,7 +218,7 @@ describe('ol.style.RegularShape', function() {
});
it('calculates the same hash code (everything set)', function() {
var style1 = new _ol_style_RegularShape_({
var style1 = new RegularShape({
radius: 5,
radius2: 3,
angle: 1.41,
@@ -235,7 +235,7 @@ describe('ol.style.RegularShape', function() {
width: 2
})
});
var style2 = new _ol_style_RegularShape_({
var style2 = new RegularShape({
radius: 5,
radius2: 3,
angle: 1.41,
@@ -256,7 +256,7 @@ describe('ol.style.RegularShape', function() {
});
it('calculates not the same hash code (stroke width differs)', function() {
var style1 = new _ol_style_RegularShape_({
var style1 = new RegularShape({
radius: 5,
radius2: 3,
angle: 1.41,
@@ -273,7 +273,7 @@ describe('ol.style.RegularShape', function() {
width: 3
})
});
var style2 = new _ol_style_RegularShape_({
var style2 = new RegularShape({
radius: 5,
radius2: 3,
angle: 1.41,
@@ -294,7 +294,7 @@ describe('ol.style.RegularShape', function() {
});
it('invalidates a cached checksum if values change (fill)', function() {
var style1 = new _ol_style_RegularShape_({
var style1 = new RegularShape({
radius: 5,
fill: new Fill({
color: '#319FD3'
@@ -303,7 +303,7 @@ describe('ol.style.RegularShape', function() {
color: '#319FD3'
})
});
var style2 = new _ol_style_RegularShape_({
var style2 = new RegularShape({
radius: 5,
fill: new Fill({
color: '#319FD3'
@@ -319,7 +319,7 @@ describe('ol.style.RegularShape', function() {
});
it('invalidates a cached checksum if values change (stroke)', function() {
var style1 = new _ol_style_RegularShape_({
var style1 = new RegularShape({
radius: 5,
fill: new Fill({
color: '#319FD3'
@@ -328,7 +328,7 @@ describe('ol.style.RegularShape', function() {
color: '#319FD3'
})
});
var style2 = new _ol_style_RegularShape_({
var style2 = new RegularShape({
radius: 5,
fill: new Fill({
color: '#319FD3'