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

Rename ol.RendererHint to ol.RendererType

Browse Source
This commit is contained in:
Hadrien Tulipe
2014-05-08 17:17:27 +02:00
parent 1d6f9ca80b
commit 2e587c1be8
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
externs/olx.js
+2 -2
View File
@@ -108,7 +108,7 @@ olx.GeolocationOptions.prototype.projection;
* layers: (Array.<ol.layer.Base>|ol.Collection|undefined), * layers: (Array.<ol.layer.Base>|ol.Collection|undefined),
* ol3Logo: (boolean|undefined), * ol3Logo: (boolean|undefined),
* overlays: (ol.Collection|Array.<ol.Overlay>|undefined), * overlays: (ol.Collection|Array.<ol.Overlay>|undefined),
* renderer: (ol.RendererHint|Array.<ol.RendererHint|string>|string|undefined), * renderer: (ol.RendererType|Array.<ol.RendererType|string>|string|undefined),
* target: (Element|string|undefined), * target: (Element|string|undefined),
* view: (ol.IView|undefined)}} * view: (ol.IView|undefined)}}
* @todo api * @todo api
@@ -181,7 +181,7 @@ olx.MapOptions.prototype.overlays;
/** /**
* Renderer. * Renderer.
* @type {ol.RendererHint|Array.<ol.RendererHint|string>|string|undefined} * @type {ol.RendererType|Array.<ol.RendererType|string>|string|undefined}
*/ */
olx.MapOptions.prototype.renderer; olx.MapOptions.prototype.renderer;
src/ol/map.js
+16 -16
View File
@@ -103,7 +103,7 @@ ol.OL3_LOGO_URL = 'data:image/png;base64,' +
* @enum {string} * @enum {string}
* @todo api * @todo api
*/ */
ol.RendererHint = { ol.RendererType = {
CANVAS: 'canvas', CANVAS: 'canvas',
DOM: 'dom', DOM: 'dom',
WEBGL: 'webgl' WEBGL: 'webgl'
@@ -111,12 +111,12 @@ ol.RendererHint = {
/** /**
* @type {Array.<ol.RendererHint>} * @type {Array.<ol.RendererType>}
*/ */
ol.DEFAULT_RENDERER_HINTS = [ ol.DEFAULT_RENDERER_HINTS = [
ol.RendererHint.CANVAS, ol.RendererType.CANVAS,
ol.RendererHint.WEBGL, ol.RendererType.WEBGL,
ol.RendererHint.DOM ol.RendererType.DOM
]; ];
@@ -1431,36 +1431,36 @@ ol.Map.createOptionsInternal = function(options) {
var rendererConstructor = ol.renderer.Map; var rendererConstructor = ol.renderer.Map;
/** /**
* @type {Array.<ol.RendererHint>} * @type {Array.<ol.RendererType>}
*/ */
var rendererHints; var rendererTypes;
if (goog.isDef(options.renderer)) { if (goog.isDef(options.renderer)) {
if (goog.isArray(options.renderer)) { if (goog.isArray(options.renderer)) {
rendererHints = options.renderer; rendererTypes = options.renderer;
} else if (goog.isString(options.renderer)) { } else if (goog.isString(options.renderer)) {
rendererHints = [options.renderer]; rendererTypes = [options.renderer];
} else { } else {
goog.asserts.fail('Incorrect format for renderer option'); goog.asserts.fail('Incorrect format for renderer option');
} }
} else { } else {
rendererHints = ol.DEFAULT_RENDERER_HINTS; rendererTypes = ol.DEFAULT_RENDERER_HINTS;
} }
var i, ii; var i, ii;
for (i = 0, ii = rendererHints.length; i < ii; ++i) { for (i = 0, ii = rendererTypes.length; i < ii; ++i) {
/** @type {ol.RendererHint} */ /** @type {ol.RendererType} */
var rendererHint = rendererHints[i]; var rendererType = rendererTypes[i];
if (ol.ENABLE_CANVAS && rendererHint == ol.RendererHint.CANVAS) { if (ol.ENABLE_CANVAS && rendererType == ol.RendererType.CANVAS) {
if (ol.BrowserFeature.HAS_CANVAS) { if (ol.BrowserFeature.HAS_CANVAS) {
rendererConstructor = ol.renderer.canvas.Map; rendererConstructor = ol.renderer.canvas.Map;
break; break;
} }
} else if (ol.ENABLE_DOM && rendererHint == ol.RendererHint.DOM) { } else if (ol.ENABLE_DOM && rendererType == ol.RendererType.DOM) {
if (ol.BrowserFeature.HAS_DOM) { if (ol.BrowserFeature.HAS_DOM) {
rendererConstructor = ol.renderer.dom.Map; rendererConstructor = ol.renderer.dom.Map;
break; break;
} }
} else if (ol.ENABLE_WEBGL && rendererHint == ol.RendererHint.WEBGL) { } else if (ol.ENABLE_WEBGL && rendererType == ol.RendererType.WEBGL) {
if (ol.BrowserFeature.HAS_WEBGL) { if (ol.BrowserFeature.HAS_WEBGL) {
rendererConstructor = ol.renderer.webgl.Map; rendererConstructor = ol.renderer.webgl.Map;
break; break;