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

Linting

Browse Source
This commit is contained in:
Olivier Guyot
2019-05-14 19:14:12 +02:00
parent 9ca75e9d43
commit c705775d75
5 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/webgl/Layer.js
+9 -7
View File
@@ -83,9 +83,11 @@ export function pushFeatureInBuffer(vertexBuffer, indexBuffer, geojsonFeature, o
if (!geojsonFeature.geometry) { if (!geojsonFeature.geometry) {
return; return;
} }
switch(geojsonFeature.geometry.type) { switch (geojsonFeature.geometry.type) {
case "Point": case 'Point':
pushPointGeomInBuffer_(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes) pushPointGeomInBuffer_(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes);
return;
default:
return; return;
} }
} }
@@ -94,10 +96,10 @@ const tmpArray_ = [];
/** /**
* Pushes a quad (two triangles) based on a point geometry * Pushes a quad (two triangles) based on a point geometry
* @param vertexBuffer * @param {import("../../webgl/Buffer").default} vertexBuffer WebGL buffer
* @param indexBuffer * @param {import("../../webgl/Buffer").default} indexBuffer WebGL buffer
* @param geojsonFeature * @param {import("../../format/GeoJSON").GeoJSONFeature} geojsonFeature Feature
* @param opt_attributes * @param {Array<string>} [opt_attributes] Custom attributes
* @private * @private
*/ */
function pushPointGeomInBuffer_(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes) { function pushPointGeomInBuffer_(vertexBuffer, indexBuffer, geojsonFeature, opt_attributes) {
src/ol/renderer/webgl/PointsLayer.js
+1 -2
View File
@@ -12,7 +12,6 @@ import ViewHint from '../../ViewHint';
import {createEmpty, equals} from '../../extent'; import {createEmpty, equals} from '../../extent';
import { import {
create as createTransform, create as createTransform,
reset as resetTransform,
makeInverse as makeInverseTransform, makeInverse as makeInverseTransform,
multiply as multiplyTransform, multiply as multiplyTransform,
apply as applyTransform apply as applyTransform
@@ -350,7 +349,7 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
/** /**
* Rebuild internal webgl buffers based on current view extent; costly, should not be called too much * Rebuild internal webgl buffers based on current view extent; costly, should not be called too much
* @param {import("../../PluggableMap.js").FrameState} frameState * @param {import("../../PluggableMap").FrameState} frameState Frame state.
* @private * @private
*/ */
rebuildBuffers_(frameState) { rebuildBuffers_(frameState) {
test/spec/ol/renderer/webgl/layer.test.js
+21 -21
View File
@@ -9,18 +9,18 @@ describe('ol.renderer.webgl.Layer', function() {
let target; let target;
beforeEach(function () { beforeEach(function() {
target = document.createElement('div'); target = document.createElement('div');
target.style.width = '256px'; target.style.width = '256px';
target.style.height = '256px'; target.style.height = '256px';
document.body.appendChild(target); document.body.appendChild(target);
}); });
afterEach(function () { afterEach(function() {
document.body.removeChild(target); document.body.removeChild(target);
}); });
it('creates a new instance', function () { it('creates a new instance', function() {
const layer = new Layer({}); const layer = new Layer({});
const renderer = new WebGLLayerRenderer(layer); const renderer = new WebGLLayerRenderer(layer);
expect(renderer).to.be.a(WebGLLayerRenderer); expect(renderer).to.be.a(WebGLLayerRenderer);
@@ -31,17 +31,17 @@ describe('ol.renderer.webgl.Layer', function() {
describe('pushFeatureInBuffer', function() { describe('pushFeatureInBuffer', function() {
let vertexBuffer, indexBuffer; let vertexBuffer, indexBuffer;
beforeEach(function () { beforeEach(function() {
vertexBuffer = new WebGLArrayBuffer(); vertexBuffer = new WebGLArrayBuffer();
indexBuffer = new WebGLArrayBuffer(); indexBuffer = new WebGLArrayBuffer();
}); });
it('does nothing if the feature has no geometry', function() { it('does nothing if the feature has no geometry', function() {
const feature = { const feature = {
type: "Feature", type: 'Feature',
id: "AFG", id: 'AFG',
properties: { properties: {
color:[0.5, 1, 0.2, 0.7], color: [0.5, 1, 0.2, 0.7],
size: 3 size: 3
}, },
geometry: null geometry: null
@@ -53,15 +53,15 @@ describe('ol.renderer.webgl.Layer', function() {
it('adds two triangles with the correct attributes for a point geometry', function() { it('adds two triangles with the correct attributes for a point geometry', function() {
const feature = { const feature = {
type: "Feature", type: 'Feature',
id: "AFG", id: 'AFG',
properties: { properties: {
color:[0.5, 1, 0.2, 0.7], color: [0.5, 1, 0.2, 0.7],
size: 3 size: 3
}, },
geometry: { geometry: {
type: "Point", type: 'Point',
coordinates: [ -75, 47 ] coordinates: [-75, 47]
} }
}; };
const attributePerVertex = 12; const attributePerVertex = 12;
@@ -72,15 +72,15 @@ describe('ol.renderer.webgl.Layer', function() {
it('correctly sets indices & coordinates for several features', function() { it('correctly sets indices & coordinates for several features', function() {
const feature = { const feature = {
type: "Feature", type: 'Feature',
id: "AFG", id: 'AFG',
properties: { properties: {
color:[0.5, 1, 0.2, 0.7], color: [0.5, 1, 0.2, 0.7],
size: 3 size: 3
}, },
geometry: { geometry: {
type: "Point", type: 'Point',
coordinates: [ -75, 47 ] coordinates: [-75, 47]
} }
}; };
const attributePerVertex = 12; const attributePerVertex = 12;
@@ -110,8 +110,8 @@ describe('ol.renderer.webgl.Layer', function() {
it('correctly adds custom attributes', function() { it('correctly adds custom attributes', function() {
const feature = { const feature = {
type: "Feature", type: 'Feature',
id: "AFG", id: 'AFG',
properties: { properties: {
color: [0.5, 1, 0.2, 0.7], color: [0.5, 1, 0.2, 0.7],
custom: 4, custom: 4,
@@ -120,8 +120,8 @@ describe('ol.renderer.webgl.Layer', function() {
customString2: 'abc' customString2: 'abc'
}, },
geometry: { geometry: {
type: "Point", type: 'Point',
coordinates: [ -75, 47 ] coordinates: [-75, 47]
} }
}; };
const attributePerVertex = 16; const attributePerVertex = 16;
test/spec/ol/renderer/webgl/pointslayer.test.js
+3 -3
View File
@@ -15,18 +15,18 @@ describe('ol.renderer.webgl.PointsLayer', function() {
let target; let target;
beforeEach(function () { beforeEach(function() {
target = document.createElement('div'); target = document.createElement('div');
target.style.width = '256px'; target.style.width = '256px';
target.style.height = '256px'; target.style.height = '256px';
document.body.appendChild(target); document.body.appendChild(target);
}); });
afterEach(function () { afterEach(function() {
document.body.removeChild(target); document.body.removeChild(target);
}); });
it('creates a new instance', function () { it('creates a new instance', function() {
const layer = new VectorLayer({ const layer = new VectorLayer({
source: new VectorSource() source: new VectorSource()
}); });
test/spec/ol/webgl/helper.test.js
+1 -2
View File
@@ -1,7 +1,6 @@
import WebGLHelper from '../../../../src/ol/webgl/Helper'; import WebGLHelper from '../../../../src/ol/webgl/Helper';
import { import {
create as createTransform, create as createTransform,
multiply,
rotate as rotateTransform, rotate as rotateTransform,
scale as scaleTransform, translate as translateTransform scale as scaleTransform, translate as translateTransform
} from '../../../../src/ol/transform'; } from '../../../../src/ol/transform';
@@ -203,7 +202,7 @@ describe('ol.webgl.WebGLHelper', function() {
resolution: 2, resolution: 2,
center: [10, 20] center: [10, 20]
} }
} };
}); });
it('gives out the correct transform', function() { it('gives out the correct transform', function() {