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

Rename _ol_geom_Point_ to Point

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 08:49:10 -07:00
parent 75c5a8b246
commit eadec38ae2
76 changed files with 365 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/geom/geometrycollection.test.js
+15 -15
View File
@@ -1,7 +1,7 @@
import _ol_geom_Geometry_ from '../../../../src/ol/geom/Geometry.js';
import _ol_geom_GeometryCollection_ from '../../../../src/ol/geom/GeometryCollection.js';
import _ol_geom_LineString_ from '../../../../src/ol/geom/LineString.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import Point from '../../../../src/ol/geom/Point.js';
import _ol_geom_Polygon_ from '../../../../src/ol/geom/Polygon.js';
describe('ol.geom.GeometryCollection', function() {
@@ -14,7 +14,7 @@ describe('ol.geom.GeometryCollection', function() {
var line, multi, point, poly;
beforeEach(function() {
point = new _ol_geom_Point_([10, 20]);
point = new Point([10, 20]);
line = new _ol_geom_LineString_([[10, 20], [30, 40]]);
poly = new _ol_geom_Polygon_([outer, inner1, inner2]);
multi = new _ol_geom_GeometryCollection_([point, line, poly]);
@@ -43,7 +43,7 @@ describe('ol.geom.GeometryCollection', function() {
});
it('register new components', function(done) {
var point2 = new _ol_geom_Point_([10, 20]);
var point2 = new Point([10, 20]);
multi.setGeometriesArray([point2]);
multi.on('change', function() {
done();
@@ -56,7 +56,7 @@ describe('ol.geom.GeometryCollection', function() {
describe('#getGeometries', function() {
it('returns a collection of geometries', function() {
var point = new _ol_geom_Point_([10, 20]);
var point = new Point([10, 20]);
var line = new _ol_geom_LineString_([[10, 20], [30, 40]]);
var poly = new _ol_geom_Polygon_([outer, inner1, inner2]);
var multi = new _ol_geom_GeometryCollection_([point, line, poly]);
@@ -64,7 +64,7 @@ describe('ol.geom.GeometryCollection', function() {
var geometries = multi.getGeometries();
expect(geometries).to.be.an(Array);
expect(geometries).to.have.length(3);
expect(geometries[0]).to.be.a(_ol_geom_Point_);
expect(geometries[0]).to.be.a(Point);
expect(geometries[1]).to.be.a(_ol_geom_LineString_);
expect(geometries[2]).to.be.a(_ol_geom_Polygon_);
});
@@ -74,7 +74,7 @@ describe('ol.geom.GeometryCollection', function() {
describe('#clone()', function() {
it('has a working clone method', function() {
var point = new _ol_geom_Point_([10, 20]);
var point = new Point([10, 20]);
var line = new _ol_geom_LineString_([[10, 20], [30, 40]]);
var poly = new _ol_geom_Polygon_([outer, inner1, inner2]);
var multi = new _ol_geom_GeometryCollection_([point, line, poly]);
@@ -87,7 +87,7 @@ describe('ol.geom.GeometryCollection', function() {
});
it('does a deep clone', function() {
var point = new _ol_geom_Point_([30, 40]);
var point = new Point([30, 40]);
var originalGeometries = [point];
var multi = new _ol_geom_GeometryCollection_(originalGeometries);
var clone = multi.clone();
@@ -105,7 +105,7 @@ describe('ol.geom.GeometryCollection', function() {
describe('#getExtent()', function() {
it('returns the bounding extent', function() {
var point = new _ol_geom_Point_([10, 2]);
var point = new Point([10, 2]);
var line = new _ol_geom_LineString_([[1, 20], [30, 40]]);
var multi = new _ol_geom_GeometryCollection_([point, line]);
var extent = multi.getExtent();
@@ -122,7 +122,7 @@ describe('ol.geom.GeometryCollection', function() {
var point, line, poly, multi;
beforeEach(function() {
point = new _ol_geom_Point_([5, 20]);
point = new Point([5, 20]);
line = new _ol_geom_LineString_([[10, 20], [30, 40]]);
poly = new _ol_geom_Polygon_([outer, inner1, inner2]);
multi = new _ol_geom_GeometryCollection_([point, line, poly]);
@@ -151,7 +151,7 @@ describe('ol.geom.GeometryCollection', function() {
var line, multi, point, poly;
beforeEach(function() {
point = new _ol_geom_Point_([10, 20]);
point = new Point([10, 20]);
line = new _ol_geom_LineString_([[10, 20], [30, 40]]);
poly = new _ol_geom_Polygon_([outer, inner1, inner2]);
multi = new _ol_geom_GeometryCollection_([point, line, poly]);
@@ -176,7 +176,7 @@ describe('ol.geom.GeometryCollection', function() {
it('scales a collection', function() {
var geom = new _ol_geom_GeometryCollection_([
new _ol_geom_Point_([-1, -2]),
new Point([-1, -2]),
new _ol_geom_LineString_([[0, 0], [1, 2]])
]);
geom.scale(10);
@@ -187,7 +187,7 @@ describe('ol.geom.GeometryCollection', function() {
it('accepts sx and sy', function() {
var geom = new _ol_geom_GeometryCollection_([
new _ol_geom_Point_([-1, -2]),
new Point([-1, -2]),
new _ol_geom_LineString_([[0, 0], [1, 2]])
]);
geom.scale(2, 3);
@@ -198,7 +198,7 @@ describe('ol.geom.GeometryCollection', function() {
it('accepts an anchor', function() {
var geom = new _ol_geom_GeometryCollection_([
new _ol_geom_Point_([-1, -2]),
new Point([-1, -2]),
new _ol_geom_LineString_([[0, 0], [1, 2]])
]);
geom.scale(10, 15, [-1, -2]);
@@ -213,7 +213,7 @@ describe('ol.geom.GeometryCollection', function() {
var line, multi, point;
beforeEach(function() {
point = new _ol_geom_Point_([10, 20]);
point = new Point([10, 20]);
line = new _ol_geom_LineString_([[10, 20], [30, 40]]);
multi = new _ol_geom_GeometryCollection_([point, line]);
});
@@ -222,7 +222,7 @@ describe('ol.geom.GeometryCollection', function() {
multi.transform('EPSG:4326', 'EPSG:3857');
var geometries = multi.getGeometries();
expect(geometries[0]).to.be.a(_ol_geom_Point_);
expect(geometries[0]).to.be.a(Point);
expect(geometries[1]).to.be.a(_ol_geom_LineString_);
var coords = geometries[0].getCoordinates();
test/spec/ol/geom/multipoint.test.js
+5 -5
View File
@@ -1,6 +1,6 @@
import * as _ol_extent_ from '../../../../src/ol/extent.js';
import _ol_geom_MultiPoint_ from '../../../../src/ol/geom/MultiPoint.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import Point from '../../../../src/ol/geom/Point.js';
describe('ol.geom.MultiPoint', function() {
@@ -39,9 +39,9 @@ describe('ol.geom.MultiPoint', function() {
});
it('can append points', function() {
multiPoint.appendPoint(new _ol_geom_Point_([1, 2]));
multiPoint.appendPoint(new Point([1, 2]));
expect(multiPoint.getCoordinates()).to.eql([[1, 2]]);
multiPoint.appendPoint(new _ol_geom_Point_([3, 4]));
multiPoint.appendPoint(new Point([3, 4]));
expect(multiPoint.getCoordinates()).to.eql([[1, 2], [3, 4]]);
});
@@ -157,10 +157,10 @@ describe('ol.geom.MultiPoint', function() {
it('can return all points', function() {
var points = multiPoint.getPoints();
expect(points).to.have.length(2);
expect(points[0]).to.be.an(_ol_geom_Point_);
expect(points[0]).to.be.an(Point);
expect(points[0].getLayout()).to.be('XYM');
expect(points[0].getCoordinates()).to.eql([1, 2, 3]);
expect(points[1]).to.be.an(_ol_geom_Point_);
expect(points[1]).to.be.an(Point);
expect(points[1].getLayout()).to.be('XYM');
expect(points[1].getCoordinates()).to.eql([4, 5, 6]);
});
test/spec/ol/geom/point.test.js
+12 -12
View File
@@ -1,11 +1,11 @@
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import Point from '../../../../src/ol/geom/Point.js';
describe('ol.geom.Point', function() {
it('can be constructed with a null geometry', function() {
expect(function() {
return new _ol_geom_Point_(null);
return new Point(null);
}).not.to.throwException();
});
@@ -13,7 +13,7 @@ describe('ol.geom.Point', function() {
var point;
beforeEach(function() {
point = new _ol_geom_Point_([1, 2]);
point = new Point([1, 2]);
});
it('has the expected layout', function() {
@@ -50,7 +50,7 @@ describe('ol.geom.Point', function() {
var point;
beforeEach(function() {
point = new _ol_geom_Point_([1, 2, 3], 'XYM');
point = new Point([1, 2, 3], 'XYM');
});
it('has the expected layout', function() {
@@ -87,7 +87,7 @@ describe('ol.geom.Point', function() {
var point;
beforeEach(function() {
point = new _ol_geom_Point_([1, 2, 3, 4]);
point = new Point([1, 2, 3, 4]);
});
it('has the expected layout', function() {
@@ -132,21 +132,21 @@ describe('ol.geom.Point', function() {
describe('#scale()', function() {
it('scales a point', function() {
var geom = new _ol_geom_Point_([1, 2]);
var geom = new Point([1, 2]);
geom.scale(10e6);
var coordinates = geom.getCoordinates();
expect(coordinates).to.eql([1, 2]);
});
it('accepts sx and sy', function() {
var geom = new _ol_geom_Point_([1, 2]);
var geom = new Point([1, 2]);
geom.scale(1e6, -42);
var coordinates = geom.getCoordinates();
expect(coordinates).to.eql([1, 2]);
});
it('accepts an anchor', function() {
var geom = new _ol_geom_Point_([1, 2]);
var geom = new Point([1, 2]);
geom.scale(10, 15, [0, 0]);
var coordinates = geom.getCoordinates();
expect(coordinates).to.eql([10, 30]);
@@ -158,7 +158,7 @@ describe('ol.geom.Point', function() {
var point, transform;
beforeEach(function() {
point = new _ol_geom_Point_([1, 2]);
point = new Point([1, 2]);
transform = sinon.spy();
});
@@ -193,10 +193,10 @@ describe('ol.geom.Point', function() {
describe('#transform()', function() {
it('transforms a geometry given CRS identifiers', function() {
var point = new _ol_geom_Point_([-111, 45]).transform(
var point = new Point([-111, 45]).transform(
'EPSG:4326', 'EPSG:3857');
expect(point).to.be.a(_ol_geom_Point_);
expect(point).to.be.a(Point);
var coords = point.getCoordinates();
@@ -205,7 +205,7 @@ describe('ol.geom.Point', function() {
});
it('modifies the original', function() {
var point = new _ol_geom_Point_([-111, 45]);
var point = new Point([-111, 45]);
point.transform('EPSG:4326', 'EPSG:3857');
var coords = point.getCoordinates();