Make code prettier
This updates ESLint and our shared eslint-config-openlayers to use Prettier. Most formatting changes were automatically applied with this:
npm run lint -- --fix
A few manual changes were required:
* In `examples/offscreen-canvas.js`, the `//eslint-disable-line` comment needed to be moved to the appropriate line to disable the error about the `'worker-loader!./offscreen-canvas.worker.js'` import.
* In `examples/webpack/exapmle-builder.js`, spaces could not be added after a couple `function`s for some reason. While editing this, I reworked `ExampleBuilder` to be a class.
* In `src/ol/format/WMSGetFeatureInfo.js`, the `// @ts-ignore` comment needed to be moved down one line so it applied to the `parsersNS` argument.
This commit is contained in:
Tim Schaub
@@ -2,27 +2,23 @@ import Source from '../../../../src/ol/source/Source.js';
|
||||
import TileJSON from '../../../../src/ol/source/TileJSON.js';
|
||||
import {unByKey} from '../../../../src/ol/Observable.js';
|
||||
|
||||
|
||||
describe('ol.source.TileJSON', function() {
|
||||
|
||||
describe('constructor', function() {
|
||||
|
||||
it('returns a tileJSON source', function() {
|
||||
describe('ol.source.TileJSON', function () {
|
||||
describe('constructor', function () {
|
||||
it('returns a tileJSON source', function () {
|
||||
const source = new TileJSON({
|
||||
url: 'spec/ol/data/tilejson.json'
|
||||
url: 'spec/ol/data/tilejson.json',
|
||||
});
|
||||
expect(source).to.be.a(Source);
|
||||
expect(source).to.be.a(TileJSON);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#getTileJSON', function() {
|
||||
|
||||
it('parses the tilejson file', function() {
|
||||
describe('#getTileJSON', function () {
|
||||
it('parses the tilejson file', function () {
|
||||
const source = new TileJSON({
|
||||
url: 'spec/ol/data/tilejson.json'
|
||||
url: 'spec/ol/data/tilejson.json',
|
||||
});
|
||||
source.on('change', function() {
|
||||
source.on('change', function () {
|
||||
if (source.getState() === 'ready') {
|
||||
const tileJSON = source.getTileJSON();
|
||||
expect(tileJSON.name).to.eql('Geography Class');
|
||||
@@ -31,22 +27,15 @@ describe('ol.source.TileJSON', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it ('parses inline TileJSON', function() {
|
||||
it('parses inline TileJSON', function () {
|
||||
const tileJSON = {
|
||||
bounds: [
|
||||
-180,
|
||||
-85.05112877980659,
|
||||
180,
|
||||
85.05112877980659
|
||||
],
|
||||
center: [
|
||||
0,
|
||||
0,
|
||||
4
|
||||
],
|
||||
bounds: [-180, -85.05112877980659, 180, 85.05112877980659],
|
||||
center: [0, 0, 4],
|
||||
created: 1322764050886,
|
||||
description: 'One of the example maps that comes with TileMill - a bright & colorful world map that blends retro and high-tech with its folded paper texture and interactive flag tooltips. ',
|
||||
download: 'https://a.tiles.mapbox.com/v3/mapbox.geography-class.mbtiles',
|
||||
description:
|
||||
'One of the example maps that comes with TileMill - a bright & colorful world map that blends retro and high-tech with its folded paper texture and interactive flag tooltips. ',
|
||||
download:
|
||||
'https://a.tiles.mapbox.com/v3/mapbox.geography-class.mbtiles',
|
||||
embed: 'https://a.tiles.mapbox.com/v3/mapbox.geography-class.html',
|
||||
id: 'mapbox.geography-class',
|
||||
mapbox_logo: true,
|
||||
@@ -60,66 +49,74 @@ describe('ol.source.TileJSON', function() {
|
||||
'https://a.tiles.mapbox.com/v3/mapbox.geography-class/{z}/{x}/{y}.png',
|
||||
'https://b.tiles.mapbox.com/v3/mapbox.geography-class/{z}/{x}/{y}.png',
|
||||
'https://c.tiles.mapbox.com/v3/mapbox.geography-class/{z}/{x}/{y}.png',
|
||||
'https://d.tiles.mapbox.com/v3/mapbox.geography-class/{z}/{x}/{y}.png'
|
||||
'https://d.tiles.mapbox.com/v3/mapbox.geography-class/{z}/{x}/{y}.png',
|
||||
],
|
||||
version: '1.0.0',
|
||||
webpage: 'https://a.tiles.mapbox.com/v3/mapbox.geography-class/page.html'
|
||||
webpage:
|
||||
'https://a.tiles.mapbox.com/v3/mapbox.geography-class/page.html',
|
||||
};
|
||||
const source = new TileJSON({
|
||||
tileJSON: tileJSON
|
||||
tileJSON: tileJSON,
|
||||
});
|
||||
expect(source.getState()).to.be('ready');
|
||||
expect(source.getTileUrlFunction()([0, 0, 0])).to.be('https://a.tiles.mapbox.com/v3/mapbox.geography-class/0/0/0.png');
|
||||
expect(source.getTileUrlFunction()([1, 0, 0])).to.be('https://a.tiles.mapbox.com/v3/mapbox.geography-class/1/0/0.png');
|
||||
expect(source.getTileUrlFunction()([1, 0, 1])).to.be('https://b.tiles.mapbox.com/v3/mapbox.geography-class/1/0/1.png');
|
||||
expect(source.getTileUrlFunction()([1, 1, 0])).to.be('https://c.tiles.mapbox.com/v3/mapbox.geography-class/1/1/0.png');
|
||||
expect(source.getTileUrlFunction()([1, 1, 1])).to.be('https://d.tiles.mapbox.com/v3/mapbox.geography-class/1/1/1.png');
|
||||
expect(source.getTileUrlFunction()([0, 0, 0])).to.be(
|
||||
'https://a.tiles.mapbox.com/v3/mapbox.geography-class/0/0/0.png'
|
||||
);
|
||||
expect(source.getTileUrlFunction()([1, 0, 0])).to.be(
|
||||
'https://a.tiles.mapbox.com/v3/mapbox.geography-class/1/0/0.png'
|
||||
);
|
||||
expect(source.getTileUrlFunction()([1, 0, 1])).to.be(
|
||||
'https://b.tiles.mapbox.com/v3/mapbox.geography-class/1/0/1.png'
|
||||
);
|
||||
expect(source.getTileUrlFunction()([1, 1, 0])).to.be(
|
||||
'https://c.tiles.mapbox.com/v3/mapbox.geography-class/1/1/0.png'
|
||||
);
|
||||
expect(source.getTileUrlFunction()([1, 1, 1])).to.be(
|
||||
'https://d.tiles.mapbox.com/v3/mapbox.geography-class/1/1/1.png'
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#getState', function() {
|
||||
|
||||
it('returns error on HTTP 404', function() {
|
||||
describe('#getState', function () {
|
||||
it('returns error on HTTP 404', function () {
|
||||
const source = new TileJSON({
|
||||
url: 'invalid.jsonp'
|
||||
url: 'invalid.jsonp',
|
||||
});
|
||||
source.on('change', function() {
|
||||
source.on('change', function () {
|
||||
expect(source.getState()).to.eql('error');
|
||||
expect(source.getTileJSON()).to.eql(null);
|
||||
});
|
||||
});
|
||||
|
||||
it('returns error on CORS issues', function() {
|
||||
it('returns error on CORS issues', function () {
|
||||
const source = new TileJSON({
|
||||
url: 'http://example.com'
|
||||
url: 'http://example.com',
|
||||
});
|
||||
source.on('change', function() {
|
||||
source.on('change', function () {
|
||||
expect(source.getState()).to.eql('error');
|
||||
expect(source.getTileJSON()).to.eql(null);
|
||||
});
|
||||
});
|
||||
|
||||
it('returns error on JSON parsing issues', function() {
|
||||
it('returns error on JSON parsing issues', function () {
|
||||
const source = new TileJSON({
|
||||
url: '/'
|
||||
url: '/',
|
||||
});
|
||||
source.on('change', function() {
|
||||
source.on('change', function () {
|
||||
expect(source.getState()).to.eql('error');
|
||||
expect(source.getTileJSON()).to.eql(null);
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('tileUrlFunction', function() {
|
||||
|
||||
describe('tileUrlFunction', function () {
|
||||
let source, tileGrid;
|
||||
|
||||
beforeEach(function(done) {
|
||||
beforeEach(function (done) {
|
||||
source = new TileJSON({
|
||||
url: 'spec/ol/data/tilejson.json'
|
||||
url: 'spec/ol/data/tilejson.json',
|
||||
});
|
||||
const key = source.on('change', function() {
|
||||
const key = source.on('change', function () {
|
||||
if (source.getState() === 'ready') {
|
||||
unByKey(key);
|
||||
tileGrid = source.getTileGrid();
|
||||
@@ -128,42 +125,45 @@ describe('ol.source.TileJSON', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it('uses the correct tile coordinates', function() {
|
||||
|
||||
it('uses the correct tile coordinates', function () {
|
||||
const coordinate = [829330.2064098881, 5933916.615134273];
|
||||
const regex = /\/([0-9]*\/[0-9]*\/[0-9]*)\.png$/;
|
||||
let tileUrl;
|
||||
|
||||
tileUrl = source.tileUrlFunction(
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 0));
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 0)
|
||||
);
|
||||
expect(tileUrl.match(regex)[1]).to.eql('0/0/0');
|
||||
|
||||
tileUrl = source.tileUrlFunction(
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 1));
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 1)
|
||||
);
|
||||
expect(tileUrl.match(regex)[1]).to.eql('1/1/0');
|
||||
|
||||
tileUrl = source.tileUrlFunction(
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 2));
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 2)
|
||||
);
|
||||
expect(tileUrl.match(regex)[1]).to.eql('2/2/1');
|
||||
|
||||
tileUrl = source.tileUrlFunction(
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 3));
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 3)
|
||||
);
|
||||
expect(tileUrl.match(regex)[1]).to.eql('3/4/2');
|
||||
|
||||
tileUrl = source.tileUrlFunction(
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 4));
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 4)
|
||||
);
|
||||
expect(tileUrl.match(regex)[1]).to.eql('4/8/5');
|
||||
|
||||
tileUrl = source.tileUrlFunction(
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 5));
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 5)
|
||||
);
|
||||
expect(tileUrl.match(regex)[1]).to.eql('5/16/11');
|
||||
|
||||
tileUrl = source.tileUrlFunction(
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 6));
|
||||
tileGrid.getTileCoordForCoordAndZ(coordinate, 6)
|
||||
);
|
||||
expect(tileUrl.match(regex)[1]).to.eql('6/33/22');
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user