Named exports from ol/proj

This commit is contained in:
Tim Schaub
2017-12-13 22:14:27 -07:00
committed by Andreas Hocevar
parent fab77e8d37
commit 6f72ffe498
127 changed files with 853 additions and 882 deletions

View File

@@ -1,7 +1,7 @@
import _ol_Map_ from '../../../../../src/ol/Map.js';
import _ol_View_ from '../../../../../src/ol/View.js';
import _ol_layer_Tile_ from '../../../../../src/ol/layer/Tile.js';
import _ol_proj_ from '../../../../../src/ol/proj.js';
import {get as getProjection} from '../../../../../src/ol/proj.js';
import _ol_renderer_Map_ from '../../../../../src/ol/renderer/Map.js';
import _ol_renderer_canvas_TileLayer_ from '../../../../../src/ol/renderer/canvas/TileLayer.js';
import _ol_source_TileWMS_ from '../../../../../src/ol/source/TileWMS.js';
@@ -82,7 +82,7 @@ describe('ol.renderer.canvas.TileLayer', function() {
time: Date.now(),
viewState: {
center: [10, 5],
projection: _ol_proj_.get('EPSG:3857'),
projection: getProjection('EPSG:3857'),
resolution: 1,
rotation: Math.PI
},

View File

@@ -6,7 +6,7 @@ import * as _ol_extent_ from '../../../../../src/ol/extent.js';
import _ol_geom_Point_ from '../../../../../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import _ol_proj_ from '../../../../../src/ol/proj.js';
import {get as getProjection} from '../../../../../src/ol/proj.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
import _ol_renderer_canvas_VectorLayer_ from '../../../../../src/ol/renderer/canvas/VectorLayer.js';
import _ol_source_Vector_ from '../../../../../src/ol/source/Vector.js';
@@ -226,7 +226,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
source: new _ol_source_Vector_({wrapX: true})
});
renderer = new _ol_renderer_canvas_VectorLayer_(layer);
var projection = _ol_proj_.get('EPSG:3857');
var projection = getProjection('EPSG:3857');
projExtent = projection.getExtent();
worldWidth = _ol_extent_.getWidth(projExtent);
buffer = layer.getRenderBuffer();

View File

@@ -10,7 +10,7 @@ import * as _ol_extent_ from '../../../../../src/ol/extent.js';
import _ol_format_MVT_ from '../../../../../src/ol/format/MVT.js';
import _ol_geom_Point_ from '../../../../../src/ol/geom/Point.js';
import _ol_layer_VectorTile_ from '../../../../../src/ol/layer/VectorTile.js';
import _ol_proj_ from '../../../../../src/ol/proj.js';
import {get as getProjection, fromLonLat} from '../../../../../src/ol/proj.js';
import _ol_proj_Projection_ from '../../../../../src/ol/proj/Projection.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
import _ol_render_Feature_ from '../../../../../src/ol/render/Feature.js';
@@ -63,7 +63,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
_ol_VectorTile_.apply(this, arguments);
this.setState('loaded');
this.setFeatures([feature1, feature2, feature3]);
this.setProjection(_ol_proj_.get('EPSG:4326'));
this.setProjection(getProjection('EPSG:4326'));
tileCallback(this);
};
inherits(TileClass, _ol_VectorTile_);
@@ -196,9 +196,8 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
tile = t;
};
map.renderSync();
expect(tile.getProjection()).to.equal(_ol_proj_.get('EPSG:3857'));
expect(feature1.getGeometry().getCoordinates()).to.eql(
_ol_proj_.fromLonLat([1, -1]));
expect(tile.getProjection()).to.equal(getProjection('EPSG:3857'));
expect(feature1.getGeometry().getCoordinates()).to.eql(fromLonLat([1, -1]));
});
it('Geometries are transformed from tile-pixels', function() {
@@ -209,7 +208,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
tile = t;
};
map.renderSync();
expect(tile.getProjection()).to.equal(_ol_proj_.get('EPSG:3857'));
expect(tile.getProjection()).to.equal(getProjection('EPSG:3857'));
expect(feature1.getGeometry().getCoordinates()).to.eql([-20027724.40316874, 20047292.282409746]);
expect(feature3.flatCoordinates_).to.eql([-20027724.40316874, 20047292.282409746]);
});
@@ -247,7 +246,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
})
});
var sourceTile = new _ol_VectorTile_([0, 0, 0], 2);
sourceTile.setProjection(_ol_proj_.get('EPSG:3857'));
sourceTile.setProjection(getProjection('EPSG:3857'));
sourceTile.features_ = [];
sourceTile.getImage = function() {
return document.createElement('canvas');
@@ -264,7 +263,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
};
var renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
renderer.renderTileImage_ = sinon.spy();
var proj = _ol_proj_.get('EPSG:3857');
var proj = getProjection('EPSG:3857');
var frameState = {
extent: proj.getExtent(),
pixelRatio: 1,
@@ -295,7 +294,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
_ol_VectorImageTile_.apply(this, arguments);
this.setState('loaded');
var sourceTile = new _ol_VectorTile_([0, 0, 0]);
sourceTile.setProjection(_ol_proj_.get('EPSG:3857'));
sourceTile.setProjection(getProjection('EPSG:3857'));
sourceTile.getReplayGroup = function() {
return replayGroup;
};
@@ -331,7 +330,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
layerStates: {},
skippedFeatureUids: {},
viewState: {
projection: _ol_proj_.get('EPSG:3857'),
projection: getProjection('EPSG:3857'),
resolution: 1,
rotation: 0
}