From 2a9fde86b1e2eb0ce14e381a1830672b0c0ce844 Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Sun, 18 Mar 2018 12:03:49 -0600
Subject: [PATCH] This makes ol/Map use the Canvas map renderer.

To use the experimental WebGL renderer, use ol/WebGLMap instead.
---
 src/ol/Map.js                        | 14 -----------
 src/ol/{CanvasMap.js => WebGLMap.js} | 35 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 32 deletions(-)
 rename src/ol/{CanvasMap.js => WebGLMap.js} (76%)

diff --git a/src/ol/Map.js b/src/ol/Map.js
index 09c5197f2b..fca99763a6 100644
--- a/src/ol/Map.js
+++ b/src/ol/Map.js
@@ -13,11 +13,6 @@ import CanvasMapRenderer from './renderer/canvas/Map.js';
 import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
 import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js';
 import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.js';
-import WebGLImageLayerRenderer from './renderer/webgl/ImageLayer.js';
-import WebGLMapRenderer from './renderer/webgl/Map.js';
-import WebGLTileLayerRenderer from './renderer/webgl/TileLayer.js';
-import WebGLVectorLayerRenderer from './renderer/webgl/VectorLayer.js';
-
 
 register(PluginType.MAP_RENDERER, CanvasMapRenderer);
 registerMultiple(PluginType.LAYER_RENDERER, [
@@ -27,15 +22,6 @@ registerMultiple(PluginType.LAYER_RENDERER, [
   CanvasVectorTileLayerRenderer
 ]);
 
-// TODO: move these to new ol-webgl package
-register(PluginType.MAP_RENDERER, WebGLMapRenderer);
-registerMultiple(PluginType.LAYER_RENDERER, [
-  WebGLImageLayerRenderer,
-  WebGLTileLayerRenderer,
-  WebGLVectorLayerRenderer
-]);
-
-
 /**
  * @classdesc
  * The map is the core component of OpenLayers. For a map to render, a view,
diff --git a/src/ol/CanvasMap.js b/src/ol/WebGLMap.js
similarity index 76%
rename from src/ol/CanvasMap.js
rename to src/ol/WebGLMap.js
index a896319eac..237eed5f67 100644
--- a/src/ol/CanvasMap.js
+++ b/src/ol/WebGLMap.js
@@ -1,5 +1,5 @@
 /**
- * @module ol/CanvasMap
+ * @module ol/WebGLMap
  */
 import {inherits} from './index.js';
 import PluggableMap from './PluggableMap.js';
@@ -8,33 +8,32 @@ import {defaults as defaultControls} from './control.js';
 import {defaults as defaultInteractions} from './interaction.js';
 import {assign} from './obj.js';
 import {register, registerMultiple} from './plugins.js';
-import CanvasImageLayerRenderer from './renderer/canvas/ImageLayer.js';
-import CanvasMapRenderer from './renderer/canvas/Map.js';
-import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
-import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js';
-import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.js';
+import WebGLImageLayerRenderer from './renderer/webgl/ImageLayer.js';
+import WebGLMapRenderer from './renderer/webgl/Map.js';
+import WebGLTileLayerRenderer from './renderer/webgl/TileLayer.js';
+import WebGLVectorLayerRenderer from './renderer/webgl/VectorLayer.js';
 
 
-register(PluginType.MAP_RENDERER, CanvasMapRenderer);
+// TODO: move these to new ol-webgl package
+register(PluginType.MAP_RENDERER, WebGLMapRenderer);
 registerMultiple(PluginType.LAYER_RENDERER, [
-  CanvasImageLayerRenderer,
-  CanvasTileLayerRenderer,
-  CanvasVectorLayerRenderer,
-  CanvasVectorTileLayerRenderer
+  WebGLImageLayerRenderer,
+  WebGLTileLayerRenderer,
+  WebGLVectorLayerRenderer
 ]);
 
 
 /**
  * @classdesc
- * The map is the core component of OpenLayers. For a map to render, a view,
- * one or more layers, and a target container are needed:
+ * The WebGLMap uses WebGL for rendering map layers.  This renderer has limited
+ * support for vector data and no support for vector tiles.
  *
- *     import CanvasMap from 'ol/CanvasMap';
+ *     import WebGLMap from 'ol/WebGLMap';
  *     import TileLayer from 'ol/layer/Tile';
  *     import OSM from 'ol/source/OSM';
  *     import View from 'ol/View';
  *
- *     var map = new CanvasMap({
+ *     var map = new WebGLMap({
  *       view: new View({
  *         center: [0, 0],
  *         zoom: 1
@@ -78,7 +77,7 @@ registerMultiple(PluginType.LAYER_RENDERER, [
  * @fires module:ol/render/Event~Event#precompose
  * @api
  */
-const CanvasMap = function(options) {
+const WebGLMap = function(options) {
   options = assign({}, options);
   delete options.renderer;
   if (!options.controls) {
@@ -91,6 +90,6 @@ const CanvasMap = function(options) {
   PluggableMap.call(this, options);
 };
 
-inherits(CanvasMap, PluggableMap);
+inherits(WebGLMap, PluggableMap);
 
-export default CanvasMap;
+export default WebGLMap;