Rename ol.layer.VectorLayer2 to ol.layer.Vector2

This commit is contained in:
Tom Payne
2013-09-09 15:22:18 +02:00
parent d1659b8e69
commit bcb4813615
5 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -6,7 +6,7 @@ goog.require('ol.control.MousePosition');
goog.require('ol.geom2.LineStringCollection'); goog.require('ol.geom2.LineStringCollection');
goog.require('ol.geom2.PointCollection'); goog.require('ol.geom2.PointCollection');
goog.require('ol.layer.Tile'); goog.require('ol.layer.Tile');
goog.require('ol.layer.VectorLayer2'); goog.require('ol.layer.Vector2');
goog.require('ol.source.OSM'); goog.require('ol.source.OSM');
goog.require('ol.source.Vector2'); goog.require('ol.source.Vector2');
goog.require('ol.webgl.SUPPORTED'); goog.require('ol.webgl.SUPPORTED');
@@ -59,7 +59,7 @@ if (!ol.webgl.SUPPORTED) {
new ol.layer.Tile({ new ol.layer.Tile({
source: new ol.source.OSM() source: new ol.source.OSM()
}), }),
new ol.layer.VectorLayer2({ new ol.layer.Vector2({
source: new ol.source.Vector2({ source: new ol.source.Vector2({
lineStringCollections: [lineStringCollection], lineStringCollections: [lineStringCollection],
projection: 'EPSG:3857', projection: 'EPSG:3857',
+1 -1
View File
@@ -1 +1 @@
@exportSymbol ol.layer.VectorLayer2 @exportSymbol ol.layer.Vector2
+4 -4
View File
@@ -1,4 +1,4 @@
goog.provide('ol.layer.VectorLayer2'); goog.provide('ol.layer.Vector2');
goog.require('ol.layer.Layer'); goog.require('ol.layer.Layer');
goog.require('ol.source.Vector2'); goog.require('ol.source.Vector2');
@@ -11,15 +11,15 @@ goog.require('ol.source.Vector2');
* @extends {ol.layer.Layer} * @extends {ol.layer.Layer}
* @param {ol.layer.LayerOptions} options Options. * @param {ol.layer.LayerOptions} options Options.
*/ */
ol.layer.VectorLayer2 = function(options) { ol.layer.Vector2 = function(options) {
goog.base(this, 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. * @return {ol.source.Vector2} Source.
*/ */
ol.layer.VectorLayer2.prototype.getVectorSource = function() { ol.layer.Vector2.prototype.getVectorSource = function() {
return /** @type {ol.source.Vector2} */ (this.getSource()); return /** @type {ol.source.Vector2} */ (this.getSource());
}; };
+2 -2
View File
@@ -19,7 +19,7 @@ goog.require('ol.Tile');
goog.require('ol.css'); goog.require('ol.css');
goog.require('ol.layer.Image'); goog.require('ol.layer.Image');
goog.require('ol.layer.Tile'); goog.require('ol.layer.Tile');
goog.require('ol.layer.VectorLayer2'); goog.require('ol.layer.Vector2');
goog.require('ol.renderer.Map'); goog.require('ol.renderer.Map');
goog.require('ol.renderer.webgl.ImageLayer'); goog.require('ol.renderer.webgl.ImageLayer');
goog.require('ol.renderer.webgl.TileLayer'); 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); return new ol.renderer.webgl.TileLayer(this, layer);
} else if (layer instanceof ol.layer.Image) { } else if (layer instanceof ol.layer.Image) {
return new ol.renderer.webgl.ImageLayer(this, layer); 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); return new ol.renderer.webgl.VectorLayer2(this, layer);
} else { } else {
goog.asserts.fail(); goog.asserts.fail();
@@ -13,7 +13,7 @@ goog.require('ol.renderer.webgl.vectorlayer2.shader.PointCollection');
* @constructor * @constructor
* @extends {ol.renderer.webgl.Layer} * @extends {ol.renderer.webgl.Layer}
* @param {ol.renderer.Map} mapRenderer Map renderer. * @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) { 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() { ol.renderer.webgl.VectorLayer2.prototype.getVectorLayer = function() {
return /** @type {ol.layer.VectorLayer2} */ (this.getLayer()); return /** @type {ol.layer.Vector2} */ (this.getLayer());
}; };