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

Rename _ol_layer_Vector_ to VectorLayer

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 10:05:12 -07:00
parent 24dd0ca924
commit 45c6e43b42
90 changed files with 246 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/spec/ol/interaction/dragrotateandzoom.test.js
View File

@@ -3,7 +3,7 @@ import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js
import View from '../../../../src/ol/View.js';
import DragRotateAndZoom from '../../../../src/ol/interaction/DragRotateAndZoom.js';
import Interaction from '../../../../src/ol/interaction/Interaction.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -35,7 +35,7 @@ describe('ol.interaction.DragRotateAndZoom', function() {
style.height = height + 'px';
document.body.appendChild(target);
var source = new _ol_source_Vector_();
var layer = new _ol_layer_Vector_({source: source});
var layer = new VectorLayer({source: source});
interaction = new DragRotateAndZoom();
map = new Map({
target: target,

4
test/spec/ol/interaction/dragzoom.test.js
View File

@@ -3,7 +3,7 @@ import View from '../../../../src/ol/View.js';
import * as _ol_extent_ from '../../../../src/ol/extent.js';
import {fromExtent as polygonFromExtent} from '../../../../src/ol/geom/Polygon.js';
import DragZoom from '../../../../src/ol/interaction/DragZoom.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_render_Box_ from '../../../../src/ol/render/Box.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -25,7 +25,7 @@ describe('ol.interaction.DragZoom', function() {
style.height = height + 'px';
document.body.appendChild(target);
source = new _ol_source_Vector_();
var layer = new _ol_layer_Vector_({source: source});
var layer = new VectorLayer({source: source});
map = new Map({
target: target,
layers: [layer],

4
test/spec/ol/interaction/draw.test.js
View File

@@ -14,7 +14,7 @@ import Point from '../../../../src/ol/geom/Point.js';
import Polygon from '../../../../src/ol/geom/Polygon.js';
import Draw from '../../../../src/ol/interaction/Draw.js';
import Interaction from '../../../../src/ol/interaction/Interaction.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -35,7 +35,7 @@ describe('ol.interaction.Draw', function() {
style.height = height + 'px';
document.body.appendChild(target);
source = new _ol_source_Vector_();
var layer = new _ol_layer_Vector_({source: source});
var layer = new VectorLayer({source: source});
map = new Map({
target: target,
layers: [layer],

4
test/spec/ol/interaction/modify.test.js
View File

@@ -10,7 +10,7 @@ import LineString from '../../../../src/ol/geom/LineString.js';
import Point from '../../../../src/ol/geom/Point.js';
import Polygon from '../../../../src/ol/geom/Polygon.js';
import _ol_interaction_Modify_ from '../../../../src/ol/interaction/Modify.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -45,7 +45,7 @@ describe('ol.interaction.Modify', function() {
features: features
});
var layer = new _ol_layer_Vector_({source: source});
var layer = new VectorLayer({source: source});
map = new Map({
target: target,

6
test/spec/ol/interaction/select.test.js
View File

@@ -7,7 +7,7 @@ import View from '../../../../src/ol/View.js';
import Polygon from '../../../../src/ol/geom/Polygon.js';
import Interaction from '../../../../src/ol/interaction/Interaction.js';
import _ol_interaction_Select_ from '../../../../src/ol/interaction/Select.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -57,7 +57,7 @@ describe('ol.interaction.Select', function() {
features: features
});
layer = new _ol_layer_Vector_({source: source});
layer = new VectorLayer({source: source});
map = new Map({
target: target,
@@ -357,7 +357,7 @@ describe('ol.interaction.Select', function() {
var layer_ = interaction.getLayer(feature);
expect(e.selected).to.have.length(1);
expect(feature).to.be.a(Feature);
expect(layer_).to.be.a(_ol_layer_Vector_);
expect(layer_).to.be.a(VectorLayer);
expect(layer_).to.equal(layer);
});
interaction.on('select', listenerSpy);

4
test/spec/ol/interaction/translate.test.js
View File

@@ -6,7 +6,7 @@ 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 Interaction from '../../../../src/ol/interaction/Interaction.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -33,7 +33,7 @@ describe('ol.interaction.Translate', function() {
geometry: new Point([20, -30])
})];
source.addFeatures(features);
var layer = new _ol_layer_Vector_({source: source});
var layer = new VectorLayer({source: source});
map = new Map({
target: target,
layers: [layer],

16
test/spec/ol/layer/vector.test.js
View File

@@ -1,5 +1,5 @@
import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -11,13 +11,13 @@ describe('ol.layer.Vector', function() {
var style = new _ol_style_Style_();
it('creates a new layer', function() {
var layer = new _ol_layer_Vector_({source: source});
expect(layer).to.be.a(_ol_layer_Vector_);
var layer = new VectorLayer({source: source});
expect(layer).to.be.a(VectorLayer);
expect(layer).to.be.a(_ol_layer_Layer_);
});
it('accepts a style option with a single style', function() {
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: source,
style: style
});
@@ -27,7 +27,7 @@ describe('ol.layer.Vector', function() {
});
it('accepts a style option with an array of styles', function() {
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: source,
style: [style]
});
@@ -37,7 +37,7 @@ describe('ol.layer.Vector', function() {
});
it('accepts a style option with a style function', function() {
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: source,
style: function(feature, resolution) {
return [style];
@@ -55,7 +55,7 @@ describe('ol.layer.Vector', function() {
var layer, style;
beforeEach(function() {
layer = new _ol_layer_Vector_({
layer = new VectorLayer({
source: new _ol_source_Vector_()
});
style = new _ol_style_Style_();
@@ -101,7 +101,7 @@ describe('ol.layer.Vector', function() {
var style = new _ol_style_Style_();
it('returns what is provided to setStyle', function() {
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: source
});

8
test/spec/ol/map.test.js
View File

@@ -11,7 +11,7 @@ import Interaction from '../../../src/ol/interaction/Interaction.js';
import MouseWheelZoom from '../../../src/ol/interaction/MouseWheelZoom.js';
import _ol_interaction_PinchZoom_ from '../../../src/ol/interaction/PinchZoom.js';
import TileLayer from '../../../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../src/ol/layer/Vector.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../../../src/ol/renderer/canvas/IntermediateCanvas.js';
import _ol_source_Vector_ from '../../../src/ol/source/Vector.js';
import _ol_source_XYZ_ from '../../../src/ol/source/XYZ.js';
@@ -195,7 +195,7 @@ describe('ol.Map', function() {
document.body.appendChild(target);
map = new Map({
target: target,
layers: [new _ol_layer_Vector_({
layers: [new VectorLayer({
source: new _ol_source_Vector_({
features: [new Feature(new LineString([[-50, 0], [50, 0]]))]
})
@@ -225,7 +225,7 @@ describe('ol.Map', function() {
it('returns an array of found features with declutter: true', function() {
var layer = map.getLayers().item(0);
map.removeLayer(layer);
var otherLayer = new _ol_layer_Vector_({
var otherLayer = new VectorLayer({
declutter: true,
source: layer.getSource()
});
@@ -237,7 +237,7 @@ describe('ol.Map', function() {
});
it('respects options', function() {
var otherLayer = new _ol_layer_Vector_({
var otherLayer = new VectorLayer({
source: new _ol_source_Vector_
});
map.addLayer(otherLayer);

8
test/spec/ol/renderer/canvas/map.test.js
View File

@@ -4,7 +4,7 @@ import Map from '../../../../../src/ol/Map.js';
import View from '../../../../../src/ol/View.js';
import Point from '../../../../../src/ol/geom/Point.js';
import TileLayer from '../../../../../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../../src/ol/layer/Vector.js';
import _ol_renderer_canvas_Layer_ from '../../../../../src/ol/renderer/canvas/Layer.js';
import CanvasMapRenderer from '../../../../../src/ol/renderer/canvas/Map.js';
import _ol_source_Vector_ from '../../../../../src/ol/source/Vector.js';
@@ -50,7 +50,7 @@ describe('ol.renderer.canvas.Map', function() {
};
img.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg==';
layer = new _ol_layer_Vector_({
layer = new VectorLayer({
source: new _ol_source_Vector_({
features: [
new Feature({
@@ -92,7 +92,7 @@ describe('ol.renderer.canvas.Map', function() {
it('calls callback with main layer when skipped feature on unmanaged layer', function() {
var feature = layer.getSource().getFeatures()[0];
var managedLayer = new _ol_layer_Vector_({
var managedLayer = new VectorLayer({
source: new _ol_source_Vector_({
features: [feature]
})
@@ -169,7 +169,7 @@ describe('ol.renderer.canvas.Map', function() {
beforeEach(function() {
map = new Map({});
map.on('postcompose', function() {});
layer = new _ol_layer_Vector_({
layer = new VectorLayer({
source: new _ol_source_Vector_({wrapX: true})
});
renderer = map.getRenderer();

16
test/spec/ol/renderer/canvas/vectorlayer.test.js
View File

@@ -4,7 +4,7 @@ import Map from '../../../../../src/ol/Map.js';
import View from '../../../../../src/ol/View.js';
import * as _ol_extent_ from '../../../../../src/ol/extent.js';
import Point from '../../../../../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../../src/ol/layer/Vector.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import {get as getProjection} from '../../../../../src/ol/proj.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
@@ -37,7 +37,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
it('creates a new instance', function() {
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: new _ol_source_Vector_()
});
var renderer = new CanvasVectorLayerRenderer(layer);
@@ -69,7 +69,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
var feature1 = new Feature(new Point([0, 0]));
var feature2 = new Feature(new Point([0, 0]));
feature2.setStyle(featureStyle);
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: new _ol_source_Vector_({
features: [feature1, feature2]
}),
@@ -101,7 +101,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
var feature = new Feature(new Point([0, 0]));
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: new _ol_source_Vector_({
features: [feature]
}),
@@ -132,7 +132,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
var feature = new Feature(new Point([0, 0]));
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: new _ol_source_Vector_({
features: [feature]
}),
@@ -164,7 +164,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
var feature = new Feature(new Point([0, 0]));
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: new _ol_source_Vector_({
features: [feature]
}),
@@ -185,7 +185,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
var layer, renderer;
beforeEach(function() {
layer = new _ol_layer_Vector_({
layer = new VectorLayer({
source: new _ol_source_Vector_()
});
renderer = new CanvasVectorLayerRenderer(layer);
@@ -222,7 +222,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
var frameState, projExtent, renderer, worldWidth, buffer;
beforeEach(function() {
var layer = new _ol_layer_Vector_({
var layer = new VectorLayer({
source: new _ol_source_Vector_({wrapX: true})
});
renderer = new CanvasVectorLayerRenderer(layer);

4
test/spec/ol/source/vector.test.js
View File

@@ -5,7 +5,7 @@ import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js';
import Point from '../../../../src/ol/geom/Point.js';
import LineString from '../../../../src/ol/geom/LineString.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import _ol_loadingstrategy_ from '../../../../src/ol/loadingstrategy.js';
import {get as getProjection, transformExtent, fromLonLat} from '../../../../src/ol/proj.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -441,7 +441,7 @@ describe('ol.source.Vector', function() {
var map = new Map({
target: div,
layers: [
new _ol_layer_Vector_({
new VectorLayer({
source: source
})
],