ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2033 from htulipe/map-renderer-type

Browse Source 
Expose map renderer type in the API.
This commit is contained in:
Tim Schaub
2014-06-06 14:13:50 -06:00
parent 70e3cb3598 0bae61ffe3
commit ee38f8fc2f
6 changed files with 74 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/ol/map.js
View File

@@ -42,6 +42,7 @@ goog.require('ol.ObjectEventType');
goog.require('ol.Pixel');
goog.require('ol.PostRenderFunction');
goog.require('ol.PreRenderFunction');
goog.require('ol.RendererType');
goog.require('ol.Size');
goog.require('ol.Tile');
goog.require('ol.TileQueue');
@@ -99,24 +100,12 @@ ol.OL3_LOGO_URL = 'data:image/png;base64,' +
/**
* Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
* @enum {string}
* @todo api
* @type {Array.<ol.RendererType>}
*/
ol.RendererHint = {
CANVAS: 'canvas',
DOM: 'dom',
WEBGL: 'webgl'
};
/**
* @type {Array.<ol.RendererHint>}
*/
ol.DEFAULT_RENDERER_HINTS = [
ol.RendererHint.CANVAS,
ol.RendererHint.WEBGL,
ol.RendererHint.DOM
ol.DEFAULT_RENDERER_TYPES = [
ol.RendererType.CANVAS,
ol.RendererType.WEBGL,
ol.RendererType.DOM
];
@@ -726,6 +715,15 @@ ol.Map.prototype.getPixelFromCoordinate = function(coordinate) {
};
/**
* Get the map renderer.
* @return {ol.renderer.Map} Renderer
*/
ol.Map.prototype.getRenderer = function() {
return this.renderer_;
};
/**
* Get the size of this map.
* @return {ol.Size|undefined} The size in pixels of the map in the DOM.
@@ -1423,36 +1421,36 @@ ol.Map.createOptionsInternal = function(options) {
var rendererConstructor = ol.renderer.Map;
/**
* @type {Array.<ol.RendererHint>}
* @type {Array.<ol.RendererType>}
*/
var rendererHints;
var rendererTypes;
if (goog.isDef(options.renderer)) {
if (goog.isArray(options.renderer)) {
rendererHints = options.renderer;
rendererTypes = options.renderer;
} else if (goog.isString(options.renderer)) {
rendererHints = [options.renderer];
rendererTypes = [options.renderer];
} else {
goog.asserts.fail('Incorrect format for renderer option');
}
} else {
rendererHints = ol.DEFAULT_RENDERER_HINTS;
rendererTypes = ol.DEFAULT_RENDERER_TYPES;
}
var i, ii;
for (i = 0, ii = rendererHints.length; i < ii; ++i) {
/** @type {ol.RendererHint} */
var rendererHint = rendererHints[i];
if (ol.ENABLE_CANVAS && rendererHint == ol.RendererHint.CANVAS) {
for (i = 0, ii = rendererTypes.length; i < ii; ++i) {
/** @type {ol.RendererType} */
var rendererType = rendererTypes[i];
if (ol.ENABLE_CANVAS && rendererType == ol.RendererType.CANVAS) {
if (ol.BrowserFeature.HAS_CANVAS) {
rendererConstructor = ol.renderer.canvas.Map;
break;
}
} else if (ol.ENABLE_DOM && rendererHint == ol.RendererHint.DOM) {
} else if (ol.ENABLE_DOM && rendererType == ol.RendererType.DOM) {
if (ol.BrowserFeature.HAS_DOM) {
rendererConstructor = ol.renderer.dom.Map;
break;
}
} else if (ol.ENABLE_WEBGL && rendererHint == ol.RendererHint.WEBGL) {
} else if (ol.ENABLE_WEBGL && rendererType == ol.RendererType.WEBGL) {
if (ol.BrowserFeature.HAS_WEBGL) {
rendererConstructor = ol.renderer.webgl.Map;
break;