From cd647a1ebcae91cc6a2eb72605b51405489aa555 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Oct 2013 13:27:18 -0600 Subject: [PATCH 1/4] Removing example --- examples/ten-thousand-points.html | 54 ---------------------- examples/ten-thousand-points.js | 77 ------------------------------- 2 files changed, 131 deletions(-) delete mode 100644 examples/ten-thousand-points.html delete mode 100644 examples/ten-thousand-points.js diff --git a/examples/ten-thousand-points.html b/examples/ten-thousand-points.html deleted file mode 100644 index e65352fef5..0000000000 --- a/examples/ten-thousand-points.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - Ten thousand points example - - - -
-
-
- OpenLayers 3 Examples -
-
-
- -
- -
-
-
- - -
-
- -
- -
-

Ten thousand points example

-

Example of a map with ten thousand points.

-
-

See the ten-thousand-points.js source to see how this is done.

-
-
points, vector, openstreetmap
-
- -
- -
- - - - - - diff --git a/examples/ten-thousand-points.js b/examples/ten-thousand-points.js deleted file mode 100644 index 58f59f1bcb..0000000000 --- a/examples/ten-thousand-points.js +++ /dev/null @@ -1,77 +0,0 @@ -goog.require('ol.Map'); -goog.require('ol.RendererHint'); -goog.require('ol.View2D'); -goog.require('ol.control'); -goog.require('ol.control.MousePosition'); -goog.require('ol.geom2.LineStringCollection'); -goog.require('ol.geom2.PointCollection'); -goog.require('ol.layer.Tile'); -goog.require('ol.layer.Vector2'); -goog.require('ol.source.OSM'); -goog.require('ol.source.Vector2'); -goog.require('ol.webgl'); - - -// WARNING -// This example is an experimental testbed for WebGL vector work. The function -// calls used here are internal and low-level and are not representative of the -// final API. - -if (!ol.webgl.SUPPORTED) { - var info = document.getElementById('no-webgl'); - /** - * display error message - */ - info.style.display = ''; -} else { - - var pointCollection = ol.geom2.PointCollection.createEmpty(101 * 101); - var i, j, x, y; - for (i = 0; i < 101; ++i) { - for (j = 0; j < 101; ++j) { - x = 20000000 * (i - 50) / 50; - y = 20000000 * (j - 50) / 50; - pointCollection.add([x, y]); - } - } - - var k = 1000000; - var lineStringCollection = ol.geom2.LineStringCollection.pack([ - [[-20 * k, -20 * k], [20 * k, 20 * k]], - [[-20 * k, 20 * k], [20 * k, -20 * k]], - [[0 * k, 15 * k], - [10 * k, 5 * k], - [5 * k, 5 * k], - [5 * k, -15 * k], - [-5 * k, -15 * k], - [-5 * k, 5 * k], - [-10 * k, 5 * k], - [0 * k, 15 * k]] - ]); - - var map = new ol.Map({ - controls: ol.control.defaults().extend([ - new ol.control.MousePosition({ - undefinedHTML: ' ' - }) - ]), - layers: [ - new ol.layer.Tile({ - source: new ol.source.OSM() - }), - new ol.layer.Vector2({ - source: new ol.source.Vector2({ - lineStringCollections: [lineStringCollection], - projection: 'EPSG:3857', - pointCollections: [pointCollection] - }) - }) - ], - renderer: ol.RendererHint.WEBGL, - target: 'map', - view: new ol.View2D({ - center: [0, 0], - zoom: 0 - }) - }); -} From 75b40a60c087eb59f6455ea36ecb236b9787f148 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Oct 2013 14:12:04 -0600 Subject: [PATCH 2/4] Remove ol.layer.Vector2 and associated renderer --- src/ol/layer/vectorlayer2.exports | 1 - src/ol/layer/vectorlayer2.js | 26 --- src/ol/renderer/webgl/webglmaprenderer.js | 4 - ...webglvectorlayer2linestringcollection.glsl | 19 -- ...lvectorlayer2linestringcollectionshader.js | 102 -------- .../webglvectorlayer2pointcollection.glsl | 21 -- .../webglvectorlayer2pointcollectionshader.js | 108 --------- .../webgl/webglvectorlayer2renderer.js | 219 ------------------ 8 files changed, 500 deletions(-) delete mode 100644 src/ol/layer/vectorlayer2.exports delete mode 100644 src/ol/layer/vectorlayer2.js delete mode 100644 src/ol/renderer/webgl/webglvectorlayer2linestringcollection.glsl delete mode 100644 src/ol/renderer/webgl/webglvectorlayer2linestringcollectionshader.js delete mode 100644 src/ol/renderer/webgl/webglvectorlayer2pointcollection.glsl delete mode 100644 src/ol/renderer/webgl/webglvectorlayer2pointcollectionshader.js delete mode 100644 src/ol/renderer/webgl/webglvectorlayer2renderer.js diff --git a/src/ol/layer/vectorlayer2.exports b/src/ol/layer/vectorlayer2.exports deleted file mode 100644 index 576bf755fd..0000000000 --- a/src/ol/layer/vectorlayer2.exports +++ /dev/null @@ -1 +0,0 @@ -@exportSymbol ol.layer.Vector2 diff --git a/src/ol/layer/vectorlayer2.js b/src/ol/layer/vectorlayer2.js deleted file mode 100644 index cdfeb4bac4..0000000000 --- a/src/ol/layer/vectorlayer2.js +++ /dev/null @@ -1,26 +0,0 @@ -goog.provide('ol.layer.Vector2'); - -goog.require('ol.layer.Layer'); -goog.require('ol.source.Vector2'); - - - -/** - * This is an internal class that will be removed from the API. - * @constructor - * @extends {ol.layer.Layer} - * @param {ol.layer.LayerOptions} options Options. - * @todo stability experimental - */ -ol.layer.Vector2 = function(options) { - goog.base(this, options); -}; -goog.inherits(ol.layer.Vector2, ol.layer.Layer); - - -/** - * @return {ol.source.Vector2} Source. - */ -ol.layer.Vector2.prototype.getVectorSource = function() { - return /** @type {ol.source.Vector2} */ (this.getSource()); -}; diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index dec0d82d38..9ddf72163a 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -19,11 +19,9 @@ goog.require('ol.Tile'); goog.require('ol.css'); goog.require('ol.layer.Image'); goog.require('ol.layer.Tile'); -goog.require('ol.layer.Vector2'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.webgl.ImageLayer'); goog.require('ol.renderer.webgl.TileLayer'); -goog.require('ol.renderer.webgl.VectorLayer2'); goog.require('ol.renderer.webgl.map.shader.Color'); goog.require('ol.renderer.webgl.map.shader.Default'); goog.require('ol.size'); @@ -305,8 +303,6 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) { return new ol.renderer.webgl.TileLayer(this, layer); } else if (layer instanceof ol.layer.Image) { return new ol.renderer.webgl.ImageLayer(this, layer); - } else if (layer instanceof ol.layer.Vector2) { - return new ol.renderer.webgl.VectorLayer2(this, layer); } else { goog.asserts.fail(); return null; diff --git a/src/ol/renderer/webgl/webglvectorlayer2linestringcollection.glsl b/src/ol/renderer/webgl/webglvectorlayer2linestringcollection.glsl deleted file mode 100644 index 0877de55b1..0000000000 --- a/src/ol/renderer/webgl/webglvectorlayer2linestringcollection.glsl +++ /dev/null @@ -1,19 +0,0 @@ -//! NAMESPACE=ol.renderer.webgl.vectorlayer2.shader.LineStringCollection -//! CLASS=ol.renderer.webgl.vectorlayer2.shader.LineStringCollection - - -//! VERTEX -attribute vec2 a_position; -uniform mat4 u_modelViewMatrix; - -void main(void) { - gl_Position = u_modelViewMatrix * vec4(a_position, 0., 1.); -} - - -//! FRAGMENT -uniform vec4 u_color; - -void main(void) { - gl_FragColor = u_color; -} diff --git a/src/ol/renderer/webgl/webglvectorlayer2linestringcollectionshader.js b/src/ol/renderer/webgl/webglvectorlayer2linestringcollectionshader.js deleted file mode 100644 index 9f08d99191..0000000000 --- a/src/ol/renderer/webgl/webglvectorlayer2linestringcollectionshader.js +++ /dev/null @@ -1,102 +0,0 @@ -// This file is automatically generated, do not edit -goog.provide('ol.renderer.webgl.vectorlayer2.shader.LineStringCollection'); - -goog.require('ol.webgl.shader'); - - - -/** - * @constructor - * @extends {ol.webgl.shader.Fragment} - */ -ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionFragment = function() { - goog.base(this, ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionFragment.SOURCE); -}; -goog.inherits(ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionFragment, ol.webgl.shader.Fragment); -goog.addSingletonGetter(ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionFragment); - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionFragment.DEBUG_SOURCE = 'precision mediump float;\nuniform vec4 u_color;\n\nvoid main(void) {\n gl_FragColor = u_color;\n}\n'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionFragment.OPTIMIZED_SOURCE = 'precision mediump float;uniform vec4 c;void main(void){gl_FragColor=c;}'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionFragment.SOURCE = goog.DEBUG ? - ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionFragment.DEBUG_SOURCE : - ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionFragment.OPTIMIZED_SOURCE; - - - -/** - * @constructor - * @extends {ol.webgl.shader.Vertex} - */ -ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionVertex = function() { - goog.base(this, ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionVertex.SOURCE); -}; -goog.inherits(ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionVertex, ol.webgl.shader.Vertex); -goog.addSingletonGetter(ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionVertex); - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionVertex.DEBUG_SOURCE = 'attribute vec2 a_position;\nuniform mat4 u_modelViewMatrix;\n\nvoid main(void) {\n gl_Position = u_modelViewMatrix * vec4(a_position, 0., 1.);\n}\n\n\n'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionVertex.OPTIMIZED_SOURCE = 'attribute vec2 a;uniform mat4 b;void main(void){gl_Position=b*vec4(a,0.,1.);}'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionVertex.SOURCE = goog.DEBUG ? - ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionVertex.DEBUG_SOURCE : - ol.renderer.webgl.vectorlayer2.shader.LineStringCollectionVertex.OPTIMIZED_SOURCE; - - - -/** - * @constructor - * @param {WebGLRenderingContext} gl GL. - * @param {WebGLProgram} program Program. - */ -ol.renderer.webgl.vectorlayer2.shader.LineStringCollection.Locations = function(gl, program) { - - /** - * @type {WebGLUniformLocation} - */ - this.u_color = gl.getUniformLocation( - program, goog.DEBUG ? 'u_color' : 'c'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_modelViewMatrix = gl.getUniformLocation( - program, goog.DEBUG ? 'u_modelViewMatrix' : 'b'); - - /** - * @type {number} - */ - this.a_position = gl.getAttribLocation( - program, goog.DEBUG ? 'a_position' : 'a'); -}; diff --git a/src/ol/renderer/webgl/webglvectorlayer2pointcollection.glsl b/src/ol/renderer/webgl/webglvectorlayer2pointcollection.glsl deleted file mode 100644 index 07f09ef42e..0000000000 --- a/src/ol/renderer/webgl/webglvectorlayer2pointcollection.glsl +++ /dev/null @@ -1,21 +0,0 @@ -//! NAMESPACE=ol.renderer.webgl.vectorlayer2.shader.PointCollection -//! CLASS=ol.renderer.webgl.vectorlayer2.shader.PointCollection - - -//! VERTEX -attribute vec2 a_position; -uniform float u_pointSize; -uniform mat4 u_modelViewMatrix; - -void main(void) { - gl_Position = u_modelViewMatrix * vec4(a_position, 0., 1.); - gl_PointSize = u_pointSize; -} - - -//! FRAGMENT -uniform vec4 u_color; - -void main(void) { - gl_FragColor = u_color; -} diff --git a/src/ol/renderer/webgl/webglvectorlayer2pointcollectionshader.js b/src/ol/renderer/webgl/webglvectorlayer2pointcollectionshader.js deleted file mode 100644 index fb8a9f953f..0000000000 --- a/src/ol/renderer/webgl/webglvectorlayer2pointcollectionshader.js +++ /dev/null @@ -1,108 +0,0 @@ -// This file is automatically generated, do not edit -goog.provide('ol.renderer.webgl.vectorlayer2.shader.PointCollection'); - -goog.require('ol.webgl.shader'); - - - -/** - * @constructor - * @extends {ol.webgl.shader.Fragment} - */ -ol.renderer.webgl.vectorlayer2.shader.PointCollectionFragment = function() { - goog.base(this, ol.renderer.webgl.vectorlayer2.shader.PointCollectionFragment.SOURCE); -}; -goog.inherits(ol.renderer.webgl.vectorlayer2.shader.PointCollectionFragment, ol.webgl.shader.Fragment); -goog.addSingletonGetter(ol.renderer.webgl.vectorlayer2.shader.PointCollectionFragment); - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.PointCollectionFragment.DEBUG_SOURCE = 'precision mediump float;\nuniform vec4 u_color;\n\nvoid main(void) {\n gl_FragColor = u_color;\n}\n'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.PointCollectionFragment.OPTIMIZED_SOURCE = 'precision mediump float;uniform vec4 d;void main(void){gl_FragColor=d;}'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.PointCollectionFragment.SOURCE = goog.DEBUG ? - ol.renderer.webgl.vectorlayer2.shader.PointCollectionFragment.DEBUG_SOURCE : - ol.renderer.webgl.vectorlayer2.shader.PointCollectionFragment.OPTIMIZED_SOURCE; - - - -/** - * @constructor - * @extends {ol.webgl.shader.Vertex} - */ -ol.renderer.webgl.vectorlayer2.shader.PointCollectionVertex = function() { - goog.base(this, ol.renderer.webgl.vectorlayer2.shader.PointCollectionVertex.SOURCE); -}; -goog.inherits(ol.renderer.webgl.vectorlayer2.shader.PointCollectionVertex, ol.webgl.shader.Vertex); -goog.addSingletonGetter(ol.renderer.webgl.vectorlayer2.shader.PointCollectionVertex); - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.PointCollectionVertex.DEBUG_SOURCE = 'attribute vec2 a_position;\nuniform float u_pointSize;\nuniform mat4 u_modelViewMatrix;\n\nvoid main(void) {\n gl_Position = u_modelViewMatrix * vec4(a_position, 0., 1.);\n gl_PointSize = u_pointSize;\n}\n\n\n'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.PointCollectionVertex.OPTIMIZED_SOURCE = 'attribute vec2 a;uniform float b;uniform mat4 c;void main(void){gl_Position=c*vec4(a,0.,1.);gl_PointSize=b;}'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.vectorlayer2.shader.PointCollectionVertex.SOURCE = goog.DEBUG ? - ol.renderer.webgl.vectorlayer2.shader.PointCollectionVertex.DEBUG_SOURCE : - ol.renderer.webgl.vectorlayer2.shader.PointCollectionVertex.OPTIMIZED_SOURCE; - - - -/** - * @constructor - * @param {WebGLRenderingContext} gl GL. - * @param {WebGLProgram} program Program. - */ -ol.renderer.webgl.vectorlayer2.shader.PointCollection.Locations = function(gl, program) { - - /** - * @type {WebGLUniformLocation} - */ - this.u_color = gl.getUniformLocation( - program, goog.DEBUG ? 'u_color' : 'd'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_modelViewMatrix = gl.getUniformLocation( - program, goog.DEBUG ? 'u_modelViewMatrix' : 'c'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_pointSize = gl.getUniformLocation( - program, goog.DEBUG ? 'u_pointSize' : 'b'); - - /** - * @type {number} - */ - this.a_position = gl.getAttribLocation( - program, goog.DEBUG ? 'a_position' : 'a'); -}; diff --git a/src/ol/renderer/webgl/webglvectorlayer2renderer.js b/src/ol/renderer/webgl/webglvectorlayer2renderer.js deleted file mode 100644 index 812f998ef5..0000000000 --- a/src/ol/renderer/webgl/webglvectorlayer2renderer.js +++ /dev/null @@ -1,219 +0,0 @@ -goog.provide('ol.renderer.webgl.VectorLayer2'); - -goog.require('goog.vec.Mat4'); -goog.require('goog.webgl'); -goog.require('ol.math'); -goog.require('ol.renderer.webgl.Layer'); -goog.require('ol.renderer.webgl.vectorlayer2.shader.LineStringCollection'); -goog.require('ol.renderer.webgl.vectorlayer2.shader.PointCollection'); - - - -/** - * @constructor - * @extends {ol.renderer.webgl.Layer} - * @param {ol.renderer.Map} mapRenderer Map renderer. - * @param {ol.layer.Vector2} vectorLayer2 Vector layer. - */ -ol.renderer.webgl.VectorLayer2 = function(mapRenderer, vectorLayer2) { - - goog.base(this, mapRenderer, vectorLayer2); - - goog.vec.Mat4.makeIdentity(this.projectionMatrix); - - /** - * @private - * @type {!goog.vec.Mat4.Number} - */ - this.modelViewMatrix_ = goog.vec.Mat4.createNumberIdentity(); - - /** - * @private - * @type - * {ol.renderer.webgl.vectorlayer2.shader.LineStringCollection.Locations} - */ - this.lineStringCollectionLocations_ = null; - - /** - * @private - * @type {ol.renderer.webgl.vectorlayer2.shader.PointCollection.Locations} - */ - this.pointCollectionLocations_ = null; - -}; -goog.inherits(ol.renderer.webgl.VectorLayer2, ol.renderer.webgl.Layer); - - -/** - * @return {ol.layer.Vector2} Vector layer. - */ -ol.renderer.webgl.VectorLayer2.prototype.getVectorLayer = function() { - return /** @type {ol.layer.Vector2} */ (this.getLayer()); -}; - - -/** - * @inheritDoc - */ -ol.renderer.webgl.VectorLayer2.prototype.handleWebGLContextLost = function() { - goog.base(this, 'handleWebGLContextLost'); - this.pointCollectionLocations_ = null; -}; - - -/** - * @inheritDoc - */ -ol.renderer.webgl.VectorLayer2.prototype.renderFrame = - function(frameState, layerState) { - - var mapRenderer = this.getWebGLMapRenderer(); - var gl = mapRenderer.getGL(); - - var view2DState = frameState.view2DState; - - var vectorLayer = this.getVectorLayer(); - var vectorSource = vectorLayer.getVectorSource(); - - var size = frameState.size; - var framebufferDimension = ol.math.roundUpToPowerOfTwo( - Math.max(size[0], size[1])); - - this.bindFramebuffer(frameState, framebufferDimension); - gl.viewport(0, 0, framebufferDimension, framebufferDimension); - - gl.clearColor(0, 0, 0, 0); - gl.clear(goog.webgl.COLOR_BUFFER_BIT); - gl.enable(goog.webgl.BLEND); - - goog.vec.Mat4.makeIdentity(this.modelViewMatrix_); - if (view2DState.rotation !== 0) { - goog.vec.Mat4.rotateZ(this.modelViewMatrix_, -view2DState.rotation); - } - goog.vec.Mat4.scale(this.modelViewMatrix_, - 2 / (framebufferDimension * view2DState.resolution), - 2 / (framebufferDimension * view2DState.resolution), - 1); - goog.vec.Mat4.translate(this.modelViewMatrix_, - -view2DState.center[0], - -view2DState.center[1], - 0); - - var pointCollections = vectorSource.getPointCollections(); - if (pointCollections.length > 0) { - this.renderPointCollections(pointCollections); - } - var lineStringCollections = vectorSource.getLineStringCollections(); - if (lineStringCollections.length > 0) { - this.renderLineStringCollections(lineStringCollections); - } - - goog.vec.Mat4.makeIdentity(this.texCoordMatrix); - goog.vec.Mat4.translate(this.texCoordMatrix, - 0.5, - 0.5, - 0); - goog.vec.Mat4.scale(this.texCoordMatrix, - size[0] / framebufferDimension, - size[1] / framebufferDimension, - 1); - goog.vec.Mat4.translate(this.texCoordMatrix, - -0.5, - -0.5, - 0); - -}; - - -/** - * @param {Array.} lineStringCollections Line - * string collections. - */ -ol.renderer.webgl.VectorLayer2.prototype.renderLineStringCollections = - function(lineStringCollections) { - - var mapRenderer = this.getWebGLMapRenderer(); - var gl = mapRenderer.getGL(); - - var fragmentShader = ol.renderer.webgl.vectorlayer2.shader. - LineStringCollectionFragment.getInstance(); - var vertexShader = ol.renderer.webgl.vectorlayer2.shader. - LineStringCollectionVertex.getInstance(); - var program = mapRenderer.getProgram(fragmentShader, vertexShader); - gl.useProgram(program); - if (goog.isNull(this.lineStringCollectionLocations_)) { - this.lineStringCollectionLocations_ = - new ol.renderer.webgl.vectorlayer2.shader.LineStringCollection. - Locations(gl, program); - } - - gl.uniformMatrix4fv(this.lineStringCollectionLocations_.u_modelViewMatrix, - false, this.modelViewMatrix_); - - var buf, dim, i, indexBuffer, indices, lineStringCollection; - for (i = 0; i < lineStringCollections.length; ++i) { - lineStringCollection = lineStringCollections[i]; - buf = lineStringCollection.buf; - dim = lineStringCollection.dim; - mapRenderer.bindBuffer(goog.webgl.ARRAY_BUFFER, buf); - // FIXME re-use index buffer - // FIXME use mapRenderer.bindBuffer - indices = lineStringCollection.getIndices(); - indexBuffer = gl.createBuffer(); - gl.bindBuffer(goog.webgl.ELEMENT_ARRAY_BUFFER, indexBuffer); - gl.bufferData( - goog.webgl.ELEMENT_ARRAY_BUFFER, indices, goog.webgl.DYNAMIC_DRAW); - gl.enableVertexAttribArray(this.lineStringCollectionLocations_.a_position); - gl.vertexAttribPointer(this.lineStringCollectionLocations_.a_position, 2, - goog.webgl.FLOAT, false, 4 * dim, 0); - gl.uniform4fv(this.lineStringCollectionLocations_.u_color, [1, 1, 0, 0.75]); - gl.drawElements( - goog.webgl.LINES, indices.length, goog.webgl.UNSIGNED_SHORT, 0); - gl.bindBuffer(goog.webgl.ELEMENT_ARRAY_BUFFER, null); - gl.deleteBuffer(indexBuffer); - } - -}; - - -/** - * @param {Array.} pointCollections Point collections. - */ -ol.renderer.webgl.VectorLayer2.prototype.renderPointCollections = - function(pointCollections) { - - var mapRenderer = this.getWebGLMapRenderer(); - var gl = mapRenderer.getGL(); - - var fragmentShader = ol.renderer.webgl.vectorlayer2.shader. - PointCollectionFragment.getInstance(); - var vertexShader = ol.renderer.webgl.vectorlayer2.shader. - PointCollectionVertex.getInstance(); - var program = mapRenderer.getProgram(fragmentShader, vertexShader); - gl.useProgram(program); - if (goog.isNull(this.pointCollectionLocations_)) { - this.pointCollectionLocations_ = - new ol.renderer.webgl.vectorlayer2.shader.PointCollection.Locations( - gl, program); - } - - gl.uniformMatrix4fv(this.pointCollectionLocations_.u_modelViewMatrix, false, - this.modelViewMatrix_); - - var buf, dim, i, pointCollection; - for (i = 0; i < pointCollections.length; ++i) { - pointCollection = pointCollections[i]; - buf = pointCollection.buf; - dim = pointCollection.dim; - mapRenderer.bindBuffer(goog.webgl.ARRAY_BUFFER, buf); - gl.enableVertexAttribArray(this.pointCollectionLocations_.a_position); - gl.vertexAttribPointer(this.pointCollectionLocations_.a_position, 2, - goog.webgl.FLOAT, false, 4 * dim, 0); - gl.uniform4fv(this.pointCollectionLocations_.u_color, [1, 0, 0, 0.75]); - gl.uniform1f(this.pointCollectionLocations_.u_pointSize, 3); - buf.forEachRange(function(start, stop) { - gl.drawArrays(goog.webgl.POINTS, start / dim, (stop - start) / dim); - }); - } - -}; From 61d13f9a3908e3e1559e3833e6e439ad8a980d2b Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Oct 2013 14:18:14 -0600 Subject: [PATCH 3/4] Remove ol.source.Vector2 --- src/objectliterals.jsdoc | 12 ------- src/ol/source/vectorsource2.exports | 1 - src/ol/source/vectorsource2.js | 55 ----------------------------- 3 files changed, 68 deletions(-) delete mode 100644 src/ol/source/vectorsource2.exports delete mode 100644 src/ol/source/vectorsource2.js diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index e107198442..ad2c6a0a0e 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -718,18 +718,6 @@ * @todo stability experimental */ -/** - * @typedef {Object} ol.source.Vector2Options - * @property {Array.|undefined} attributions Attributions. - * @property {ol.Extent|undefined} extent Extent. - * @property {Array.|undefined} - * lineStringCollections Line string collections. - * @property {Array.|undefined} pointCollections - * Point collections. - * @property {ol.proj.ProjectionLike} projection Projection. - * @todo stability experimental - */ - /** * @typedef {Object} ol.source.WMSGetFeatureInfoOptions diff --git a/src/ol/source/vectorsource2.exports b/src/ol/source/vectorsource2.exports deleted file mode 100644 index ce5f6b3c85..0000000000 --- a/src/ol/source/vectorsource2.exports +++ /dev/null @@ -1 +0,0 @@ -@exportSymbol ol.source.Vector2 diff --git a/src/ol/source/vectorsource2.js b/src/ol/source/vectorsource2.js deleted file mode 100644 index 812d724896..0000000000 --- a/src/ol/source/vectorsource2.js +++ /dev/null @@ -1,55 +0,0 @@ -goog.provide('ol.source.Vector2'); - -goog.require('ol.geom2.LineStringCollection'); -goog.require('ol.geom2.PointCollection'); -goog.require('ol.source.Source'); - - - -/** - * This is an internal class that will be removed from the API. - * @constructor - * @extends {ol.source.Source} - * @param {ol.source.Vector2Options} options Options. - * @todo stability experimental - */ -ol.source.Vector2 = function(options) { - - goog.base(this, { - attributions: options.attributions, - extent: options.extent, - projection: options.projection - }); - - /** - * @private - * @type {Array.} - */ - this.pointCollections_ = goog.isDef(options.pointCollections) ? - options.pointCollections : []; - - /** - * @private - * @type {Array.} - */ - this.lineStringCollections_ = goog.isDef(options.lineStringCollections) ? - options.lineStringCollections : []; - -}; -goog.inherits(ol.source.Vector2, ol.source.Source); - - -/** - * @return {Array.} Line string collections. - */ -ol.source.Vector2.prototype.getLineStringCollections = function() { - return this.lineStringCollections_; -}; - - -/** - * @return {Array.} Point collections. - */ -ol.source.Vector2.prototype.getPointCollections = function() { - return this.pointCollections_; -}; From 7b693739855ce47742b4541b18443dc7bf7afb21 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 8 Oct 2013 14:26:41 -0600 Subject: [PATCH 4/4] Remove ol.geom2 --- src/ol/geom2/geom2.js | 67 ----- src/ol/geom2/linestringcollection.exports | 2 - src/ol/geom2/linestringcollection.js | 211 ------------- src/ol/geom2/pointcollection.exports | 4 - src/ol/geom2/pointcollection.js | 149 ---------- test/spec/ol/geom2/geom2.test.js | 56 ---- test/spec/ol/geom2/linecollection.test.js | 330 --------------------- test/spec/ol/geom2/pointcollection.test.js | 293 ------------------ 8 files changed, 1112 deletions(-) delete mode 100644 src/ol/geom2/geom2.js delete mode 100644 src/ol/geom2/linestringcollection.exports delete mode 100644 src/ol/geom2/linestringcollection.js delete mode 100644 src/ol/geom2/pointcollection.exports delete mode 100644 src/ol/geom2/pointcollection.js delete mode 100644 test/spec/ol/geom2/geom2.test.js delete mode 100644 test/spec/ol/geom2/linecollection.test.js delete mode 100644 test/spec/ol/geom2/pointcollection.test.js diff --git a/src/ol/geom2/geom2.js b/src/ol/geom2/geom2.js deleted file mode 100644 index 1cdfd5228a..0000000000 --- a/src/ol/geom2/geom2.js +++ /dev/null @@ -1,67 +0,0 @@ -goog.provide('ol.geom2'); - -goog.require('goog.asserts'); -goog.require('ol.Extent'); -goog.require('ol.extent'); - - -/** - * @param {ol.structs.Buffer} buf Buffer. - * @param {number} dim Dimension. - * @return {ol.Extent} Extent. - */ -ol.geom2.getExtent = function(buf, dim) { - var extent = ol.extent.createEmpty(); - var bufArr = buf.getArray(); - buf.forEachRange(function(start, stop) { - var x, y; - for (var i = start; i < stop; i += dim) { - x = bufArr[i]; - y = bufArr[i + 1]; - extent[0] = Math.min(extent[0], x); - extent[1] = Math.min(extent[1], y); - extent[2] = Math.max(extent[2], x); - extent[3] = Math.max(extent[3], y); - } - }); - return extent; -}; - - -/** - * @param {Array.} arr Array. - * @param {number} offset Offset. - * @param {Array.>} unpackedPoints Unpacked points. - * @param {number} dim Dimension. - * @return {number} Offset. - */ -ol.geom2.packPoints = function(arr, offset, unpackedPoints, dim) { - var n = unpackedPoints.length; - var i, j, point; - for (i = 0; i < n; ++i) { - point = unpackedPoints[i]; - goog.asserts.assert(point.length == dim); - for (j = 0; j < dim; ++j) { - arr[offset++] = point[j]; - } - } - return offset; -}; - - -/** - * @param {Array.} arr Array. - * @param {number} offset Offset. - * @param {number} end End. - * @param {number} dim Dimension. - * @return {Array.>} Unpacked points. - */ -ol.geom2.unpackPoints = function(arr, offset, end, dim) { - var unpackedPoints = new Array((end - offset) / dim); - var i = 0; - var j; - for (j = offset; j < end; j += dim) { - unpackedPoints[i++] = arr.slice(j, j + dim); - } - return unpackedPoints; -}; diff --git a/src/ol/geom2/linestringcollection.exports b/src/ol/geom2/linestringcollection.exports deleted file mode 100644 index 6f7b393e71..0000000000 --- a/src/ol/geom2/linestringcollection.exports +++ /dev/null @@ -1,2 +0,0 @@ -@exportSymbol ol.geom2.LineStringCollection -@exportSymbol ol.geom2.LineStringCollection.pack diff --git a/src/ol/geom2/linestringcollection.js b/src/ol/geom2/linestringcollection.js deleted file mode 100644 index b07455e638..0000000000 --- a/src/ol/geom2/linestringcollection.js +++ /dev/null @@ -1,211 +0,0 @@ -goog.provide('ol.geom2.LineString'); -goog.provide('ol.geom2.LineStringCollection'); - -goog.require('goog.array'); -goog.require('goog.asserts'); -goog.require('goog.object'); -goog.require('ol.geom2'); -goog.require('ol.structs.Buffer'); - - -/** - * @typedef {Array.>} - */ -ol.geom2.LineString; - - - -/** - * This is an internal class that will be removed from the API. - * @constructor - * @param {ol.structs.Buffer} buf Buffer. - * @param {Object.=} opt_ranges Ranges. - * @param {number=} opt_dim Dimension. - * @todo stability experimental - */ -ol.geom2.LineStringCollection = function(buf, opt_ranges, opt_dim) { - - /** - * @type {ol.structs.Buffer} - */ - this.buf = buf; - - /** - * @type {Object.} - */ - this.ranges = goog.isDef(opt_ranges) ? opt_ranges : {}; - - /** - * @type {number} - */ - this.dim = goog.isDef(opt_dim) ? opt_dim : 2; - -}; - - -/** - * @param {number} capacity Capacity. - * @param {number=} opt_dim Dimension. - * @return {ol.geom2.LineStringCollection} Line string collection. - */ -ol.geom2.LineStringCollection.createEmpty = function(capacity, opt_dim) { - var dim = goog.isDef(opt_dim) ? opt_dim : 2; - var buf = new ol.structs.Buffer(new Array(capacity * dim), 0); - return new ol.geom2.LineStringCollection(buf, undefined, dim); -}; - - -/** - * This is an internal function that will be removed from the API. - * @param {Array.} unpackedLineStrings Unpacked line - * strings. - * @param {number=} opt_capacity Capacity. - * @param {number=} opt_dim Dimension. - * @return {ol.geom2.LineStringCollection} Line string collection. - * @todo stability experimental - */ -ol.geom2.LineStringCollection.pack = - function(unpackedLineStrings, opt_capacity, opt_dim) { - var i; - var n = unpackedLineStrings.length; - var dim = goog.isDef(opt_dim) ? opt_dim : - n > 0 ? unpackedLineStrings[0][0].length : 2; - var capacity; - if (goog.isDef(opt_capacity)) { - capacity = opt_capacity; - } else { - capacity = 0; - for (i = 0; i < n; ++i) { - capacity += unpackedLineStrings[i].length; - } - } - capacity *= dim; - var arr = new Array(capacity); - /** @type {Object.} */ - var ranges = {}; - var offset = 0; - var start; - for (i = 0; i < n; ++i) { - goog.asserts.assert(unpackedLineStrings[i].length > 1); - start = offset; - offset = ol.geom2.packPoints(arr, offset, unpackedLineStrings[i], dim); - ranges[start + ''] = offset; - } - goog.asserts.assert(offset <= capacity); - var buf = new ol.structs.Buffer(arr, offset); - return new ol.geom2.LineStringCollection(buf, ranges, dim); -}; - - -/** - * @param {ol.geom2.LineString} lineString Line string. - * @return {number} Offset. - */ -ol.geom2.LineStringCollection.prototype.add = function(lineString) { - var n = lineString.length * this.dim; - var offset = this.buf.allocate(n); - goog.asserts.assert(offset != -1); - this.ranges[offset + ''] = offset + n; - ol.geom2.packPoints(this.buf.getArray(), offset, lineString, this.dim); - return offset; -}; - - -/** - * @param {number} offset Offset. - * @return {ol.geom2.LineString} Line string. - */ -ol.geom2.LineStringCollection.prototype.get = function(offset) { - goog.asserts.assert(offset in this.ranges); - var range = this.ranges[offset + '']; - return ol.geom2.unpackPoints( - this.buf.getArray(), offset, range, this.dim); -}; - - -/** - * @return {number} Count. - */ -ol.geom2.LineStringCollection.prototype.getCount = function() { - return goog.object.getCount(this.ranges); -}; - - -/** - * @return {ol.Extent} Extent. - */ -ol.geom2.LineStringCollection.prototype.getExtent = function() { - return ol.geom2.getExtent(this.buf, this.dim); -}; - - -/** - * @return {Uint16Array} Indices. - */ -ol.geom2.LineStringCollection.prototype.getIndices = function() { - // FIXME cache and track dirty / track output length - var dim = this.dim; - var offsets = goog.array.map(goog.object.getKeys(this.ranges), Number); - goog.array.sort(offsets); - var n = offsets.length; - var indices = []; - var i, j, range, offset, stop; - for (i = 0; i < n; ++i) { - offset = offsets[i]; - range = this.ranges[offset]; - stop = range / dim - 1; - for (j = offset / dim; j < stop; ++j) { - indices.push(j, j + 1); - } - } - return new Uint16Array(indices); -}; - - -/** - * @param {number} offset Offset. - */ -ol.geom2.LineStringCollection.prototype.remove = function(offset) { - goog.asserts.assert(offset in this.ranges); - var range = this.ranges[offset + '']; - this.buf.remove(range - offset, offset); - delete this.ranges[offset + '']; -}; - - -/** - * @param {number} offset Offset. - * @param {ol.geom2.LineString} lineString Line string. - * @return {number} Offset. - */ -ol.geom2.LineStringCollection.prototype.set = function(offset, lineString) { - var dim = this.dim; - goog.asserts.assert(offset in this.ranges); - var range = this.ranges[offset + '']; - if (lineString.length * dim == range - offset) { - ol.geom2.packPoints(this.buf.getArray(), offset, lineString, dim); - this.buf.markDirty(range - offset, offset); - return offset; - } else { - this.remove(offset); - return this.add(lineString); - } -}; - - -/** - * @return {Array.} Line strings. - */ -ol.geom2.LineStringCollection.prototype.unpack = function() { - var dim = this.dim; - var n = this.getCount(); - var lineStrings = new Array(n); - var i = 0; - var offset, range; - for (offset in this.ranges) { - range = this.ranges[offset]; - lineStrings[i++] = ol.geom2.unpackPoints( - this.buf.getArray(), Number(offset), range, dim); - } - return lineStrings; -}; diff --git a/src/ol/geom2/pointcollection.exports b/src/ol/geom2/pointcollection.exports deleted file mode 100644 index 7a7a485279..0000000000 --- a/src/ol/geom2/pointcollection.exports +++ /dev/null @@ -1,4 +0,0 @@ -@exportSymbol ol.geom2.PointCollection -@exportSymbol ol.geom2.PointCollection.createEmpty -@exportSymbol ol.geom2.PointCollection.pack -@exportProperty ol.geom2.PointCollection.prototype.add diff --git a/src/ol/geom2/pointcollection.js b/src/ol/geom2/pointcollection.js deleted file mode 100644 index 235fd6b7ab..0000000000 --- a/src/ol/geom2/pointcollection.js +++ /dev/null @@ -1,149 +0,0 @@ -goog.provide('ol.geom2.Point'); -goog.provide('ol.geom2.PointCollection'); - -goog.require('goog.asserts'); -goog.require('ol.Extent'); -goog.require('ol.geom2'); -goog.require('ol.structs.Buffer'); - - -/** - * @typedef {Array.} - */ -ol.geom2.Point; - - - -/** - * This is an internal class that will be removed from the API. - * @constructor - * @param {ol.structs.Buffer} buf Buffer. - * @param {number=} opt_dim Dimension. - * @todo stability experimental - */ -ol.geom2.PointCollection = function(buf, opt_dim) { - - /** - * @type {ol.structs.Buffer} - */ - this.buf = buf; - - /** - * @type {number} - */ - this.dim = goog.isDef(opt_dim) ? opt_dim : 2; - -}; - - -/** - * This is an internal function that will be removed from the API. - * @param {number} capacity Capacity. - * @param {number=} opt_dim Dimension. - * @return {ol.geom2.PointCollection} Point collection. - * @todo stability experimental - */ -ol.geom2.PointCollection.createEmpty = function(capacity, opt_dim) { - var dim = goog.isDef(opt_dim) ? opt_dim : 2; - var buf = new ol.structs.Buffer(new Array(capacity * dim), 0); - return new ol.geom2.PointCollection(buf, dim); -}; - - -/** - * This is an internal function that will be removed from the API. - * @param {Array.} unpackedPoints Unpacked points. - * @param {number=} opt_capacity Capacity. - * @param {number=} opt_dim Dimension. - * @return {ol.geom2.PointCollection} Point collection. - * @todo stability experimental - */ -ol.geom2.PointCollection.pack = - function(unpackedPoints, opt_capacity, opt_dim) { - var n = unpackedPoints.length; - var dim = goog.isDef(opt_dim) ? opt_dim : - n > 0 ? unpackedPoints[0].length : 2; - var capacity = goog.isDef(opt_capacity) ? opt_capacity : n * dim; - goog.asserts.assert(capacity >= n * dim); - var arr = new Array(capacity); - ol.geom2.packPoints(arr, 0, unpackedPoints, dim); - var buf = new ol.structs.Buffer(arr, n * dim); - return new ol.geom2.PointCollection(buf, dim); -}; - - -/** - * @param {ol.geom2.Point} point Point. - * @return {number} Offset. - * @todo stability experimental - */ -ol.geom2.PointCollection.prototype.add = function(point) { - goog.asserts.assert(point.length == this.dim); - return this.buf.add(point); -}; - - -/** - * @param {number} offset Offset. - * @return {ol.geom2.Point} Point. - */ -ol.geom2.PointCollection.prototype.get = function(offset) { - var arr = this.buf.getArray(); - var dim = this.dim; - goog.asserts.assert(0 <= offset && offset + dim < arr.length); - goog.asserts.assert(offset % dim === 0); - return arr.slice(offset, offset + dim); -}; - - -/** - * @return {number} Count. - */ -ol.geom2.PointCollection.prototype.getCount = function() { - return this.buf.getCount() / this.dim; -}; - - -/** - * @return {ol.Extent} Extent. - */ -ol.geom2.PointCollection.prototype.getExtent = function() { - return ol.geom2.getExtent(this.buf, this.dim); -}; - - -/** - * @param {number} offset Offset. - */ -ol.geom2.PointCollection.prototype.remove = function(offset) { - this.buf.remove(this.dim, offset); -}; - - -/** - * @param {number} offset Offset. - * @param {ol.geom2.Point} point Point. - */ -ol.geom2.PointCollection.prototype.set = function(offset, point) { - this.buf.set(point, offset); -}; - - -/** - * @return {Array.} Points. - */ -ol.geom2.PointCollection.prototype.unpack = function() { - var dim = this.dim; - var n = this.getCount(); - var points = new Array(n); - var i = 0; - var bufArr = this.buf.getArray(); - this.buf.forEachRange(function(start, stop) { - var j; - for (j = start; j < stop; j += dim) { - points[i++] = bufArr.slice(j, j + dim); - } - }); - goog.asserts.assert(i == n); - return points; -}; diff --git a/test/spec/ol/geom2/geom2.test.js b/test/spec/ol/geom2/geom2.test.js deleted file mode 100644 index 83e87e7ce8..0000000000 --- a/test/spec/ol/geom2/geom2.test.js +++ /dev/null @@ -1,56 +0,0 @@ -goog.provide('ol.test.geom2'); - - -describe('ol.geom2', function() { - - var buf, dim; - beforeEach(function() { - buf = new ol.structs.Buffer([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], 12); - dim = 2; - }); - - describe('ol.geom2.getExtent', function() { - - it('returns the expected extent', function() { - var extent = ol.geom2.getExtent(buf, dim); - expect(extent).to.eql([0, 1, 10, 11]); - }); - - }); - - describe('ol.geom2.packPoints', function() { - - it('packs points as expected', function() { - var arr = []; - var offset = ol.geom2.packPoints(arr, 0, [[0, 1], [2, 3], [4, 5]], 2); - expect(offset).to.be(6); - expect(arr).to.eql([0, 1, 2, 3, 4, 5]); - }); - - it('raises an exception if dimensions do not match', function() { - expect(function() { - ol.geom2.packPoints([], 0, [[0, 1, 2]], 2); - }).to.throwException(); - }); - - }); - - describe('ol.geom2.unpackPoints', function() { - - it('unpacks points in two dimensions', function() { - var unpackedPoints = ol.geom2.unpackPoints([0, 1, 2, 3, 4, 5], 0, 6, 2); - expect(unpackedPoints).to.eql([[0, 1], [2, 3], [4, 5]]); - }); - - it('unpacks points in three dimensions', function() { - var unpackedPoints = ol.geom2.unpackPoints([0, 1, 2, 3, 4, 5], 0, 6, 3); - expect(unpackedPoints).to.eql([[0, 1, 2], [3, 4, 5]]); - }); - - }); - -}); - - -goog.require('ol.geom2'); -goog.require('ol.structs.Buffer'); diff --git a/test/spec/ol/geom2/linecollection.test.js b/test/spec/ol/geom2/linecollection.test.js deleted file mode 100644 index e1a86b7f9f..0000000000 --- a/test/spec/ol/geom2/linecollection.test.js +++ /dev/null @@ -1,330 +0,0 @@ -goog.provide('ol.test.geom2.LineStringCollection'); - - -describe('ol.geom2.LineStringCollection', function() { - - describe('createEmpty', function() { - - it('creates an empty instance with the specified capacity', function() { - var lsc = ol.geom2.LineStringCollection.createEmpty(16); - expect(lsc.getCount()).to.be(0); - expect(lsc.buf.getArray()).to.have.length(32); - }); - - it('can create empty collections for higher dimensions', function() { - var lsc = ol.geom2.LineStringCollection.createEmpty(16, 3); - expect(lsc.getCount()).to.be(0); - expect(lsc.buf.getArray()).to.have.length(48); - }); - - }); - - describe('pack', function() { - - it('packs an empty array', function() { - var lsc = ol.geom2.LineStringCollection.pack([]); - expect(lsc.buf.getArray()).to.be.empty(); - expect(lsc.ranges).to.be.empty(); - expect(lsc.dim).to.be(2); - }); - - it('packs an empty array with a capacity', function() { - var lsc = ol.geom2.LineStringCollection.pack([], 4); - expect(lsc.buf.getArray()).to.eql( - [NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN]); - expect(lsc.ranges).to.be.empty(); - expect(lsc.dim).to.be(2); - }); - - it('packs an array of line strings', function() { - var lsc = ol.geom2.LineStringCollection.pack( - [[[0, 1], [2, 3], [4, 5]], [[6, 7], [8, 9]]]); - expect(lsc.buf.getArray()).to.eql([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]); - expect(lsc.getCount()).to.be(2); - expect(lsc.ranges[0]).to.be(6); - expect(lsc.ranges[6]).to.be(10); - expect(lsc.dim).to.be(2); - }); - - it('packs an array of line strings with a different dimension', function() { - var lsc = ol.geom2.LineStringCollection.pack( - [[[0, 1, 2], [3, 4, 5]], [[6, 7, 8], [9, 10, 11]]]); - expect(lsc.buf.getArray()).to.eql([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]); - expect(lsc.getCount()).to.be(2); - expect(lsc.ranges[0]).to.be(6); - expect(lsc.ranges[6]).to.be(12); - expect(lsc.dim).to.be(3); - }); - - it('packs an array of line strings with extra capacity', function() { - var lsc = ol.geom2.LineStringCollection.pack( - [[[0, 1], [2, 3], [4, 5]], [[6, 7], [8, 9]]], 16); - expect(lsc.buf.getArray().slice(0, 10)).to.eql( - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]); - expect(lsc.buf.getArray()).to.have.length(32); - expect(lsc.getCount()).to.be(2); - expect(lsc.ranges[0]).to.be(6); - expect(lsc.ranges[6]).to.be(10); - expect(lsc.dim).to.be(2); - }); - - it('throws an error when dimensions are inconsistent', function() { - expect(function() { - var lsc = ol.geom2.LineStringCollection.pack([[[0, 1], [2, 3, 4]]]); - lsc = lsc; // suppress gjslint warning about unused variable - }).to.throwException(); - }); - - it('throws an error when a line string is too short', function() { - expect(function() { - var lsc = ol.geom2.LineStringCollection.pack([[[0, 1]]]); - lsc = lsc; // suppress gjslint warning about unused variable - }).to.throwException(); - }); - - it('throws an error when the capacity is too small', function() { - expect(function() { - var lsc = ol.geom2.LineStringCollection.pack( - [[[0, 1], [2, 3], [4, 5]], [[6, 7], [8, 9]]], 4); - lsc = lsc; // suppress gjslint warning about unused variable - }).to.throwException(); - }); - - }); - - describe('with an empty instance with spare capacity', function() { - - var lsc; - beforeEach(function() { - var buf = new ol.structs.Buffer(new Array(8), 0); - lsc = new ol.geom2.LineStringCollection(buf); - }); - - describe('add', function() { - - it('adds a line string', function() { - var offset = lsc.add([[0, 1], [2, 3]]); - expect(offset).to.be(0); - expect(lsc.getCount()).to.be(1); - expect(lsc.ranges[0]).to.be(4); - expect(lsc.dim).to.be(2); - }); - - }); - - describe('getCount', function() { - - it('returns zero', function() { - expect(lsc.getCount()).to.be(0); - }); - - }); - - describe('getExtent', function() { - - it('returns an empty extent', function() { - expect(ol.extent.isEmpty(lsc.getExtent())).to.be(true); - }); - - }); - - describe('getIndices', function() { - - it('returns the expected value', function() { - expect(lsc.getIndices()).to.be.empty(); - }); - - }); - - describe('remove', function() { - - it('throws an exception', function() { - expect(function() { - lsc.remove(0); - }).to.throwException(); - }); - - }); - - }); - - describe('with an initial line string', function() { - - var lsc, offset; - beforeEach(function() { - var buf = new ol.structs.Buffer(new Array(8), 0); - lsc = new ol.geom2.LineStringCollection(buf); - offset = lsc.add([[0, 1], [2, 3]]); - }); - - describe('add', function() { - - it('can add a second line string', function() { - var offset2 = lsc.add([[4, 5], [6, 7]]); - expect(offset2).to.be(4); - expect(lsc.getCount()).to.be(2); - expect(lsc.ranges[0]).to.be(4); - expect(lsc.ranges[4]).to.be(8); - expect(lsc.dim).to.be(2); - }); - - }); - - describe('get', function() { - - it('returns the expected line string', function() { - expect(lsc.get(0)).to.eql([[0, 1], [2, 3]]); - }); - - }); - - describe('getCount', function() { - - it('returns the expected value', function() { - expect(lsc.getCount()).to.be(1); - }); - - }); - - describe('getExtent', function() { - - it('returns the expected extent', function() { - expect(lsc.getExtent()).to.eql([0, 1, 2, 3]); - }); - - }); - - describe('getIndices', function() { - - it('returns the expected value', function() { - expect(lsc.getIndices()).to.arreql([0, 1]); - }); - - }); - - describe('remove', function() { - - it('removes the line string', function() { - lsc.remove(0); - expect(lsc.getCount()).to.be(0); - }); - - }); - - describe('set', function() { - - it('can update the line string in place', function() { - expect(lsc.set(0, [[4, 5], [6, 7]])).to.be(0); - expect(lsc.buf.getArray()).to.eql([4, 5, 6, 7, NaN, NaN, NaN, NaN]); - }); - - it('can replace the line string with a shorter one', function() { - expect(lsc.set(0, [[4, 5]])).to.be(0); - expect(lsc.buf.getArray()).to.eql([4, 5, NaN, NaN, NaN, NaN, NaN, NaN]); - }); - - it('can replace the line string with a longer one', function() { - expect(lsc.set(0, [[4, 5], [6, 7], [8, 9], [10, 11]])).to.be(0); - expect(lsc.buf.getArray()).to.eql([4, 5, 6, 7, 8, 9, 10, 11]); - }); - - }); - - describe('unpack', function() { - - it('returns the expected value', function() { - expect(lsc.unpack()).to.eql([[[0, 1], [2, 3]]]); - }); - - }); - - }); - - describe('with multiple initial line strings', function() { - - var lsc; - beforeEach(function() { - lsc = ol.geom2.LineStringCollection.pack( - [[[0, 1], [2, 3]], [[4, 5], [6, 7], [8, 9]]], 16); - }); - - describe('get', function() { - - it('returns the expected values', function() { - expect(lsc.get(0)).to.eql([[0, 1], [2, 3]]); - expect(lsc.get(4)).to.eql([[4, 5], [6, 7], [8, 9]]); - }); - - }); - - describe('getCount', function() { - - it('returns the expected value', function() { - expect(lsc.getCount()).to.be(2); - }); - - }); - - describe('getExtent', function() { - - it('returns the expected value', function() { - expect(lsc.getExtent()).to.eql([0, 1, 8, 9]); - }); - - }); - - describe('getIndices', function() { - - it('returns the expected value', function() { - expect(lsc.getIndices()).to.arreql([0, 1, 2, 3, 3, 4]); - }); - - }); - - describe('remove', function() { - - it('can remove the first line string', function() { - lsc.remove(0); - expect(lsc.getCount()).to.be(1); - expect(lsc.get(4)).to.eql([[4, 5], [6, 7], [8, 9]]); - expect(lsc.getIndices()).to.arreql([2, 3, 3, 4]); - }); - - it('can remove the second line string', function() { - lsc.remove(4); - expect(lsc.getCount()).to.be(1); - expect(lsc.get(0)).to.eql([[0, 1], [2, 3]]); - expect(lsc.getIndices()).to.arreql([0, 1]); - }); - - }); - - describe('usage examples', function() { - - it('allows the first line string to be replaced', function() { - lsc.remove(0); - expect(lsc.getCount()).to.be(1); - expect(lsc.add([[10, 11], [12, 13]])).to.be(0); - expect(lsc.getCount()).to.be(2); - expect(lsc.get(0)).to.eql([[10, 11], [12, 13]]); - }); - - it('will allocate at the end of the array', function() { - lsc.remove(0); - expect(lsc.getCount()).to.be(1); - expect(lsc.add([[10, 11], [12, 13], [14, 15]])).to.be(10); - expect(lsc.getCount()).to.be(2); - expect(lsc.get(10)).to.eql([[10, 11], [12, 13], [14, 15]]); - expect(lsc.getIndices()).to.arreql([2, 3, 3, 4, 5, 6, 6, 7]); - }); - - }); - - }); - -}); - - -goog.require('ol.geom2.LineStringCollection'); -goog.require('ol.extent'); -goog.require('ol.structs.Buffer'); diff --git a/test/spec/ol/geom2/pointcollection.test.js b/test/spec/ol/geom2/pointcollection.test.js deleted file mode 100644 index 246dfec466..0000000000 --- a/test/spec/ol/geom2/pointcollection.test.js +++ /dev/null @@ -1,293 +0,0 @@ -goog.provide('ol.test.geom2.PointCollection'); - - -describe('ol.geom2.PointCollection', function() { - - describe('createEmpty', function() { - - it('creates an empty instance with the specified capacity', function() { - var pc = ol.geom2.PointCollection.createEmpty(16); - expect(pc.getCount()).to.be(0); - expect(pc.buf.getArray()).to.have.length(32); - }); - - it('can create empty collections for higher dimensions', function() { - var pc = ol.geom2.PointCollection.createEmpty(16, 3); - expect(pc.getCount()).to.be(0); - expect(pc.buf.getArray()).to.have.length(48); - }); - - }); - - describe('pack', function() { - - it('packs an empty array', function() { - var pc = ol.geom2.PointCollection.pack([]); - expect(pc.buf.getArray()).to.be.empty(); - expect(pc.dim).to.be(2); - }); - - it('packs an empty array with a capacity', function() { - var pc = ol.geom2.PointCollection.pack([], 4); - expect(pc.buf.getArray()).to.eql([NaN, NaN, NaN, NaN]); - expect(pc.dim).to.be(2); - }); - - it('packs an empty array with a capacity and a dimension', function() { - var pc = ol.geom2.PointCollection.pack([], 8, 2); - expect(pc.buf.getArray()).to.eql( - [NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN]); - expect(pc.dim).to.be(2); - }); - - it('packs a single point', function() { - var pc = ol.geom2.PointCollection.pack([[0, 1]]); - expect(pc.buf.getArray()).to.eql([0, 1]); - expect(pc.dim).to.be(2); - }); - - it('can pack multiple points', function() { - var pc = ol.geom2.PointCollection.pack([[0, 1], [2, 3], [4, 5]]); - expect(pc.buf.getArray()).to.eql([0, 1, 2, 3, 4, 5]); - expect(pc.dim).to.be(2); - }); - - it('can pack multiple points with a capacity', function() { - var pc = ol.geom2.PointCollection.pack([[0, 1], [2, 3], [4, 5]], 8); - expect(pc.buf.getArray()).to.eql([0, 1, 2, 3, 4, 5, NaN, NaN]); - expect(pc.dim).to.be(2); - }); - - it('can pack a single 3-dimensional point', function() { - var pc = ol.geom2.PointCollection.pack([[0, 1, 2]]); - expect(pc.buf.getArray()).to.eql([0, 1, 2]); - expect(pc.dim).to.be(3); - }); - - it('can pack a multiple 3-dimensional points', function() { - var pc = ol.geom2.PointCollection.pack([[0, 1, 2], [4, 5, 6]]); - expect(pc.buf.getArray()).to.eql([0, 1, 2, 4, 5, 6]); - expect(pc.dim).to.be(3); - }); - - it('raises an error when not all points have the same dimension', - function() { - expect(function() { - var pc = ol.geom2.PointCollection.pack([[0, 1], [2]]); - pc = pc; // suppress gjslint warning about unused variable - }).to.throwException(); - }); - - it('raises an error when the capacity is too small', function() { - expect(function() { - var pc = ol.geom2.PointCollection.pack([[0, 1], [2, 3], [4, 5]], 2); - pc = pc; // suppress gjslint warning about unused variable - }).to.throwException(); - }); - - }); - - describe('with an empty buffer, with capacity for two points', function() { - - var pc; - beforeEach(function() { - var buf = new ol.structs.Buffer(new Array(4), 0); - pc = new ol.geom2.PointCollection(buf); - }); - - describe('add', function() { - - it('can add a first point', function() { - expect(pc.add([0, 1])).to.be(0); - expect(pc.buf.getArray()).to.eql([0, 1, NaN, NaN]); - }); - - it('can add a second point', function() { - expect(pc.add([0, 1])).to.be(0); - expect(pc.buf.getArray()).to.eql([0, 1, NaN, NaN]); - expect(pc.add([2, 3])).to.be(2); - expect(pc.buf.getArray()).to.eql([0, 1, 2, 3]); - }); - - it('raises an error when the third point is added', function() { - expect(pc.add([0, 1])).to.be(0); - expect(pc.buf.getArray()).to.eql([0, 1, NaN, NaN]); - expect(pc.add([2, 3])).to.be(2); - expect(pc.buf.getArray()).to.eql([0, 1, 2, 3]); - expect(function() { - pc.add([4, 5]); - }).to.throwException(); - }); - - it('raises an error if a point of the wrong dimension is added', - function() { - expect(function() { - pc.add([0, 1, 2]); - }).to.throwException(); - }); - - }); - - describe('getCount', function() { - - it('returns 0', function() { - expect(pc.getCount()).to.be(0); - }); - - }); - - describe('getExtent', function() { - - it('returns an empty extent', function() { - expect(ol.extent.isEmpty(pc.getExtent())).to.be(true); - }); - - }); - - describe('unpack', function() { - - it('returns an empty array', function() { - expect(pc.unpack()).to.be.empty(); - }); - - }); - - }); - - describe('with a partially populated instance', function() { - - var dirtySet, pc; - beforeEach(function() { - dirtySet = new ol.structs.IntegerSet(); - pc = ol.geom2.PointCollection.pack([[0, 1], [2, 3]], 8); - pc.buf.addDirtySet(dirtySet); - }); - - describe('add', function() { - - it('can add more points', function() { - expect(pc.add([4, 5])).to.be(4); - expect(pc.buf.getArray()).to.eql([0, 1, 2, 3, 4, 5, NaN, NaN]); - expect(pc.add([6, 7])).to.be(6); - expect(pc.buf.getArray()).to.eql([0, 1, 2, 3, 4, 5, 6, 7]); - }); - - }); - - describe('get', function() { - - it('returns the expected value for the first point', function() { - expect(pc.get(0)).to.eql([0, 1]); - }); - - it('returns the expected value for the second point', function() { - expect(pc.get(2)).to.eql([2, 3]); - }); - - }); - - describe('getCount', function() { - - it('returns the expected value', function() { - expect(pc.getCount()).to.be(2); - }); - - }); - - describe('getExtent', function() { - - it('returns the expected value', function() { - var extent = pc.getExtent(); - expect(extent).to.eql([0, 1, 2, 3]); - }); - - }); - - describe('remove', function() { - - it('can remove the first point', function() { - pc.remove(0); - expect(pc.buf.getArray()).to.eql([NaN, NaN, 2, 3, NaN, NaN, NaN, NaN]); - }); - - it('can remove the second point', function() { - pc.remove(2); - expect(pc.buf.getArray()).to.eql([0, 1, NaN, NaN, NaN, NaN, NaN, NaN]); - }); - - }); - - describe('set', function() { - - it('marks the updated elements as dirty', function() { - pc.set(2, [4, 5]); - expect(pc.buf.getArray()).to.eql([0, 1, 4, 5, NaN, NaN, NaN, NaN]); - expect(dirtySet.getArray()).to.eql([2, 4]); - }); - - }); - - describe('unpack', function() { - - it('returns the expect value', function() { - expect(pc.unpack()).to.eql([[0, 1], [2, 3]]); - }); - - }); - - describe('after removing the first point', function() { - - beforeEach(function() { - pc.remove(0); - }); - - describe('getCount', function() { - - it('returns the expected value', function() { - expect(pc.getCount()).to.be(1); - }); - - }); - - describe('unpack', function() { - - it('returns the expected value', function() { - expect(pc.unpack()).to.eql([[2, 3]]); - }); - - }); - - }); - - }); - - describe('usage example', function() { - - it('works as expected', function() { - var pc = ol.geom2.PointCollection.pack([[0, 1], [2, 3], [4, 5]], 8); - var dirtySet = new ol.structs.IntegerSet(); - pc.buf.addDirtySet(dirtySet); - expect(pc.buf.getArray()).to.eql([0, 1, 2, 3, 4, 5, NaN, NaN]); - expect(pc.unpack()).to.have.length(3); - expect(pc.getCount()).to.be(3); - expect(pc.get(2)).to.eql([2, 3]); - pc.remove(2); - expect(pc.buf.getArray()).to.eql([0, 1, NaN, NaN, 4, 5, NaN, NaN]); - expect(pc.unpack()).to.have.length(2); - expect(pc.getCount()).to.be(2); - expect(pc.add([6, 7])).to.be(2); - expect(pc.buf.getArray()).to.eql([0, 1, 6, 7, 4, 5, NaN, NaN]); - expect(pc.unpack()).to.have.length(3); - expect(pc.getCount()).to.be(3); - expect(dirtySet.getArray()).to.eql([2, 4]); - }); - - }); - -}); - - -goog.require('ol.geom2.PointCollection'); -goog.require('ol.extent'); -goog.require('ol.structs.Buffer'); -goog.require('ol.structs.IntegerSet');