Merge pull request #1657 from elemoine/renderer

Do not expose both renderer and renderers options
This commit is contained in:
Éric Lemoine
2014-02-06 18:37:27 +01:00
36 changed files with 44 additions and 41 deletions
+1 -2
View File
@@ -42,8 +42,7 @@
* @property {boolean|undefined} ol3Logo Show ol3 logo. Default is `true`.
* @property {ol.Collection|Array.<ol.Overlay>|undefined} overlays
* Overlays initially added to the map.
* @property {ol.RendererHint|undefined} renderer Renderer.
* @property {Array.<ol.RendererHint>|undefined} renderers Renderers.
* @property {ol.RendererHint|Array.<ol.RendererHint>|undefined} renderer Renderer.
* @property {Element|string|undefined} target The container for the map.
* @property {ol.IView|undefined} view The map's view. Currently
* {@link ol.View2D} is available as view.
+8 -4
View File
@@ -1370,10 +1370,14 @@ ol.Map.createOptionsInternal = function(options) {
* @type {Array.<ol.RendererHint>}
*/
var rendererHints;
if (goog.isDef(options.renderers)) {
rendererHints = options.renderers;
} else if (goog.isDef(options.renderer)) {
rendererHints = [options.renderer];
if (goog.isDef(options.renderer)) {
if (goog.isArray(options.renderer)) {
rendererHints = options.renderer;
} else if (goog.isString(options.renderer)) {
rendererHints = [options.renderer];
} else {
goog.asserts.fail('Incorrect format for renderer option');
}
} else {
rendererHints = ol.DEFAULT_RENDERER_HINTS;
}