diff --git a/examples/ten-thousand-points.js b/examples/ten-thousand-points.js index 8eeea59b95..301d34be56 100644 --- a/examples/ten-thousand-points.js +++ b/examples/ten-thousand-points.js @@ -6,7 +6,7 @@ goog.require('ol.control.MousePosition'); goog.require('ol.geom2.LineStringCollection'); goog.require('ol.geom2.PointCollection'); goog.require('ol.layer.Tile'); -goog.require('ol.layer.VectorLayer2'); +goog.require('ol.layer.Vector2'); goog.require('ol.source.OSM'); goog.require('ol.source.Vector2'); goog.require('ol.webgl.SUPPORTED'); @@ -59,7 +59,7 @@ if (!ol.webgl.SUPPORTED) { new ol.layer.Tile({ source: new ol.source.OSM() }), - new ol.layer.VectorLayer2({ + new ol.layer.Vector2({ source: new ol.source.Vector2({ lineStringCollections: [lineStringCollection], projection: 'EPSG:3857', diff --git a/src/ol/layer/vectorlayer2.exports b/src/ol/layer/vectorlayer2.exports index 84c34826f8..576bf755fd 100644 --- a/src/ol/layer/vectorlayer2.exports +++ b/src/ol/layer/vectorlayer2.exports @@ -1 +1 @@ -@exportSymbol ol.layer.VectorLayer2 +@exportSymbol ol.layer.Vector2 diff --git a/src/ol/layer/vectorlayer2.js b/src/ol/layer/vectorlayer2.js index 2f17d8783e..8e86d76645 100644 --- a/src/ol/layer/vectorlayer2.js +++ b/src/ol/layer/vectorlayer2.js @@ -1,4 +1,4 @@ -goog.provide('ol.layer.VectorLayer2'); +goog.provide('ol.layer.Vector2'); goog.require('ol.layer.Layer'); goog.require('ol.source.Vector2'); @@ -11,15 +11,15 @@ goog.require('ol.source.Vector2'); * @extends {ol.layer.Layer} * @param {ol.layer.LayerOptions} options Options. */ -ol.layer.VectorLayer2 = function(options) { +ol.layer.Vector2 = function(options) { goog.base(this, options); }; -goog.inherits(ol.layer.VectorLayer2, ol.layer.Layer); +goog.inherits(ol.layer.Vector2, ol.layer.Layer); /** * @return {ol.source.Vector2} Source. */ -ol.layer.VectorLayer2.prototype.getVectorSource = function() { +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 526b6d7005..41cfeaf50f 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -19,7 +19,7 @@ goog.require('ol.Tile'); goog.require('ol.css'); goog.require('ol.layer.Image'); goog.require('ol.layer.Tile'); -goog.require('ol.layer.VectorLayer2'); +goog.require('ol.layer.Vector2'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.webgl.ImageLayer'); goog.require('ol.renderer.webgl.TileLayer'); @@ -303,7 +303,7 @@ 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.VectorLayer2) { + } else if (layer instanceof ol.layer.Vector2) { return new ol.renderer.webgl.VectorLayer2(this, layer); } else { goog.asserts.fail(); diff --git a/src/ol/renderer/webgl/webglvectorlayer2renderer.js b/src/ol/renderer/webgl/webglvectorlayer2renderer.js index 436732107c..812f998ef5 100644 --- a/src/ol/renderer/webgl/webglvectorlayer2renderer.js +++ b/src/ol/renderer/webgl/webglvectorlayer2renderer.js @@ -13,7 +13,7 @@ goog.require('ol.renderer.webgl.vectorlayer2.shader.PointCollection'); * @constructor * @extends {ol.renderer.webgl.Layer} * @param {ol.renderer.Map} mapRenderer Map renderer. - * @param {ol.layer.VectorLayer2} vectorLayer2 Vector layer. + * @param {ol.layer.Vector2} vectorLayer2 Vector layer. */ ol.renderer.webgl.VectorLayer2 = function(mapRenderer, vectorLayer2) { @@ -45,10 +45,10 @@ goog.inherits(ol.renderer.webgl.VectorLayer2, ol.renderer.webgl.Layer); /** - * @return {ol.layer.VectorLayer2} Vector layer. + * @return {ol.layer.Vector2} Vector layer. */ ol.renderer.webgl.VectorLayer2.prototype.getVectorLayer = function() { - return /** @type {ol.layer.VectorLayer2} */ (this.getLayer()); + return /** @type {ol.layer.Vector2} */ (this.getLayer()); };