From e8ab4f9f0c2ecfe4219d906c784713cc7829ee6e Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Mon, 10 Jun 2013 11:22:32 +0200
Subject: [PATCH] Removing canvas renderer stub for VectorLayer2

Setting the renderer of the ten-thousand-points example to
WebGL should remove the need for this stub. This is basically
the same approach we took for all vector examples in master,
where we set the renderer to Canvas.
---
 examples/ten-thousand-points.js               |  4 +-
 src/ol/renderer/canvas/canvasmaprenderer.js   |  4 --
 .../canvas/canvasvectorlayer2renderer.js      | 43 -------------------
 3 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 src/ol/renderer/canvas/canvasvectorlayer2renderer.js

diff --git a/examples/ten-thousand-points.js b/examples/ten-thousand-points.js
index dcb33d75e1..87552e26e0 100644
--- a/examples/ten-thousand-points.js
+++ b/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],
diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js
index f155483e99..3849cff227 100644
--- a/src/ol/renderer/canvas/canvasmaprenderer.js
+++ b/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;
diff --git a/src/ol/renderer/canvas/canvasvectorlayer2renderer.js b/src/ol/renderer/canvas/canvasvectorlayer2renderer.js
deleted file mode 100644
index 6167e2ca07..0000000000
--- a/src/ol/renderer/canvas/canvasvectorlayer2renderer.js
+++ /dev/null
@@ -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
-};