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

Rename _ol_VectorImageTile_ to VectorImageTile

Browse Source
This commit is contained in:
Frederic Junod
2017-12-22 09:03:41 +01:00
parent 085fddcb36
commit c46aec3196
6 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ import _ol_obj_ from '../../../../../src/ol/obj.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import Map from '../../../../../src/ol/Map.js';
import TileState from '../../../../../src/ol/TileState.js';
import _ol_VectorImageTile_ from '../../../../../src/ol/VectorImageTile.js';
import VectorImageTile from '../../../../../src/ol/VectorImageTile.js';
import _ol_VectorTile_ from '../../../../../src/ol/VectorTile.js';
import _ol_View_ from '../../../../../src/ol/View.js';
import * as _ol_extent_ from '../../../../../src/ol/extent.js';
@@ -251,7 +251,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
sourceTile.getImage = function() {
return document.createElement('canvas');
};
var tile = new _ol_VectorImageTile_([0, 0, 0]);
var tile = new VectorImageTile([0, 0, 0]);
tile.transition_ = 0;
tile.wrappedTileCoord = [0, 0, 0];
tile.setState(TileState.LOADED);
@@ -291,7 +291,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
describe('#forEachFeatureAtCoordinate', function() {
var layer, renderer, replayGroup;
var TileClass = function() {
_ol_VectorImageTile_.apply(this, arguments);
VectorImageTile.apply(this, arguments);
this.setState('loaded');
var sourceTile = new _ol_VectorTile_([0, 0, 0]);
sourceTile.setProjection(getProjection('EPSG:3857'));
@@ -304,7 +304,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
this.sourceTiles_[key] = sourceTile;
this.wrappedTileCoord = arguments[0];
};
inherits(TileClass, _ol_VectorImageTile_);
inherits(TileClass, VectorImageTile);
beforeEach(function() {
replayGroup = {};

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

@@ -1,6 +1,6 @@
import Map from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_VectorImageTile_ from '../../../../src/ol/VectorImageTile.js';
import VectorImageTile from '../../../../src/ol/VectorImageTile.js';
import _ol_VectorTile_ from '../../../../src/ol/VectorTile.js';
import MVT from '../../../../src/ol/format/MVT.js';
import _ol_layer_VectorTile_ from '../../../../src/ol/layer/VectorTile.js';
@@ -38,7 +38,7 @@ describe('ol.source.VectorTile', function() {
describe('#getTile()', function() {
it('creates a tile with the correct tile class', function() {
tile = source.getTile(0, 0, 0, 1, getProjection('EPSG:3857'));
expect(tile).to.be.a(_ol_VectorImageTile_);
expect(tile).to.be.a(VectorImageTile);
});
it('sets the correct tileCoord on the created tile', function() {
expect(tile.getTileCoord()).to.eql([0, 0, 0]);

30
test/spec/ol/vectorimagetile.test.js
View File

@@ -1,5 +1,5 @@
import TileState from '../../../src/ol/TileState.js';
import _ol_VectorImageTile_ from '../../../src/ol/VectorImageTile.js';
import VectorImageTile from '../../../src/ol/VectorImageTile.js';
import _ol_VectorTile_ from '../../../src/ol/VectorTile.js';
import _ol_events_ from '../../../src/ol/events.js';
import GeoJSON from '../../../src/ol/format/GeoJSON.js';
@@ -13,8 +13,8 @@ describe('ol.VectorImageTile', function() {
it('configures loader that sets features on the source tile', function(done) {
var format = new GeoJSON();
var url = 'spec/ol/data/point.json';
var tile = new _ol_VectorImageTile_([0, 0, -1], 0, url, format,
_ol_VectorImageTile_.defaultLoadFunction, [0, 0, -1], function() {
var tile = new VectorImageTile([0, 0, -1], 0, url, format,
VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {
return url;
}, _ol_tilegrid_.createXYZ(), _ol_tilegrid_.createXYZ(), {},
1, getProjection('EPSG:3857'), _ol_VectorTile_, function() {});
@@ -34,10 +34,10 @@ describe('ol.VectorImageTile', function() {
var format = new GeoJSON();
var url = 'spec/ol/data/unavailable.json';
var sourceTile;
var tile = new _ol_VectorImageTile_([0, 0, 0] /* one world away */, 0, url, format,
var tile = new VectorImageTile([0, 0, 0] /* one world away */, 0, url, format,
function(tile, url) {
sourceTile = tile;
_ol_VectorImageTile_.defaultLoadFunction(tile, url);
VectorImageTile.defaultLoadFunction(tile, url);
}, [0, 0, -1], function() {
return url;
}, _ol_tilegrid_.createXYZ(), _ol_tilegrid_.createXYZ(), {},
@@ -61,8 +61,8 @@ describe('ol.VectorImageTile', function() {
it('sets ERROR state when source tiles fail to load', function(done) {
var format = new GeoJSON();
var url = 'spec/ol/data/unavailable.json';
var tile = new _ol_VectorImageTile_([0, 0, -1], 0, url, format,
_ol_VectorImageTile_.defaultLoadFunction, [0, 0, -1], function() {
var tile = new VectorImageTile([0, 0, -1], 0, url, format,
VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {
return url;
}, _ol_tilegrid_.createXYZ(), _ol_tilegrid_.createXYZ(), {},
1, getProjection('EPSG:3857'), _ol_VectorTile_, function() {});
@@ -78,8 +78,8 @@ describe('ol.VectorImageTile', function() {
it('sets EMPTY state when tile has only empty source tiles', function(done) {
var format = new GeoJSON();
var url = '';
var tile = new _ol_VectorImageTile_([0, 0, -1], 0, url, format,
_ol_VectorImageTile_.defaultLoadFunction, [0, 0, -1], function() {},
var tile = new VectorImageTile([0, 0, -1], 0, url, format,
VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {},
_ol_tilegrid_.createXYZ(), _ol_tilegrid_.createXYZ(), {},
1, getProjection('EPSG:3857'), _ol_VectorTile_, function() {});
@@ -100,8 +100,8 @@ describe('ol.VectorImageTile', function() {
extent: [-88, 35, -87, 36]
});
var sourceTiles = {};
var tile = new _ol_VectorImageTile_([1, 0, -1], 0, url, format,
_ol_VectorImageTile_.defaultLoadFunction, [1, 0, -1], function(zxy) {
var tile = new VectorImageTile([1, 0, -1], 0, url, format,
VectorImageTile.defaultLoadFunction, [1, 0, -1], function(zxy) {
return url;
}, tileGrid,
_ol_tilegrid_.createXYZ({extent: [-180, -90, 180, 90], tileSize: 512}),
@@ -114,8 +114,8 @@ describe('ol.VectorImageTile', function() {
it('#dispose() while loading', function() {
var format = new GeoJSON();
var url = 'spec/ol/data/point.json';
var tile = new _ol_VectorImageTile_([0, 0, 0] /* one world away */, 0, url, format,
_ol_VectorImageTile_.defaultLoadFunction, [0, 0, -1], function() {
var tile = new VectorImageTile([0, 0, 0] /* one world away */, 0, url, format,
VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {
return url;
}, _ol_tilegrid_.createXYZ(), _ol_tilegrid_.createXYZ({tileSize: 512}), {},
1, getProjection('EPSG:3857'), _ol_VectorTile_, function() {});
@@ -134,8 +134,8 @@ describe('ol.VectorImageTile', function() {
it('#dispose() when loaded', function(done) {
var format = new GeoJSON();
var url = 'spec/ol/data/point.json';
var tile = new _ol_VectorImageTile_([0, 0, -1], 0, url, format,
_ol_VectorImageTile_.defaultLoadFunction, [0, 0, -1], function() {
var tile = new VectorImageTile([0, 0, -1], 0, url, format,
VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {
return url;
}, _ol_tilegrid_.createXYZ(), _ol_tilegrid_.createXYZ({tileSize: 512}), {},
1, getProjection('EPSG:3857'), _ol_VectorTile_, function() {});

4
test/spec/ol/vectortile.test.js
View File

@@ -1,5 +1,5 @@
import _ol_Feature_ from '../../../src/ol/Feature.js';
import _ol_VectorImageTile_ from '../../../src/ol/VectorImageTile.js';
import VectorImageTile from '../../../src/ol/VectorImageTile.js';
import _ol_VectorTile_ from '../../../src/ol/VectorTile.js';
import _ol_events_ from '../../../src/ol/events.js';
import TextFeature from '../../../src/ol/format/TextFeature.js';
@@ -25,7 +25,7 @@ describe('ol.VectorTile', function() {
var tile = new _ol_VectorTile_([0, 0, 0], null, null, format);
var url = 'spec/ol/data/point.json';
_ol_VectorImageTile_.defaultLoadFunction(tile, url);
VectorImageTile.defaultLoadFunction(tile, url);
var loader = tile.loader_;
_ol_events_.listen(tile, 'change', function(e) {
expect(tile.getFeatures().length).to.be.greaterThan(0);