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

Use named exports from ol/index.js

Browse Source
This commit is contained in:
Tim Schaub
2017-12-12 10:24:58 -07:00
parent fce644556b
commit 87295a74dd
250 changed files with 874 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
import _ol_ from '../../../../../src/ol/index.js';
import {getUid} from '../../../../../src/ol/index.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../../src/ol/Map.js';
import _ol_View_ from '../../../../../src/ol/View.js';
@@ -181,7 +181,7 @@ describe('ol.renderer.canvas.Map', function() {
layerRenderer.getImage = function() {
return null;
};
renderer.layerRenderers_[_ol_.getUid(layer)] = layerRenderer;
renderer.layerRenderers_[getUid(layer)] = layerRenderer;
});
});

10
test/spec/ol/renderer/canvas/replay.test.js
View File

@@ -1,4 +1,4 @@
import _ol_ from '../../../../../src/ol/index.js';
import {getUid} from '../../../../../src/ol/index.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_geom_GeometryCollection_ from '../../../../../src/ol/geom/GeometryCollection.js';
import _ol_geom_LineString_ from '../../../../../src/ol/geom/LineString.js';
@@ -139,7 +139,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
_ol_renderer_vector_.renderFeature(replay, feature2, style2, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style2, 1);
var skippedUids = {};
skippedUids[_ol_.getUid(feature1)] = true;
skippedUids[getUid(feature1)] = true;
replay.replay(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
@@ -151,7 +151,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
_ol_renderer_vector_.renderFeature(replay, feature2, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style2, 1);
var skippedUids = {};
skippedUids[_ol_.getUid(feature3)] = true;
skippedUids[getUid(feature3)] = true;
replay.replay(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
@@ -163,8 +163,8 @@ describe('ol.render.canvas.ReplayGroup', function() {
_ol_renderer_vector_.renderFeature(replay, feature2, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style2, 1);
var skippedUids = {};
skippedUids[_ol_.getUid(feature1)] = true;
skippedUids[_ol_.getUid(feature2)] = true;
skippedUids[getUid(feature1)] = true;
skippedUids[getUid(feature2)] = true;
replay.replay(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);

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

@@ -1,4 +1,4 @@
import _ol_ from '../../../../../src/ol/index.js';
import {getUid} from '../../../../../src/ol/index.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../../src/ol/Map.js';
import _ol_View_ from '../../../../../src/ol/View.js';
@@ -210,7 +210,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
rotation: 0
}
};
frameState.layerStates[_ol_.getUid(layer)] = {};
frameState.layerStates[getUid(layer)] = {};
renderer.forEachFeatureAtCoordinate(
coordinate, frameState, 0, spy, undefined);
expect(spy.callCount).to.be(1);

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

@@ -1,4 +1,4 @@
import _ol_ from '../../../../../src/ol/index.js';
import {getUid, inherits} from '../../../../../src/ol/index.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../../src/ol/Map.js';
@@ -66,7 +66,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
this.setProjection(_ol_proj_.get('EPSG:4326'));
tileCallback(this);
};
_ol_.inherits(TileClass, _ol_VectorTile_);
inherits(TileClass, _ol_VectorTile_);
source = new _ol_source_VectorTile_({
format: new _ol_format_MVT_(),
tileClass: TileClass,
@@ -305,7 +305,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
this.sourceTiles_[key] = sourceTile;
this.wrappedTileCoord = arguments[0];
};
_ol_.inherits(TileClass, _ol_VectorImageTile_);
inherits(TileClass, _ol_VectorImageTile_);
beforeEach(function() {
replayGroup = {};
@@ -336,7 +336,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
rotation: 0
}
};
frameState.layerStates[_ol_.getUid(layer)] = {};
frameState.layerStates[getUid(layer)] = {};
renderer.renderedTiles = [new TileClass([0, 0, -1])];
renderer.forEachFeatureAtCoordinate(
coordinate, frameState, 0, spy, undefined);