This makes ol/Map use the Canvas map renderer.

To use the experimental WebGL renderer, use ol/WebGLMap instead.
This commit is contained in:
Tim Schaub
2018-03-18 12:03:49 -06:00
parent c882c22e2f
commit 2a9fde86b1
2 changed files with 17 additions and 32 deletions
-14
View File
@@ -13,11 +13,6 @@ import CanvasMapRenderer from './renderer/canvas/Map.js';
import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js'; import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js'; import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js';
import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.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); register(PluginType.MAP_RENDERER, CanvasMapRenderer);
registerMultiple(PluginType.LAYER_RENDERER, [ registerMultiple(PluginType.LAYER_RENDERER, [
@@ -27,15 +22,6 @@ registerMultiple(PluginType.LAYER_RENDERER, [
CanvasVectorTileLayerRenderer CanvasVectorTileLayerRenderer
]); ]);
// TODO: move these to new ol-webgl package
register(PluginType.MAP_RENDERER, WebGLMapRenderer);
registerMultiple(PluginType.LAYER_RENDERER, [
WebGLImageLayerRenderer,
WebGLTileLayerRenderer,
WebGLVectorLayerRenderer
]);
/** /**
* @classdesc * @classdesc
* The map is the core component of OpenLayers. For a map to render, a view, * The map is the core component of OpenLayers. For a map to render, a view,
+17 -18
View File
@@ -1,5 +1,5 @@
/** /**
* @module ol/CanvasMap * @module ol/WebGLMap
*/ */
import {inherits} from './index.js'; import {inherits} from './index.js';
import PluggableMap from './PluggableMap.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 {defaults as defaultInteractions} from './interaction.js';
import {assign} from './obj.js'; import {assign} from './obj.js';
import {register, registerMultiple} from './plugins.js'; import {register, registerMultiple} from './plugins.js';
import CanvasImageLayerRenderer from './renderer/canvas/ImageLayer.js'; import WebGLImageLayerRenderer from './renderer/webgl/ImageLayer.js';
import CanvasMapRenderer from './renderer/canvas/Map.js'; import WebGLMapRenderer from './renderer/webgl/Map.js';
import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js'; import WebGLTileLayerRenderer from './renderer/webgl/TileLayer.js';
import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js'; import WebGLVectorLayerRenderer from './renderer/webgl/VectorLayer.js';
import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.js';
register(PluginType.MAP_RENDERER, CanvasMapRenderer); // TODO: move these to new ol-webgl package
register(PluginType.MAP_RENDERER, WebGLMapRenderer);
registerMultiple(PluginType.LAYER_RENDERER, [ registerMultiple(PluginType.LAYER_RENDERER, [
CanvasImageLayerRenderer, WebGLImageLayerRenderer,
CanvasTileLayerRenderer, WebGLTileLayerRenderer,
CanvasVectorLayerRenderer, WebGLVectorLayerRenderer
CanvasVectorTileLayerRenderer
]); ]);
/** /**
* @classdesc * @classdesc
* The map is the core component of OpenLayers. For a map to render, a view, * The WebGLMap uses WebGL for rendering map layers. This renderer has limited
* one or more layers, and a target container are needed: * 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 TileLayer from 'ol/layer/Tile';
* import OSM from 'ol/source/OSM'; * import OSM from 'ol/source/OSM';
* import View from 'ol/View'; * import View from 'ol/View';
* *
* var map = new CanvasMap({ * var map = new WebGLMap({
* view: new View({ * view: new View({
* center: [0, 0], * center: [0, 0],
* zoom: 1 * zoom: 1
@@ -78,7 +77,7 @@ registerMultiple(PluginType.LAYER_RENDERER, [
* @fires module:ol/render/Event~Event#precompose * @fires module:ol/render/Event~Event#precompose
* @api * @api
*/ */
const CanvasMap = function(options) { const WebGLMap = function(options) {
options = assign({}, options); options = assign({}, options);
delete options.renderer; delete options.renderer;
if (!options.controls) { if (!options.controls) {
@@ -91,6 +90,6 @@ const CanvasMap = function(options) {
PluggableMap.call(this, options); PluggableMap.call(this, options);
}; };
inherits(CanvasMap, PluggableMap); inherits(WebGLMap, PluggableMap);
export default CanvasMap; export default WebGLMap;