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

4
test/rendering/ol/layer/tile.test.js
View File

@@ -1,7 +1,7 @@
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import * as _ol_extent_ from '../../../../src/ol/extent.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import Point from '../../../../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import {transform} from '../../../../src/ol/proj.js';
@@ -284,7 +284,7 @@ describe('ol.rendering.layer.Tile', function() {
fill: new _ol_style_Fill_({color: 'yellow'}),
stroke: new _ol_style_Stroke_({color: 'red', width: 1})
}));
e.vectorContext.drawPoint(new _ol_geom_Point_(
e.vectorContext.drawPoint(new Point(
transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));
});
};

50
test/rendering/ol/layer/vector.test.js
View File

@@ -4,7 +4,7 @@ import _ol_View_ from '../../../../src/ol/View.js';
import _ol_format_GeoJSON_ from '../../../../src/ol/format/GeoJSON.js';
import _ol_geom_Circle_ from '../../../../src/ol/geom/Circle.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';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -590,16 +590,16 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(layer);
var centerFeature = new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
geometry: new Point(center),
text: 'center'
});
source.addFeature(centerFeature);
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
geometry: new Point([center[0] - 540, center[1]]),
text: 'west'
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
geometry: new Point([center[0] + 540, center[1]]),
text: 'east'
}));
@@ -631,16 +631,16 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(layer);
var centerFeature = new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
geometry: new Point(center),
text: 'center'
});
source.addFeature(centerFeature);
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
geometry: new Point([center[0] - 540, center[1]]),
text: 'west'
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
geometry: new Point([center[0] + 540, center[1]]),
text: 'east'
}));
@@ -671,17 +671,17 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(layer);
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
geometry: new Point(center),
text: 'center',
zIndex: 2
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
geometry: new Point([center[0] - 540, center[1]]),
text: 'west',
zIndex: 3
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
geometry: new Point([center[0] + 540, center[1]]),
text: 'east',
zIndex: 1
}));
@@ -711,14 +711,14 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(layer);
var centerFeature = new _ol_Feature_({
geometry: new _ol_geom_Point_(center)
geometry: new Point(center)
});
source.addFeature(centerFeature);
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]])
geometry: new Point([center[0] - 540, center[1]])
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]])
geometry: new Point([center[0] + 540, center[1]])
}));
layer.setDeclutter(true);
@@ -751,14 +751,14 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(layer);
var centerFeature = new _ol_Feature_({
geometry: new _ol_geom_Point_(center)
geometry: new Point(center)
});
source.addFeature(centerFeature);
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]])
geometry: new Point([center[0] - 540, center[1]])
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]])
geometry: new Point([center[0] + 540, center[1]])
}));
layer.setDeclutter(true);
@@ -790,15 +790,15 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(layer);
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
geometry: new Point(center),
zIndex: 2
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
geometry: new Point([center[0] - 540, center[1]]),
zIndex: 3
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
geometry: new Point([center[0] + 540, center[1]]),
zIndex: 1
}));
@@ -829,15 +829,15 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(layer);
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_(center),
geometry: new Point(center),
text: 'center'
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] - 540, center[1]]),
geometry: new Point([center[0] - 540, center[1]]),
text: 'west'
}));
source.addFeature(new _ol_Feature_({
geometry: new _ol_geom_Point_([center[0] + 540, center[1]]),
geometry: new Point([center[0] + 540, center[1]]),
text: 'east'
}));
@@ -872,7 +872,7 @@ describe('ol.rendering.layer.Vector', function() {
});
map.addLayer(layer);
var point = new _ol_Feature_(new _ol_geom_Point_(center));
var point = new _ol_Feature_(new Point(center));
point.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
radius: 8,
@@ -915,7 +915,7 @@ describe('ol.rendering.layer.Vector', function() {
});
map.addLayer(layer);
var point = new _ol_Feature_(new _ol_geom_Point_(center));
var point = new _ol_Feature_(new Point(center));
point.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
radius: 8,
@@ -958,7 +958,7 @@ describe('ol.rendering.layer.Vector', function() {
});
map.addLayer(layer);
var point = new _ol_Feature_(new _ol_geom_Point_(center));
var point = new _ol_Feature_(new Point(center));
point.setStyle(new _ol_style_Style_({
zIndex: 2,
image: new _ol_style_Circle_({

4
test/rendering/ol/layer/vectortile.test.js
View File

@@ -2,7 +2,7 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_format_MVT_ from '../../../../src/ol/format/MVT.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import Point from '../../../../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import _ol_layer_VectorTile_ from '../../../../src/ol/layer/VectorTile.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
@@ -98,7 +98,7 @@ describe('ol.rendering.layer.VectorTile', function() {
createMap('canvas');
var vectorSource = new _ol_source_Vector_({
features: [
new _ol_Feature_(new _ol_geom_Point_([1825727.7316762917, 6143091.089223046]))
new _ol_Feature_(new Point([1825727.7316762917, 6143091.089223046]))
]
});
map.addLayer(new _ol_layer_Vector_({

4
test/rendering/ol/map.test.js
View File

@@ -1,5 +1,5 @@
import _ol_Feature_ from '../../../src/ol/Feature.js';
import _ol_geom_Point_ from '../../../src/ol/geom/Point.js';
import Point from '../../../src/ol/geom/Point.js';
import _ol_Map_ from '../../../src/ol/Map.js';
import _ol_View_ from '../../../src/ol/View.js';
import _ol_layer_Vector_ from '../../../src/ol/layer/Vector.js';
@@ -13,7 +13,7 @@ describe('ol.rendering.Map', function() {
var vectorLayer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [new _ol_Feature_({
geometry: new _ol_geom_Point_([0, 0])
geometry: new Point([0, 0])
})]
})
});

4
test/rendering/ol/render.test.js
View File

@@ -1,5 +1,5 @@
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';
import _ol_render_ from '../../../src/ol/render.js';
import _ol_render_VectorContext_ from '../../../src/ol/render/VectorContext.js';
@@ -43,7 +43,7 @@ describe('ol.render', function() {
});
vectorContext.setStyle(style);
vectorContext.drawGeometry(new _ol_geom_Point_([50, 50]));
vectorContext.drawGeometry(new Point([50, 50]));
resembleCanvas(context.canvas,
'rendering/ol/expected/render-point.png', IMAGE_TOLERANCE, done);

20
test/rendering/ol/style/circle.test.js
View File

@@ -1,5 +1,5 @@
import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import Point from '../../../../src/ol/geom/Point.js';
import _ol_geom_MultiPoint_ from '../../../../src/ol/geom/MultiPoint.js';
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
@@ -46,7 +46,7 @@ describe('ol.rendering.style.Circle', function() {
function createFeatures(multi) {
var feature;
feature = new _ol_Feature_({
geometry: multi ? new _ol_geom_MultiPoint_([[-20, 18]]) : new _ol_geom_Point_([-20, 18])
geometry: multi ? new _ol_geom_MultiPoint_([[-20, 18]]) : new Point([-20, 18])
});
feature.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -59,7 +59,7 @@ describe('ol.rendering.style.Circle', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: multi ? new _ol_geom_MultiPoint_([[-10, 18]]) : new _ol_geom_Point_([-10, 18])
geometry: multi ? new _ol_geom_MultiPoint_([[-10, 18]]) : new Point([-10, 18])
});
feature.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -72,7 +72,7 @@ describe('ol.rendering.style.Circle', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: multi ? new _ol_geom_MultiPoint_([[4, 18]]) : new _ol_geom_Point_([4, 18])
geometry: multi ? new _ol_geom_MultiPoint_([[4, 18]]) : new Point([4, 18])
});
feature.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -85,7 +85,7 @@ describe('ol.rendering.style.Circle', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: multi ? new _ol_geom_MultiPoint_([[-20, 3]]) : new _ol_geom_Point_([-20, 3])
geometry: multi ? new _ol_geom_MultiPoint_([[-20, 3]]) : new Point([-20, 3])
});
feature.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -102,7 +102,7 @@ describe('ol.rendering.style.Circle', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: multi ? new _ol_geom_MultiPoint_([[-10, 3]]) : new _ol_geom_Point_([-10, 3])
geometry: multi ? new _ol_geom_MultiPoint_([[-10, 3]]) : new Point([-10, 3])
});
feature.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -119,7 +119,7 @@ describe('ol.rendering.style.Circle', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: multi ? new _ol_geom_MultiPoint_([[4, 3]]) : new _ol_geom_Point_([4, 3])
geometry: multi ? new _ol_geom_MultiPoint_([[4, 3]]) : new Point([4, 3])
});
feature.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -136,7 +136,7 @@ describe('ol.rendering.style.Circle', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: multi ? new _ol_geom_MultiPoint_([[-20, -15]]) : new _ol_geom_Point_([-20, -15])
geometry: multi ? new _ol_geom_MultiPoint_([[-20, -15]]) : new Point([-20, -15])
});
feature.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -150,7 +150,7 @@ describe('ol.rendering.style.Circle', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: multi ? new _ol_geom_MultiPoint_([[-10, -15]]) : new _ol_geom_Point_([-10, -15])
geometry: multi ? new _ol_geom_MultiPoint_([[-10, -15]]) : new Point([-10, -15])
});
feature.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -167,7 +167,7 @@ describe('ol.rendering.style.Circle', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: multi ? new _ol_geom_MultiPoint_([[4, -15]]) : new _ol_geom_Point_([4, -15])
geometry: multi ? new _ol_geom_MultiPoint_([[4, -15]]) : new Point([4, -15])
});
feature.setStyle(new _ol_style_Style_({
image: new _ol_style_Circle_({

4
test/rendering/ol/style/icon.test.js
View File

@@ -1,5 +1,5 @@
import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import Point from '../../../../src/ol/geom/Point.js';
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
@@ -52,7 +52,7 @@ describe('ol.rendering.style.Icon', function() {
function createFeatures(src, imgInfo, callback) {
var feature;
feature = new _ol_Feature_({
geometry: new _ol_geom_Point_([0, 0])
geometry: new Point([0, 0])
});
var img = new Image();

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

@@ -1,5 +1,5 @@
import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import Point from '../../../../src/ol/geom/Point.js';
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
@@ -43,7 +43,7 @@ describe('ol.rendering.style.RegularShape', function() {
function createFeatures(stroke, fill) {
var feature;
feature = new _ol_Feature_({
geometry: new _ol_geom_Point_([-15, 15])
geometry: new Point([-15, 15])
});
// square
feature.setStyle(new _ol_style_Style_({
@@ -58,7 +58,7 @@ describe('ol.rendering.style.RegularShape', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: new _ol_geom_Point_([8, 15])
geometry: new Point([8, 15])
});
// triangle
feature.setStyle(new _ol_style_Style_({
@@ -74,7 +74,7 @@ describe('ol.rendering.style.RegularShape', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: new _ol_geom_Point_([-10, -8])
geometry: new Point([-10, -8])
});
// star
feature.setStyle(new _ol_style_Style_({
@@ -90,7 +90,7 @@ describe('ol.rendering.style.RegularShape', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: new _ol_geom_Point_([12, -8])
geometry: new Point([12, -8])
});
// cross
feature.setStyle(new _ol_style_Style_({

24
test/rendering/ol/style/text.test.js
View File

@@ -2,7 +2,7 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_geom_LineString_ from '../../../../src/ol/geom/LineString.js';
import _ol_geom_MultiLineString_ from '../../../../src/ol/geom/MultiLineString.js';
import _ol_geom_MultiPolygon_ from '../../../../src/ol/geom/MultiPolygon.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';
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
@@ -50,7 +50,7 @@ describe('ol.rendering.style.Text', function() {
var scale = opt_scale || 1;
var feature;
feature = new _ol_Feature_({
geometry: new _ol_geom_Point_([-20, 18])
geometry: new Point([-20, 18])
});
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
@@ -62,7 +62,7 @@ describe('ol.rendering.style.Text', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: new _ol_geom_Point_([-10, 0])
geometry: new Point([-10, 0])
});
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
@@ -81,7 +81,7 @@ describe('ol.rendering.style.Text', function() {
vectorSource.addFeature(feature);
feature = new _ol_Feature_({
geometry: new _ol_geom_Point_([20, 10])
geometry: new Point([20, 10])
});
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
@@ -175,7 +175,7 @@ describe('ol.rendering.style.Text', function() {
it('renders multiline text with alignment options', function(done) {
createMap('canvas');
var feature;
feature = new _ol_Feature_(new _ol_geom_Point_([25, 0]));
feature = new _ol_Feature_(new Point([25, 0]));
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'Hello world\nleft',
@@ -184,7 +184,7 @@ describe('ol.rendering.style.Text', function() {
})
}));
vectorSource.addFeature(feature);
feature = new _ol_Feature_(new _ol_geom_Point_([-25, 0]));
feature = new _ol_Feature_(new Point([-25, 0]));
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'Hello world\nright',
@@ -193,7 +193,7 @@ describe('ol.rendering.style.Text', function() {
})
}));
vectorSource.addFeature(feature);
feature = new _ol_Feature_(new _ol_geom_Point_([0, 25]));
feature = new _ol_Feature_(new Point([0, 25]));
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'Hello world\nbottom',
@@ -202,7 +202,7 @@ describe('ol.rendering.style.Text', function() {
})
}));
vectorSource.addFeature(feature);
feature = new _ol_Feature_(new _ol_geom_Point_([0, -25]));
feature = new _ol_Feature_(new Point([0, -25]));
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'top\nHello world',
@@ -217,7 +217,7 @@ describe('ol.rendering.style.Text', function() {
it('renders multiline text with positioning options', function(done) {
createMap('canvas');
var feature;
feature = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
feature = new _ol_Feature_(new Point([0, 0]));
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'Hello world\nleft',
@@ -227,7 +227,7 @@ describe('ol.rendering.style.Text', function() {
})
}));
vectorSource.addFeature(feature);
feature = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
feature = new _ol_Feature_(new Point([0, 0]));
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'Hello world\nright',
@@ -237,7 +237,7 @@ describe('ol.rendering.style.Text', function() {
})
}));
vectorSource.addFeature(feature);
feature = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
feature = new _ol_Feature_(new Point([0, 0]));
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'Hello world\nbottom',
@@ -247,7 +247,7 @@ describe('ol.rendering.style.Text', function() {
})
}));
vectorSource.addFeature(feature);
feature = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
feature = new _ol_Feature_(new Point([0, 0]));
feature.setStyle(new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'top\nHello world',