Merge pull request #7333 from waxenegger/pluggable_calling

Pluggable Map/Layers - function calls to handles and create
This commit is contained in:
Tim Schaub
2017-10-09 16:59:59 -06:00
committed by GitHub
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -239,7 +239,7 @@ ol.PluggableMap = function(options) {
* @type {ol.renderer.Map} * @type {ol.renderer.Map}
* @private * @private
*/ */
this.renderer_ = optionsInternal.mapRendererPlugin.create(this.viewport_, this); this.renderer_ = optionsInternal.mapRendererPlugin['create'](this.viewport_, this);
/** /**
* @type {function(Event)|undefined} * @type {function(Event)|undefined}
@@ -1418,7 +1418,7 @@ ol.PluggableMap.createOptionsInternal = function(options) {
var rendererType = rendererTypes[i]; var rendererType = rendererTypes[i];
for (var j = 0, jj = mapRendererPlugins.length; j < jj; ++j) { for (var j = 0, jj = mapRendererPlugins.length; j < jj; ++j) {
var candidate = mapRendererPlugins[j]; var candidate = mapRendererPlugins[j];
if (candidate.handles(rendererType)) { if (candidate['handles'](rendererType)) {
mapRendererPlugin = candidate; mapRendererPlugin = candidate;
break outer; break outer;
} }
+2 -2
View File
@@ -212,8 +212,8 @@ ol.renderer.Map.prototype.getLayerRenderer = function(layer) {
var type = this.getType(); var type = this.getType();
for (var i = 0, ii = layerRendererPlugins.length; i < ii; ++i) { for (var i = 0, ii = layerRendererPlugins.length; i < ii; ++i) {
var plugin = layerRendererPlugins[i]; var plugin = layerRendererPlugins[i];
if (plugin.handles(type, layer)) { if (plugin['handles'](type, layer)) {
renderer = plugin.create(this, layer); renderer = plugin['create'](this, layer);
break; break;
} }
} }