Merge pull request #771 from ahocevar/leaner-webgl-vector

Removing canvas renderer stub for VectorLayer2

examples/ten-thousand-points.js

@@ -1,5 +1,5 @@
 goog.require('ol.Map');
-goog.require('ol.RendererHints');
+goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.control.MousePosition');
 goog.require('ol.control.defaults');
@@ -59,7 +59,7 @@ var map = new ol.Map({
       })
     })
   ],
-  renderers: ol.RendererHints.createFromQueryData(),
+  renderer: ol.RendererHint.WEBGL,
   target: 'map',
   view: new ol.View2D({
     center: [0, 0],

src/ol/renderer/canvas/canvasmaprenderer.js

@@ -12,12 +12,10 @@ goog.require('ol.css');
 goog.require('ol.layer.ImageLayer');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.layer.Vector');
-goog.require('ol.layer.VectorLayer2');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.ImageLayer');
 goog.require('ol.renderer.canvas.TileLayer');
 goog.require('ol.renderer.canvas.VectorLayer');
-goog.require('ol.renderer.canvas.VectorLayer2');
 goog.require('ol.size');
 
 
@@ -74,8 +72,6 @@ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) {
     return new ol.renderer.canvas.TileLayer(this, layer);
   } else if (layer instanceof ol.layer.Vector) {
     return new ol.renderer.canvas.VectorLayer(this, layer);
-  } else if (layer instanceof ol.layer.VectorLayer2) {
-    return new ol.renderer.canvas.VectorLayer2(this, layer);
   } else {
     goog.asserts.fail();
     return null;

src/ol/renderer/canvas/canvasvectorlayer2renderer.js

@@ -1,43 +0,0 @@
-goog.provide('ol.renderer.canvas.VectorLayer2');
-
-goog.require('ol.renderer.canvas.Layer');
-
-
-
-/**
- * @constructor
- * @extends {ol.renderer.canvas.Layer}
- * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.VectorLayer2} vectorLayer2 Vector layer.
- */
-ol.renderer.canvas.VectorLayer2 = function(mapRenderer, vectorLayer2) {
-
-  goog.base(this, mapRenderer, vectorLayer2);
-
-};
-goog.inherits(ol.renderer.canvas.VectorLayer2, ol.renderer.canvas.Layer);
-
-
-/**
- * @inheritDoc
- */
-ol.renderer.canvas.VectorLayer2.prototype.getImage = function() {
-  return null; // FIXME
-};
-
-
-/**
- * @return {ol.layer.VectorLayer2} Vector layer.
- */
-ol.renderer.canvas.VectorLayer2.prototype.getVectorLayer = function() {
-  return /** @type {ol.layer.VectorLayer2} */ (this.getLayer());
-};
-
-
-/**
- * @inheritDoc
- */
-ol.renderer.canvas.VectorLayer2.prototype.renderFrame =
-    function(frameState, layerState) {
-  // FIXME
-};