From e428b66ab4905b58dfbafcdf3c89f4e4caa5199a Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 9 Sep 2013 14:18:24 +0200 Subject: [PATCH 01/12] Rename ol.layer.LayerBase to ol.layer.Base --- src/objectliterals.jsdoc | 6 +-- src/ol/layer/layer.js | 6 +-- src/ol/layer/layerbase.js | 94 +++++++++++++++++++------------------- src/ol/layer/layergroup.js | 10 ++-- src/ol/map.js | 10 ++-- 5 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index 4265022b8c..10037cdc50 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -53,7 +53,7 @@ * @property {ol.Collection|Array.|undefined} controls * Controls initially added to the map. * @property {ol.Collection|undefined} interactions Interactions. - * @property {Array.|ol.Collection|undefined} layers Layers. + * @property {Array.|ol.Collection|undefined} layers Layers. * @property {ol.Collection|Array.|undefined} overlays * Overlays initially added to the map. * @property {ol.RendererHint|undefined} renderer Renderer. @@ -312,7 +312,7 @@ */ /** - * @typedef {Object} ol.layer.LayerBaseOptions + * @typedef {Object} ol.layer.BaseOptions * @property {number|undefined} brightness Brightness. * @property {number|undefined} contrast Contrast. * @property {number|undefined} hue Hue. @@ -340,7 +340,7 @@ * @property {number|undefined} opacity Opacity. * @property {number|undefined} saturation Saturation. * @property {boolean|undefined} visible Visibility. - * @property {Array.|ol.Collection|undefined} layers Child layers. + * @property {Array.|ol.Collection|undefined} layers Child layers. */ /** diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index 98a3b027a8..ef5a60fb0d 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -4,14 +4,14 @@ goog.require('goog.asserts'); goog.require('goog.events'); goog.require('goog.events.EventType'); goog.require('goog.object'); -goog.require('ol.layer.LayerBase'); +goog.require('ol.layer.Base'); goog.require('ol.source.Source'); /** * @constructor - * @extends {ol.layer.LayerBase} + * @extends {ol.layer.Base} * @param {ol.layer.LayerOptions} options Layer options. */ ol.layer.Layer = function(options) { @@ -37,7 +37,7 @@ ol.layer.Layer = function(options) { } }; -goog.inherits(ol.layer.Layer, ol.layer.LayerBase); +goog.inherits(ol.layer.Layer, ol.layer.Base); /** diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index d1a7f5f05d..67ba0decc0 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -1,4 +1,4 @@ -goog.provide('ol.layer.LayerBase'); +goog.provide('ol.layer.Base'); goog.provide('ol.layer.LayerProperty'); goog.provide('ol.layer.LayerState'); @@ -38,9 +38,9 @@ ol.layer.LayerState; /** * @constructor * @extends {ol.Object} - * @param {ol.layer.LayerBaseOptions} options Layer options. + * @param {ol.layer.BaseOptions} options Layer options. */ -ol.layer.LayerBase = function(options) { +ol.layer.Base = function(options) { goog.base(this); @@ -76,13 +76,13 @@ ol.layer.LayerBase = function(options) { this.handleLayerVisibleChange, false, this); }; -goog.inherits(ol.layer.LayerBase, ol.Object); +goog.inherits(ol.layer.Base, ol.Object); /** * @protected */ -ol.layer.LayerBase.prototype.dispatchChangeEvent = function() { +ol.layer.Base.prototype.dispatchChangeEvent = function() { this.dispatchEvent(goog.events.EventType.CHANGE); }; @@ -90,43 +90,43 @@ ol.layer.LayerBase.prototype.dispatchChangeEvent = function() { /** * @return {number} Brightness. */ -ol.layer.LayerBase.prototype.getBrightness = function() { +ol.layer.Base.prototype.getBrightness = function() { return /** @type {number} */ (this.get(ol.layer.LayerProperty.BRIGHTNESS)); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'getBrightness', - ol.layer.LayerBase.prototype.getBrightness); + ol.layer.Base.prototype.getBrightness); /** * @return {number} Contrast. */ -ol.layer.LayerBase.prototype.getContrast = function() { +ol.layer.Base.prototype.getContrast = function() { return /** @type {number} */ (this.get(ol.layer.LayerProperty.CONTRAST)); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'getContrast', - ol.layer.LayerBase.prototype.getContrast); + ol.layer.Base.prototype.getContrast); /** * @return {number} Hue. */ -ol.layer.LayerBase.prototype.getHue = function() { +ol.layer.Base.prototype.getHue = function() { return /** @type {number} */ (this.get(ol.layer.LayerProperty.HUE)); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'getHue', - ol.layer.LayerBase.prototype.getHue); + ol.layer.Base.prototype.getHue); /** * @return {ol.layer.LayerState} Layer state. */ -ol.layer.LayerBase.prototype.getLayerState = function() { +ol.layer.Base.prototype.getLayerState = function() { var brightness = this.getBrightness(); var contrast = this.getContrast(); var hue = this.getHue(); @@ -151,7 +151,7 @@ ol.layer.LayerBase.prototype.getLayerState = function() { * modified in place). * @return {Array.} Array of layers. */ -ol.layer.LayerBase.prototype.getLayersArray = goog.abstractMethod; +ol.layer.Base.prototype.getLayersArray = goog.abstractMethod; /** @@ -164,49 +164,49 @@ ol.layer.LayerBase.prototype.getLayersArray = goog.abstractMethod; * layerStates: Array.}} Object that store both the * layers and the layerStates. */ -ol.layer.LayerBase.prototype.getLayerStatesArray = goog.abstractMethod; +ol.layer.Base.prototype.getLayerStatesArray = goog.abstractMethod; /** * @return {number} Opacity. */ -ol.layer.LayerBase.prototype.getOpacity = function() { +ol.layer.Base.prototype.getOpacity = function() { return /** @type {number} */ (this.get(ol.layer.LayerProperty.OPACITY)); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'getOpacity', - ol.layer.LayerBase.prototype.getOpacity); + ol.layer.Base.prototype.getOpacity); /** * @return {number} Saturation. */ -ol.layer.LayerBase.prototype.getSaturation = function() { +ol.layer.Base.prototype.getSaturation = function() { return /** @type {number} */ (this.get(ol.layer.LayerProperty.SATURATION)); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'getSaturation', - ol.layer.LayerBase.prototype.getSaturation); + ol.layer.Base.prototype.getSaturation); /** * @return {boolean} Visible. */ -ol.layer.LayerBase.prototype.getVisible = function() { +ol.layer.Base.prototype.getVisible = function() { return /** @type {boolean} */ (this.get(ol.layer.LayerProperty.VISIBLE)); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'getVisible', - ol.layer.LayerBase.prototype.getVisible); + ol.layer.Base.prototype.getVisible); /** * @protected */ -ol.layer.LayerBase.prototype.handleLayerChange = function() { +ol.layer.Base.prototype.handleLayerChange = function() { if (this.getVisible() && this.isReady()) { this.dispatchChangeEvent(); } @@ -216,7 +216,7 @@ ol.layer.LayerBase.prototype.handleLayerChange = function() { /** * @protected */ -ol.layer.LayerBase.prototype.handleLayerVisibleChange = function() { +ol.layer.Base.prototype.handleLayerVisibleChange = function() { if (this.isReady()) { this.dispatchChangeEvent(); } @@ -226,7 +226,7 @@ ol.layer.LayerBase.prototype.handleLayerVisibleChange = function() { /** * @return {boolean} Is ready. */ -ol.layer.LayerBase.prototype.isReady = goog.abstractMethod; +ol.layer.Base.prototype.isReady = goog.abstractMethod; /** @@ -249,13 +249,13 @@ ol.layer.LayerBase.prototype.isReady = goog.abstractMethod; * * @param {number} brightness Brightness. */ -ol.layer.LayerBase.prototype.setBrightness = function(brightness) { +ol.layer.Base.prototype.setBrightness = function(brightness) { this.set(ol.layer.LayerProperty.BRIGHTNESS, brightness); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'setBrightness', - ol.layer.LayerBase.prototype.setBrightness); + ol.layer.Base.prototype.setBrightness); /** @@ -265,13 +265,13 @@ goog.exportProperty( * * @param {number} contrast Contrast. */ -ol.layer.LayerBase.prototype.setContrast = function(contrast) { +ol.layer.Base.prototype.setContrast = function(contrast) { this.set(ol.layer.LayerProperty.CONTRAST, contrast); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'setContrast', - ol.layer.LayerBase.prototype.setContrast); + ol.layer.Base.prototype.setContrast); /** @@ -279,25 +279,25 @@ goog.exportProperty( * unchanged. Other values are radians around the color circle. * @param {number} hue Hue. */ -ol.layer.LayerBase.prototype.setHue = function(hue) { +ol.layer.Base.prototype.setHue = function(hue) { this.set(ol.layer.LayerProperty.HUE, hue); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'setHue', - ol.layer.LayerBase.prototype.setHue); + ol.layer.Base.prototype.setHue); /** * @param {number} opacity Opacity. */ -ol.layer.LayerBase.prototype.setOpacity = function(opacity) { +ol.layer.Base.prototype.setOpacity = function(opacity) { this.set(ol.layer.LayerProperty.OPACITY, opacity); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'setOpacity', - ol.layer.LayerBase.prototype.setOpacity); + ol.layer.Base.prototype.setOpacity); /** @@ -308,22 +308,22 @@ goog.exportProperty( * * @param {number} saturation Saturation. */ -ol.layer.LayerBase.prototype.setSaturation = function(saturation) { +ol.layer.Base.prototype.setSaturation = function(saturation) { this.set(ol.layer.LayerProperty.SATURATION, saturation); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'setSaturation', - ol.layer.LayerBase.prototype.setSaturation); + ol.layer.Base.prototype.setSaturation); /** * @param {boolean} visible Visible. */ -ol.layer.LayerBase.prototype.setVisible = function(visible) { +ol.layer.Base.prototype.setVisible = function(visible) { this.set(ol.layer.LayerProperty.VISIBLE, visible); }; goog.exportProperty( - ol.layer.LayerBase.prototype, + ol.layer.Base.prototype, 'setVisible', - ol.layer.LayerBase.prototype.setVisible); + ol.layer.Base.prototype.setVisible); diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/layergroup.js index b149205765..4a4e040e58 100644 --- a/src/ol/layer/layergroup.js +++ b/src/ol/layer/layergroup.js @@ -10,8 +10,8 @@ goog.require('ol.Collection'); goog.require('ol.CollectionEvent'); goog.require('ol.CollectionEventType'); goog.require('ol.Object'); +goog.require('ol.layer.Base'); goog.require('ol.layer.Layer'); -goog.require('ol.layer.LayerBase'); /** @@ -25,7 +25,7 @@ ol.layer.LayerGroupProperty = { /** * @constructor - * @extends {ol.layer.LayerBase} + * @extends {ol.layer.Base} * @param {ol.layer.LayerGroupOptions=} opt_options Layer options. */ ol.layer.LayerGroup = function(opt_options) { @@ -63,7 +63,7 @@ ol.layer.LayerGroup = function(opt_options) { this.setLayers(layers); }; -goog.inherits(ol.layer.LayerGroup, ol.layer.LayerBase); +goog.inherits(ol.layer.LayerGroup, ol.layer.Base); /** @@ -123,7 +123,7 @@ ol.layer.LayerGroup.prototype.handleLayersChanged_ = function(event) { * @private */ ol.layer.LayerGroup.prototype.handleLayersAdd_ = function(collectionEvent) { - var layer = /** @type {ol.layer.LayerBase} */ (collectionEvent.getElement()); + var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement()); this.listenerKeys_[goog.getUid(layer).toString()] = goog.events.listen( layer, goog.events.EventType.CHANGE, this.handleLayerChange, false, this); @@ -136,7 +136,7 @@ ol.layer.LayerGroup.prototype.handleLayersAdd_ = function(collectionEvent) { * @private */ ol.layer.LayerGroup.prototype.handleLayersRemove_ = function(collectionEvent) { - var layer = /** @type {ol.layer.LayerBase} */ (collectionEvent.getElement()); + var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement()); var key = goog.getUid(layer).toString(); goog.events.unlistenByKey(this.listenerKeys_[key]); delete this.listenerKeys_[key]; diff --git a/src/ol/map.js b/src/ol/map.js index f5f190f253..9dd714aa2f 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -53,7 +53,7 @@ goog.require('ol.ViewHint'); goog.require('ol.control'); goog.require('ol.extent'); goog.require('ol.interaction'); -goog.require('ol.layer.LayerBase'); +goog.require('ol.layer.Base'); goog.require('ol.layer.LayerGroup'); goog.require('ol.proj'); goog.require('ol.proj.common'); @@ -366,7 +366,7 @@ ol.Map.prototype.addControl = function(control) { /** * Adds the given layer to the top of this map. - * @param {ol.layer.LayerBase} layer Layer. + * @param {ol.layer.Base} layer Layer. */ ol.Map.prototype.addLayer = function(layer) { var layers = this.getLayerGroup().getLayers(); @@ -874,14 +874,14 @@ ol.Map.prototype.removeControl = function(control) { /** * Removes the given layer from the map. - * @param {ol.layer.LayerBase} layer Layer. - * @return {ol.layer.LayerBase|undefined} The removed layer or undefined if the + * @param {ol.layer.Base} layer Layer. + * @return {ol.layer.Base|undefined} The removed layer or undefined if the * layer was not found. */ ol.Map.prototype.removeLayer = function(layer) { var layers = this.getLayerGroup().getLayers(); goog.asserts.assert(goog.isDef(layers)); - return /** @type {ol.layer.LayerBase|undefined} */ (layers.remove(layer)); + return /** @type {ol.layer.Base|undefined} */ (layers.remove(layer)); }; From fc2975f346047c84f4a98943b5ea429ca99b8c2f Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 9 Sep 2013 14:23:16 +0200 Subject: [PATCH 02/12] Rename ol.layer.LayerGroup to ol.layer.Group --- examples/layer-group.js | 6 ++-- src/objectliterals.jsdoc | 2 +- src/ol/layer/layergroup.exports | 2 +- src/ol/layer/layergroup.js | 47 +++++++++++++-------------- src/ol/map.js | 12 +++---- test/spec/ol/layer/layergroup.test.js | 20 ++++++------ 6 files changed, 44 insertions(+), 45 deletions(-) diff --git a/examples/layer-group.js b/examples/layer-group.js index 422d55d579..11134d6b49 100644 --- a/examples/layer-group.js +++ b/examples/layer-group.js @@ -2,7 +2,7 @@ goog.require('ol.Map'); goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.dom.Input'); -goog.require('ol.layer.LayerGroup'); +goog.require('ol.layer.Group'); goog.require('ol.layer.TileLayer'); goog.require('ol.proj'); goog.require('ol.source.MapQuestOpenAerial'); @@ -12,7 +12,7 @@ var map = new ol.Map({ layers: [ new ol.layer.TileLayer({ source: new ol.source.MapQuestOpenAerial() - }), new ol.layer.LayerGroup({ + }), new ol.layer.Group({ layers: [ new ol.layer.TileLayer({ source: new ol.source.TileJSON({ @@ -51,7 +51,7 @@ function bindInputs(layerid, layer) { } map.getLayers().forEach(function(layer, i) { bindInputs('#layer' + i, layer); - if (layer instanceof ol.layer.LayerGroup) { + if (layer instanceof ol.layer.Group) { layer.getLayers().forEach(function(sublayer, j) { bindInputs('#layer' + i + j, sublayer); }); diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index 10037cdc50..11812e8adf 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -333,7 +333,7 @@ */ /** - * @typedef {Object} ol.layer.LayerGroupOptions + * @typedef {Object} ol.layer.GroupOptions * @property {number|undefined} brightness Brightness. * @property {number|undefined} contrast Contrast. * @property {number|undefined} hue Hue. diff --git a/src/ol/layer/layergroup.exports b/src/ol/layer/layergroup.exports index 9a4aeb979b..58cd20a73c 100644 --- a/src/ol/layer/layergroup.exports +++ b/src/ol/layer/layergroup.exports @@ -1 +1 @@ -@exportClass ol.layer.LayerGroup ol.layer.LayerGroupOptions +@exportClass ol.layer.Group ol.layer.GroupOptions diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/layergroup.js index 4a4e040e58..205d5fe3b2 100644 --- a/src/ol/layer/layergroup.js +++ b/src/ol/layer/layergroup.js @@ -1,4 +1,4 @@ -goog.provide('ol.layer.LayerGroup'); +goog.provide('ol.layer.Group'); goog.require('goog.array'); goog.require('goog.asserts'); @@ -11,13 +11,12 @@ goog.require('ol.CollectionEvent'); goog.require('ol.CollectionEventType'); goog.require('ol.Object'); goog.require('ol.layer.Base'); -goog.require('ol.layer.Layer'); /** * @enum {string} */ -ol.layer.LayerGroupProperty = { +ol.layer.GroupProperty = { LAYERS: 'layers' }; @@ -26,12 +25,12 @@ ol.layer.LayerGroupProperty = { /** * @constructor * @extends {ol.layer.Base} - * @param {ol.layer.LayerGroupOptions=} opt_options Layer options. + * @param {ol.layer.GroupOptions=} opt_options Layer options. */ -ol.layer.LayerGroup = function(opt_options) { +ol.layer.Group = function(opt_options) { var options = goog.isDef(opt_options) ? opt_options : {}; - var baseOptions = /** @type {ol.layer.LayerGroupOptions} */ + var baseOptions = /** @type {ol.layer.GroupOptions} */ (goog.object.clone(options)); delete baseOptions.layers; @@ -46,7 +45,7 @@ ol.layer.LayerGroup = function(opt_options) { this.listenerKeys_ = null; goog.events.listen(this, - ol.Object.getChangeEventType(ol.layer.LayerGroupProperty.LAYERS), + ol.Object.getChangeEventType(ol.layer.GroupProperty.LAYERS), this.handleLayersChanged_, false, this); if (goog.isDef(layers)) { @@ -63,13 +62,13 @@ ol.layer.LayerGroup = function(opt_options) { this.setLayers(layers); }; -goog.inherits(ol.layer.LayerGroup, ol.layer.Base); +goog.inherits(ol.layer.Group, ol.layer.Base); /** * @inheritDoc */ -ol.layer.LayerGroup.prototype.handleLayerChange = function() { +ol.layer.Group.prototype.handleLayerChange = function() { if (this.getVisible()) { this.dispatchChangeEvent(); } @@ -79,7 +78,7 @@ ol.layer.LayerGroup.prototype.handleLayerChange = function() { /** * @inheritDoc */ -ol.layer.LayerGroup.prototype.handleLayerVisibleChange = function() { +ol.layer.Group.prototype.handleLayerVisibleChange = function() { this.dispatchChangeEvent(); }; @@ -88,7 +87,7 @@ ol.layer.LayerGroup.prototype.handleLayerVisibleChange = function() { * @param {goog.events.Event} event Event. * @private */ -ol.layer.LayerGroup.prototype.handleLayersChanged_ = function(event) { +ol.layer.Group.prototype.handleLayersChanged_ = function(event) { if (!goog.isNull(this.listenerKeys_)) { goog.array.forEach( goog.object.getValues(this.listenerKeys_), goog.events.unlistenByKey); @@ -122,7 +121,7 @@ ol.layer.LayerGroup.prototype.handleLayersChanged_ = function(event) { * @param {ol.CollectionEvent} collectionEvent Collection event. * @private */ -ol.layer.LayerGroup.prototype.handleLayersAdd_ = function(collectionEvent) { +ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) { var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement()); this.listenerKeys_[goog.getUid(layer).toString()] = goog.events.listen( layer, goog.events.EventType.CHANGE, this.handleLayerChange, false, @@ -135,7 +134,7 @@ ol.layer.LayerGroup.prototype.handleLayersAdd_ = function(collectionEvent) { * @param {ol.CollectionEvent} collectionEvent Collection event. * @private */ -ol.layer.LayerGroup.prototype.handleLayersRemove_ = function(collectionEvent) { +ol.layer.Group.prototype.handleLayersRemove_ = function(collectionEvent) { var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement()); var key = goog.getUid(layer).toString(); goog.events.unlistenByKey(this.listenerKeys_[key]); @@ -147,32 +146,32 @@ ol.layer.LayerGroup.prototype.handleLayersRemove_ = function(collectionEvent) { /** * @return {ol.Collection} Collection of layers. */ -ol.layer.LayerGroup.prototype.getLayers = function() { +ol.layer.Group.prototype.getLayers = function() { return /** @type {ol.Collection} */ (this.get( - ol.layer.LayerGroupProperty.LAYERS)); + ol.layer.GroupProperty.LAYERS)); }; goog.exportProperty( - ol.layer.LayerGroup.prototype, + ol.layer.Group.prototype, 'getLayers', - ol.layer.LayerGroup.prototype.getLayers); + ol.layer.Group.prototype.getLayers); /** * @param {ol.Collection} layers Collection of layers. */ -ol.layer.LayerGroup.prototype.setLayers = function(layers) { - this.set(ol.layer.LayerGroupProperty.LAYERS, layers); +ol.layer.Group.prototype.setLayers = function(layers) { + this.set(ol.layer.GroupProperty.LAYERS, layers); }; goog.exportProperty( - ol.layer.LayerGroup.prototype, + ol.layer.Group.prototype, 'setLayers', - ol.layer.LayerGroup.prototype.setLayers); + ol.layer.Group.prototype.setLayers); /** * @inheritDoc */ -ol.layer.LayerGroup.prototype.getLayersArray = function(opt_array) { +ol.layer.Group.prototype.getLayersArray = function(opt_array) { var array = (goog.isDef(opt_array)) ? opt_array : []; this.getLayers().forEach(function(layer) { layer.getLayersArray(array); @@ -184,7 +183,7 @@ ol.layer.LayerGroup.prototype.getLayersArray = function(opt_array) { /** * @inheritDoc */ -ol.layer.LayerGroup.prototype.getLayerStatesArray = function(opt_obj) { +ol.layer.Group.prototype.getLayerStatesArray = function(opt_obj) { var obj = (goog.isDef(opt_obj)) ? opt_obj : { layers: [], layerStates: [] @@ -216,7 +215,7 @@ ol.layer.LayerGroup.prototype.getLayerStatesArray = function(opt_obj) { /** * @inheritDoc */ -ol.layer.LayerGroup.prototype.isReady = function() { +ol.layer.Group.prototype.isReady = function() { return null === goog.array.find( this.getLayers().getArray(), function(elt, index, array) { return !elt.isReady(); diff --git a/src/ol/map.js b/src/ol/map.js index 9dd714aa2f..80760d41db 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -54,7 +54,7 @@ goog.require('ol.control'); goog.require('ol.extent'); goog.require('ol.interaction'); goog.require('ol.layer.Base'); -goog.require('ol.layer.LayerGroup'); +goog.require('ol.layer.Group'); goog.require('ol.proj'); goog.require('ol.proj.common'); goog.require('ol.renderer.Map'); @@ -519,10 +519,10 @@ ol.Map.prototype.getInteractions = function() { /** * Get the layergroup associated with this map. - * @return {ol.layer.LayerGroup} LayerGroup. + * @return {ol.layer.Group} LayerGroup. */ ol.Map.prototype.getLayerGroup = function() { - return /** @type {ol.layer.LayerGroup} */ ( + return /** @type {ol.layer.Group} */ ( this.get(ol.MapProperty.LAYERGROUP)); }; goog.exportProperty( @@ -993,7 +993,7 @@ ol.Map.prototype.renderFrame_ = function(time) { /** * Sets the layergroup of this map. - * @param {ol.layer.LayerGroup} layerGroup Layergroup. + * @param {ol.layer.Group} layerGroup Layergroup. */ ol.Map.prototype.setLayerGroup = function(layerGroup) { this.set(ol.MapProperty.LAYERGROUP, layerGroup); @@ -1113,8 +1113,8 @@ ol.Map.createOptionsInternal = function(options) { */ var values = {}; - var layerGroup = (options.layers instanceof ol.layer.LayerGroup) ? - options.layers : new ol.layer.LayerGroup({layers: options.layers}); + var layerGroup = (options.layers instanceof ol.layer.Group) ? + options.layers : new ol.layer.Group({layers: options.layers}); values[ol.MapProperty.LAYERGROUP] = layerGroup; values[ol.MapProperty.TARGET] = options.target; diff --git a/test/spec/ol/layer/layergroup.test.js b/test/spec/ol/layer/layergroup.test.js index 5d628e3788..d29acb5378 100644 --- a/test/spec/ol/layer/layergroup.test.js +++ b/test/spec/ol/layer/layergroup.test.js @@ -1,13 +1,13 @@ goog.provide('ol.test.layer.LayerGroup'); -describe('ol.layer.LayerGroup', function() { +describe('ol.layer.Group', function() { describe('constructor (defaults)', function() { var layerGroup; beforeEach(function() { - layerGroup = new ol.layer.LayerGroup(); + layerGroup = new ol.layer.Group(); }); afterEach(function() { @@ -15,7 +15,7 @@ describe('ol.layer.LayerGroup', function() { }); it('creates an instance', function() { - expect(layerGroup).to.be.a(ol.layer.LayerGroup); + expect(layerGroup).to.be.a(ol.layer.Group); }); it('provides default brightness', function() { @@ -69,7 +69,7 @@ describe('ol.layer.LayerGroup', function() { projection: 'EPSG:4326' }) }); - var layerGroup = new ol.layer.LayerGroup({ + var layerGroup = new ol.layer.Group({ layers: [layer], brightness: 0.5, contrast: 10, @@ -109,7 +109,7 @@ describe('ol.layer.LayerGroup', function() { var layerGroup; beforeEach(function() { - layerGroup = new ol.layer.LayerGroup(); + layerGroup = new ol.layer.Group(); }); afterEach(function() { @@ -180,7 +180,7 @@ describe('ol.layer.LayerGroup', function() { }) }); var layers = new ol.Collection([layer]); - var layerGroup = new ol.layer.LayerGroup(); + var layerGroup = new ol.layer.Group(); layerGroup.setLayers(layers); expect(layerGroup.getLayers()).to.be(layers); @@ -204,7 +204,7 @@ describe('ol.layer.LayerGroup', function() { var obj; it('returns an empty array if no layer', function() { - layerGroup = new ol.layer.LayerGroup(); + layerGroup = new ol.layer.Group(); obj = layerGroup.getLayerStatesArray(); layersArray = obj.layers; @@ -235,7 +235,7 @@ describe('ol.layer.LayerGroup', function() { }); it('does not transform layerStates by default', function() { - layerGroup = new ol.layer.LayerGroup({ + layerGroup = new ol.layer.Group({ layers: [layer1, layer2] }); @@ -256,7 +256,7 @@ describe('ol.layer.LayerGroup', function() { }); it('transforms layerStates correctly', function() { - layerGroup = new ol.layer.LayerGroup({ + layerGroup = new ol.layer.Group({ layers: [layer1, layer2], brightness: 0.5, contrast: 10, @@ -292,6 +292,6 @@ describe('ol.layer.LayerGroup', function() { goog.require('goog.dispose'); goog.require('ol.layer.Layer'); -goog.require('ol.layer.LayerGroup'); +goog.require('ol.layer.Group'); goog.require('ol.source.Source'); goog.require('ol.Collection'); From 5967f960471a9eb7ada552afea0479e45c9d9402 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 9 Sep 2013 14:33:12 +0200 Subject: [PATCH 03/12] Rename ol.source.ImageSource to ol.source.Image --- src/ol/imageurlfunction.js | 6 +++--- src/ol/layer/imagelayer.js | 6 +++--- src/ol/source/imagesource.js | 16 ++++++++-------- src/ol/source/singleimagewmssource.js | 6 +++--- src/ol/source/staticimagesource.js | 6 +++--- .../webgl/webglimagelayerrenderer.test.js | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/ol/imageurlfunction.js b/src/ol/imageurlfunction.js index 95a9a0a99b..9648e1b18c 100644 --- a/src/ol/imageurlfunction.js +++ b/src/ol/imageurlfunction.js @@ -5,7 +5,7 @@ goog.require('ol.Size'); /** - * @typedef {function(this:ol.source.ImageSource, ol.Extent, ol.Size, + * @typedef {function(this:ol.source.Image, ol.Extent, ol.Size, * ol.Projection): (string|undefined)} */ ol.ImageUrlFunctionType; @@ -22,7 +22,7 @@ ol.ImageUrlFunction.createFromParamsFunction = function(baseUrl, params, paramsFunction) { return ( /** - * @this {ol.source.ImageSource} + * @this {ol.source.Image} * @param {ol.Extent} extent Extent. * @param {ol.Size} size Size. * @param {ol.Projection} projection Projection. @@ -35,7 +35,7 @@ ol.ImageUrlFunction.createFromParamsFunction = /** - * @this {ol.source.ImageSource} + * @this {ol.source.Image} * @param {ol.Extent} extent Extent. * @param {ol.Size} size Size. * @return {string|undefined} Image URL. diff --git a/src/ol/layer/imagelayer.js b/src/ol/layer/imagelayer.js index 2d2dd1b2b5..77a685d859 100644 --- a/src/ol/layer/imagelayer.js +++ b/src/ol/layer/imagelayer.js @@ -1,7 +1,7 @@ goog.provide('ol.layer.ImageLayer'); goog.require('ol.layer.Layer'); -goog.require('ol.source.ImageSource'); +goog.require('ol.source.Image'); @@ -17,8 +17,8 @@ goog.inherits(ol.layer.ImageLayer, ol.layer.Layer); /** - * @return {ol.source.ImageSource} Single image source. + * @return {ol.source.Image} Single image source. */ ol.layer.ImageLayer.prototype.getImageSource = function() { - return /** @type {ol.source.ImageSource} */ (this.getSource()); + return /** @type {ol.source.Image} */ (this.getSource()); }; diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js index 5ae22ee4d3..1a9d6579b3 100644 --- a/src/ol/source/imagesource.js +++ b/src/ol/source/imagesource.js @@ -1,4 +1,4 @@ -goog.provide('ol.source.ImageSource'); +goog.provide('ol.source.Image'); goog.require('goog.array'); goog.require('goog.asserts'); @@ -23,16 +23,16 @@ goog.require('ol.source.Source'); * imageUrlFunction: (ol.ImageUrlFunctionType| * undefined)}} */ -ol.source.ImageSourceOptions; +ol.source.ImageOptions; /** * @constructor * @extends {ol.source.Source} - * @param {ol.source.ImageSourceOptions} options Single image source options. + * @param {ol.source.ImageOptions} options Single image source options. */ -ol.source.ImageSource = function(options) { +ol.source.Image = function(options) { goog.base(this, { attributions: options.attributions, @@ -70,7 +70,7 @@ ol.source.ImageSource = function(options) { }, true)); }; -goog.inherits(ol.source.ImageSource, ol.source.Source); +goog.inherits(ol.source.Image, ol.source.Source); /** @@ -81,7 +81,7 @@ goog.inherits(ol.source.ImageSource, ol.source.Source); * @param {ol.Projection} projection Projection. * @return {ol.Image} Single image. */ -ol.source.ImageSource.prototype.createImage = +ol.source.Image.prototype.createImage = function(extent, resolution, size, projection) { var image = null; var imageUrl = this.imageUrlFunction(extent, size, projection); @@ -99,7 +99,7 @@ ol.source.ImageSource.prototype.createImage = * @param {number} resolution Resolution. * @return {number} Resolution. */ -ol.source.ImageSource.prototype.findNearestResolution = +ol.source.Image.prototype.findNearestResolution = function(resolution) { if (!goog.isNull(this.resolutions_)) { var idx = ol.array.linearFindNearest(this.resolutions_, resolution, 0); @@ -115,4 +115,4 @@ ol.source.ImageSource.prototype.findNearestResolution = * @param {ol.Projection} projection Projection. * @return {ol.Image} Single image. */ -ol.source.ImageSource.prototype.getImage = goog.abstractMethod; +ol.source.Image.prototype.getImage = goog.abstractMethod; diff --git a/src/ol/source/singleimagewmssource.js b/src/ol/source/singleimagewmssource.js index 459b37e0b6..4e2fe097e0 100644 --- a/src/ol/source/singleimagewmssource.js +++ b/src/ol/source/singleimagewmssource.js @@ -5,14 +5,14 @@ goog.require('ol.Image'); goog.require('ol.ImageUrlFunction'); goog.require('ol.extent'); goog.require('ol.source.FeatureInfoSource'); -goog.require('ol.source.ImageSource'); +goog.require('ol.source.Image'); goog.require('ol.source.wms'); /** * @constructor - * @extends {ol.source.ImageSource} + * @extends {ol.source.Image} * @implements {ol.source.FeatureInfoSource} * @param {ol.source.SingleImageWMSOptions} options Options. */ @@ -52,7 +52,7 @@ ol.source.SingleImageWMS = function(options) { options.ratio : 1.5; }; -goog.inherits(ol.source.SingleImageWMS, ol.source.ImageSource); +goog.inherits(ol.source.SingleImageWMS, ol.source.Image); /** diff --git a/src/ol/source/staticimagesource.js b/src/ol/source/staticimagesource.js index 4f19751dbc..d426549fa7 100644 --- a/src/ol/source/staticimagesource.js +++ b/src/ol/source/staticimagesource.js @@ -4,13 +4,13 @@ goog.require('ol.Image'); goog.require('ol.ImageUrlFunctionType'); goog.require('ol.extent'); goog.require('ol.proj'); -goog.require('ol.source.ImageSource'); +goog.require('ol.source.Image'); /** * @constructor - * @extends {ol.source.ImageSource} + * @extends {ol.source.Image} * @param {ol.source.StaticImageOptions} options Static image options. */ ol.source.StaticImage = function(options) { @@ -40,7 +40,7 @@ ol.source.StaticImage = function(options) { imageExtent, imageResolution, imageSize, projection); }; -goog.inherits(ol.source.StaticImage, ol.source.ImageSource); +goog.inherits(ol.source.StaticImage, ol.source.Image); /** diff --git a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js index a39f9fb4c3..234fb622b9 100644 --- a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js +++ b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js @@ -16,7 +16,7 @@ describe('ol.renderer.webgl.ImageLayer', function() { target: document.createElement('div') }); var layer = new ol.layer.ImageLayer({ - source: new ol.source.ImageSource({ + source: new ol.source.Image({ extent: [0, 1, 0, 1] }) }); @@ -81,5 +81,5 @@ goog.require('goog.vec.Mat4'); goog.require('goog.vec.Vec4'); goog.require('ol.Map'); goog.require('ol.layer.ImageLayer'); -goog.require('ol.source.ImageSource'); +goog.require('ol.source.Image'); goog.require('ol.renderer.webgl.ImageLayer'); From 7d5a84ce8ad521af8c07be108312b5d5241d26b2 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 9 Sep 2013 14:36:40 +0200 Subject: [PATCH 04/12] Rename ol.layer.ImageLayer to ol.layer.Image --- examples/wms-no-proj.js | 4 ++-- examples/wms-single-image-custom-proj.js | 6 +++--- examples/wms-single-image.js | 4 ++-- src/ol/layer/imagelayer.exports | 2 +- src/ol/layer/imagelayer.js | 8 ++++---- src/ol/renderer/canvas/canvasimagelayerrenderer.js | 8 ++++---- src/ol/renderer/canvas/canvasmaprenderer.js | 4 ++-- src/ol/renderer/dom/domimagelayerrenderer.js | 8 ++++---- src/ol/renderer/dom/dommaprenderer.js | 4 ++-- src/ol/renderer/webgl/webglimagelayerrenderer.js | 8 ++++---- src/ol/renderer/webgl/webglmaprenderer.js | 4 ++-- .../ol/renderer/webgl/webglimagelayerrenderer.test.js | 4 ++-- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js index 4d5db23199..901ee764f6 100644 --- a/examples/wms-no-proj.js +++ b/examples/wms-no-proj.js @@ -4,7 +4,7 @@ goog.require('ol.Projection'); goog.require('ol.ProjectionUnits'); goog.require('ol.RendererHints'); goog.require('ol.View2D'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.layer.TileLayer'); goog.require('ol.source.SingleImageWMS'); goog.require('ol.source.TiledWMS'); @@ -27,7 +27,7 @@ var layers = [ url: 'http://wms.geo.admin.ch/' }) }), - new ol.layer.ImageLayer({ + new ol.layer.Image({ source: new ol.source.SingleImageWMS({ attributions: [new ol.Attribution({ html: '© ' + diff --git a/examples/wms-single-image-custom-proj.js b/examples/wms-single-image-custom-proj.js index 6e97b8cab3..5313015614 100644 --- a/examples/wms-single-image-custom-proj.js +++ b/examples/wms-single-image-custom-proj.js @@ -2,7 +2,7 @@ goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.RendererHints'); goog.require('ol.View2D'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.proj'); goog.require('ol.source.SingleImageWMS'); @@ -14,7 +14,7 @@ var projection = ol.proj.configureProj4jsProjection({ var extent = [420000, 900000, 30000, 350000]; var layers = [ - new ol.layer.ImageLayer({ + new ol.layer.Image({ source: new ol.source.SingleImageWMS({ url: 'http://wms.geo.admin.ch/', crossOrigin: 'anonymous', @@ -31,7 +31,7 @@ var layers = [ extent: extent }) }), - new ol.layer.ImageLayer({ + new ol.layer.Image({ source: new ol.source.SingleImageWMS({ url: 'http://wms.geo.admin.ch/', crossOrigin: 'anonymous', diff --git a/examples/wms-single-image.js b/examples/wms-single-image.js index 98b429b7f0..1246016cd3 100644 --- a/examples/wms-single-image.js +++ b/examples/wms-single-image.js @@ -1,7 +1,7 @@ goog.require('ol.Map'); goog.require('ol.RendererHint'); goog.require('ol.View2D'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.layer.TileLayer'); goog.require('ol.source.MapQuestOpenAerial'); goog.require('ol.source.SingleImageWMS'); @@ -11,7 +11,7 @@ var layers = [ new ol.layer.TileLayer({ source: new ol.source.MapQuestOpenAerial() }), - new ol.layer.ImageLayer({ + new ol.layer.Image({ source: new ol.source.SingleImageWMS({ url: 'http://demo.opengeo.org/geoserver/wms', params: {'LAYERS': 'topp:states'}, diff --git a/src/ol/layer/imagelayer.exports b/src/ol/layer/imagelayer.exports index f00c7ec5e5..81b291a2f1 100644 --- a/src/ol/layer/imagelayer.exports +++ b/src/ol/layer/imagelayer.exports @@ -1 +1 @@ -@exportClass ol.layer.ImageLayer ol.layer.LayerOptions +@exportClass ol.layer.Image ol.layer.LayerOptions diff --git a/src/ol/layer/imagelayer.js b/src/ol/layer/imagelayer.js index 77a685d859..9718aeef27 100644 --- a/src/ol/layer/imagelayer.js +++ b/src/ol/layer/imagelayer.js @@ -1,4 +1,4 @@ -goog.provide('ol.layer.ImageLayer'); +goog.provide('ol.layer.Image'); goog.require('ol.layer.Layer'); goog.require('ol.source.Image'); @@ -10,15 +10,15 @@ goog.require('ol.source.Image'); * @extends {ol.layer.Layer} * @param {ol.layer.LayerOptions} options Layer options. */ -ol.layer.ImageLayer = function(options) { +ol.layer.Image = function(options) { goog.base(this, options); }; -goog.inherits(ol.layer.ImageLayer, ol.layer.Layer); +goog.inherits(ol.layer.Image, ol.layer.Layer); /** * @return {ol.source.Image} Single image source. */ -ol.layer.ImageLayer.prototype.getImageSource = function() { +ol.layer.Image.prototype.getImageSource = function() { return /** @type {ol.source.Image} */ (this.getSource()); }; diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index b1ad19f6a8..d2d4a11590 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -6,7 +6,7 @@ goog.require('goog.vec.Mat4'); goog.require('ol.Image'); goog.require('ol.ImageState'); goog.require('ol.ViewHint'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.canvas.Layer'); @@ -16,7 +16,7 @@ goog.require('ol.renderer.canvas.Layer'); * @constructor * @extends {ol.renderer.canvas.Layer} * @param {ol.renderer.Map} mapRenderer Map renderer. - * @param {ol.layer.ImageLayer} imageLayer Single image layer. + * @param {ol.layer.Image} imageLayer Single image layer. */ ol.renderer.canvas.ImageLayer = function(mapRenderer, imageLayer) { @@ -49,10 +49,10 @@ ol.renderer.canvas.ImageLayer.prototype.getImage = function() { /** * @protected - * @return {ol.layer.ImageLayer} Single image layer. + * @return {ol.layer.Image} Single image layer. */ ol.renderer.canvas.ImageLayer.prototype.getImageLayer = function() { - return /** @type {ol.layer.ImageLayer} */ (this.getLayer()); + return /** @type {ol.layer.Image} */ (this.getLayer()); }; diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index a0254f968a..56789d1737 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -9,7 +9,7 @@ goog.require('goog.style'); goog.require('goog.vec.Mat4'); goog.require('ol.Size'); goog.require('ol.css'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.layer.TileLayer'); goog.require('ol.layer.Vector'); goog.require('ol.renderer.Map'); @@ -66,7 +66,7 @@ goog.inherits(ol.renderer.canvas.Map, ol.renderer.Map); * @inheritDoc */ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) { - if (layer instanceof ol.layer.ImageLayer) { + if (layer instanceof ol.layer.Image) { return new ol.renderer.canvas.ImageLayer(this, layer); } else if (layer instanceof ol.layer.TileLayer) { return new ol.renderer.canvas.TileLayer(this, layer); diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index 448d99b6ee..8c8a3fa7c9 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -9,7 +9,7 @@ goog.require('ol.Image'); goog.require('ol.ImageState'); goog.require('ol.ViewHint'); goog.require('ol.dom'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.renderer.dom.Layer'); @@ -18,7 +18,7 @@ goog.require('ol.renderer.dom.Layer'); * @constructor * @extends {ol.renderer.dom.Layer} * @param {ol.renderer.Map} mapRenderer Map renderer. - * @param {ol.layer.ImageLayer} imageLayer Image layer. + * @param {ol.layer.Image} imageLayer Image layer. */ ol.renderer.dom.ImageLayer = function(mapRenderer, imageLayer) { var target = goog.dom.createElement(goog.dom.TagName.DIV); @@ -45,10 +45,10 @@ goog.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer); /** * @protected - * @return {ol.layer.ImageLayer} Image layer. + * @return {ol.layer.Image} Image layer. */ ol.renderer.dom.ImageLayer.prototype.getImageLayer = function() { - return /** @type {ol.layer.ImageLayer} */ (this.getLayer()); + return /** @type {ol.layer.Image} */ (this.getLayer()); }; diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/dommaprenderer.js index 5236571ffc..0ec2f1d80e 100644 --- a/src/ol/renderer/dom/dommaprenderer.js +++ b/src/ol/renderer/dom/dommaprenderer.js @@ -5,7 +5,7 @@ goog.require('goog.dom'); goog.require('goog.dom.TagName'); goog.require('goog.style'); goog.require('ol.css'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.layer.TileLayer'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.dom.ImageLayer'); @@ -53,7 +53,7 @@ ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) { var layerRenderer; if (layer instanceof ol.layer.TileLayer) { layerRenderer = new ol.renderer.dom.TileLayer(this, layer); - } else if (layer instanceof ol.layer.ImageLayer) { + } else if (layer instanceof ol.layer.Image) { layerRenderer = new ol.renderer.dom.ImageLayer(this, layer); } else { goog.asserts.fail(); diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 62cf769a22..d63d5054d2 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -10,7 +10,7 @@ goog.require('ol.Extent'); goog.require('ol.Image'); goog.require('ol.ImageState'); goog.require('ol.ViewHint'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.renderer.webgl.Layer'); @@ -19,7 +19,7 @@ goog.require('ol.renderer.webgl.Layer'); * @constructor * @extends {ol.renderer.webgl.Layer} * @param {ol.renderer.Map} mapRenderer Map renderer. - * @param {ol.layer.ImageLayer} imageLayer Tile layer. + * @param {ol.layer.Image} imageLayer Tile layer. */ ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) { @@ -73,10 +73,10 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) { /** * @protected - * @return {ol.layer.ImageLayer} Tile layer. + * @return {ol.layer.Image} Tile layer. */ ol.renderer.webgl.ImageLayer.prototype.getImageLayer = function() { - return /** @type {ol.layer.ImageLayer} */ (this.getLayer()); + return /** @type {ol.layer.Image} */ (this.getLayer()); }; diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 085ce33ab7..b88e3864d1 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -17,7 +17,7 @@ goog.require('ol.FrameState'); goog.require('ol.Size'); goog.require('ol.Tile'); goog.require('ol.css'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.layer.TileLayer'); goog.require('ol.layer.VectorLayer2'); goog.require('ol.renderer.Map'); @@ -301,7 +301,7 @@ ol.renderer.webgl.Map.prototype.bindTileTexture = ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) { if (layer instanceof ol.layer.TileLayer) { return new ol.renderer.webgl.TileLayer(this, layer); - } else if (layer instanceof ol.layer.ImageLayer) { + } else if (layer instanceof ol.layer.Image) { return new ol.renderer.webgl.ImageLayer(this, layer); } else if (layer instanceof ol.layer.VectorLayer2) { return new ol.renderer.webgl.VectorLayer2(this, layer); diff --git a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js index 234fb622b9..c5f7ef1ba9 100644 --- a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js +++ b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js @@ -15,7 +15,7 @@ describe('ol.renderer.webgl.ImageLayer', function() { map = new ol.Map({ target: document.createElement('div') }); - var layer = new ol.layer.ImageLayer({ + var layer = new ol.layer.Image({ source: new ol.source.Image({ extent: [0, 1, 0, 1] }) @@ -80,6 +80,6 @@ goog.require('goog.dispose'); goog.require('goog.vec.Mat4'); goog.require('goog.vec.Vec4'); goog.require('ol.Map'); -goog.require('ol.layer.ImageLayer'); +goog.require('ol.layer.Image'); goog.require('ol.source.Image'); goog.require('ol.renderer.webgl.ImageLayer'); From 71a396a1894617b9cae6b597f85e4b703dfedbef Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 9 Sep 2013 14:40:23 +0200 Subject: [PATCH 05/12] Rename ol.source.TileSource to ol.source.Tile --- src/ol/layer/tilelayer.js | 6 +++--- src/ol/renderer/layerrenderer.js | 10 ++++----- src/ol/source/debugtilesource.js | 6 +++--- src/ol/source/imagetilesource.js | 6 +++--- src/ol/source/tilesource.exports | 4 ++-- src/ol/source/tilesource.js | 28 +++++++++++++------------- test/spec/ol/source/tilesource.test.js | 14 ++++++------- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js index bc3ee50d9c..30b39fe980 100644 --- a/src/ol/layer/tilelayer.js +++ b/src/ol/layer/tilelayer.js @@ -1,7 +1,7 @@ goog.provide('ol.layer.TileLayer'); goog.require('ol.layer.Layer'); -goog.require('ol.source.TileSource'); +goog.require('ol.source.Tile'); /** @@ -42,10 +42,10 @@ goog.exportProperty( /** - * @return {ol.source.TileSource} Source. + * @return {ol.source.Tile} Source. */ ol.layer.TileLayer.prototype.getTileSource = function() { - return /** @type {ol.source.TileSource} */ (this.getSource()); + return /** @type {ol.source.Tile} */ (this.getSource()); }; diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js index 94605f5c3d..c33e0770ea 100644 --- a/src/ol/renderer/layerrenderer.js +++ b/src/ol/renderer/layerrenderer.js @@ -10,7 +10,7 @@ goog.require('ol.TileState'); goog.require('ol.layer.Layer'); goog.require('ol.layer.LayerState'); goog.require('ol.source.Source'); -goog.require('ol.source.TileSource'); +goog.require('ol.source.Tile'); @@ -121,7 +121,7 @@ ol.renderer.Layer.prototype.renderIfReadyAndVisible = function() { /** * @param {ol.FrameState} frameState Frame state. - * @param {ol.source.TileSource} tileSource Tile source. + * @param {ol.source.Tile} tileSource Tile source. * @protected */ ol.renderer.Layer.prototype.scheduleExpireCache = @@ -169,7 +169,7 @@ ol.renderer.Layer.prototype.updateLogos = function(frameState, source) { /** * @param {Object.>} usedTiles Used tiles. - * @param {ol.source.TileSource} tileSource Tile source. + * @param {ol.source.Tile} tileSource Tile source. * @param {number} z Z. * @param {ol.TileRange} tileRange Tile range. * @protected @@ -195,7 +195,7 @@ ol.renderer.Layer.prototype.updateUsedTiles = /** * @param {function(ol.Tile): boolean} isLoadedFunction Function to * determine if the tile is loaded. - * @param {ol.source.TileSource} tileSource Tile source. + * @param {ol.source.Tile} tileSource Tile source. * @param {ol.Projection} projection Projection. * @protected * @return {function(number, number, number): ol.Tile} Returns a tile if it is @@ -241,7 +241,7 @@ ol.renderer.Layer.prototype.snapCenterToPixel = * discarded by the tile queue * - enqueues missing tiles * @param {ol.FrameState} frameState Frame state. - * @param {ol.source.TileSource} tileSource Tile source. + * @param {ol.source.Tile} tileSource Tile source. * @param {ol.tilegrid.TileGrid} tileGrid Tile grid. * @param {ol.Projection} projection Projection. * @param {ol.Extent} extent Extent. diff --git a/src/ol/source/debugtilesource.js b/src/ol/source/debugtilesource.js index ad6e0e0e9b..47354b994c 100644 --- a/src/ol/source/debugtilesource.js +++ b/src/ol/source/debugtilesource.js @@ -7,7 +7,7 @@ goog.require('ol.Tile'); goog.require('ol.TileCache'); goog.require('ol.TileCoord'); goog.require('ol.TileState'); -goog.require('ol.source.TileSource'); +goog.require('ol.source.Tile'); goog.require('ol.tilegrid.TileGrid'); @@ -83,7 +83,7 @@ ol.DebugTile_.prototype.getImage = function(opt_context) { /** * @constructor - * @extends {ol.source.TileSource} + * @extends {ol.source.Tile} * @param {ol.source.DebugTileSourceOptions} options Debug tile options. */ ol.source.DebugTileSource = function(options) { @@ -102,7 +102,7 @@ ol.source.DebugTileSource = function(options) { this.tileCache_ = new ol.TileCache(); }; -goog.inherits(ol.source.DebugTileSource, ol.source.TileSource); +goog.inherits(ol.source.DebugTileSource, ol.source.Tile); /** diff --git a/src/ol/source/imagetilesource.js b/src/ol/source/imagetilesource.js index d20b478166..6b3904ef20 100644 --- a/src/ol/source/imagetilesource.js +++ b/src/ol/source/imagetilesource.js @@ -11,7 +11,7 @@ goog.require('ol.TileCoord'); goog.require('ol.TileState'); goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunctionType'); -goog.require('ol.source.TileSource'); +goog.require('ol.source.Tile'); goog.require('ol.tilegrid.TileGrid'); @@ -31,7 +31,7 @@ ol.source.ImageTileOptions; /** * @constructor - * @extends {ol.source.TileSource} + * @extends {ol.source.Tile} * @param {ol.source.ImageTileOptions} options Image tile options. */ ol.source.ImageTileSource = function(options) { @@ -67,7 +67,7 @@ ol.source.ImageTileSource = function(options) { this.tileCache_ = new ol.TileCache(); }; -goog.inherits(ol.source.ImageTileSource, ol.source.TileSource); +goog.inherits(ol.source.ImageTileSource, ol.source.Tile); /** diff --git a/src/ol/source/tilesource.exports b/src/ol/source/tilesource.exports index c8077e23d9..fe7587ebea 100644 --- a/src/ol/source/tilesource.exports +++ b/src/ol/source/tilesource.exports @@ -1,2 +1,2 @@ -@exportSymbol ol.source.TileSource -@exportProperty ol.source.TileSource.prototype.getTileGrid +@exportSymbol ol.source.Tile +@exportProperty ol.source.Tile.prototype.getTileGrid diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js index c3ab1863d1..2f05579f65 100644 --- a/src/ol/source/tilesource.js +++ b/src/ol/source/tilesource.js @@ -1,5 +1,5 @@ -goog.provide('ol.source.TileSource'); -goog.provide('ol.source.TileSourceOptions'); +goog.provide('ol.source.Tile'); +goog.provide('ol.source.TileOptions'); goog.require('goog.functions'); goog.require('ol.Attribution'); @@ -19,16 +19,16 @@ goog.require('ol.tilegrid.TileGrid'); * projection: ol.ProjectionLike, * tileGrid: (ol.tilegrid.TileGrid|undefined)}} */ -ol.source.TileSourceOptions; +ol.source.TileOptions; /** * @constructor * @extends {ol.source.Source} - * @param {ol.source.TileSourceOptions} options Tile source options. + * @param {ol.source.TileOptions} options Tile source options. */ -ol.source.TileSource = function(options) { +ol.source.Tile = function(options) { goog.base(this, { attributions: options.attributions, @@ -50,19 +50,19 @@ ol.source.TileSource = function(options) { this.tileGrid = goog.isDef(options.tileGrid) ? options.tileGrid : null; }; -goog.inherits(ol.source.TileSource, ol.source.Source); +goog.inherits(ol.source.Tile, ol.source.Source); /** * @return {boolean} Can expire cache. */ -ol.source.TileSource.prototype.canExpireCache = goog.functions.FALSE; +ol.source.Tile.prototype.canExpireCache = goog.functions.FALSE; /** * @param {Object.} usedTiles Used tiles. */ -ol.source.TileSource.prototype.expireCache = goog.abstractMethod; +ol.source.Tile.prototype.expireCache = goog.abstractMethod; /** @@ -78,7 +78,7 @@ ol.source.TileSource.prototype.expireCache = goog.abstractMethod; * @param {ol.TileRange} tileRange Tile range. * @return {boolean} The tile range is fully covered with loaded tiles. */ -ol.source.TileSource.prototype.findLoadedTiles = function(loadedTilesByZ, +ol.source.Tile.prototype.findLoadedTiles = function(loadedTilesByZ, getTileIfLoaded, z, tileRange) { // FIXME this could be more efficient about filling partial holes var fullyCovered = true; @@ -107,7 +107,7 @@ ol.source.TileSource.prototype.findLoadedTiles = function(loadedTilesByZ, /** * @return {boolean} Opaque. */ -ol.source.TileSource.prototype.getOpaque = function() { +ol.source.Tile.prototype.getOpaque = function() { return this.opaque_; }; @@ -115,7 +115,7 @@ ol.source.TileSource.prototype.getOpaque = function() { /** * @inheritDoc */ -ol.source.TileSource.prototype.getResolutions = function() { +ol.source.Tile.prototype.getResolutions = function() { return this.tileGrid.getResolutions(); }; @@ -127,13 +127,13 @@ ol.source.TileSource.prototype.getResolutions = function() { * @param {ol.Projection=} opt_projection Projection. * @return {!ol.Tile} Tile. */ -ol.source.TileSource.prototype.getTile = goog.abstractMethod; +ol.source.Tile.prototype.getTile = goog.abstractMethod; /** * @return {ol.tilegrid.TileGrid} Tile grid. */ -ol.source.TileSource.prototype.getTileGrid = function() { +ol.source.Tile.prototype.getTileGrid = function() { return this.tileGrid; }; @@ -144,4 +144,4 @@ ol.source.TileSource.prototype.getTileGrid = function() { * @param {number} x Tile coordinate x. * @param {number} y Tile coordinate y. */ -ol.source.TileSource.prototype.useTile = goog.nullFunction; +ol.source.Tile.prototype.useTile = goog.nullFunction; diff --git a/test/spec/ol/source/tilesource.test.js b/test/spec/ol/source/tilesource.test.js index 2aaac416e4..c080faa249 100644 --- a/test/spec/ol/source/tilesource.test.js +++ b/test/spec/ol/source/tilesource.test.js @@ -1,14 +1,14 @@ goog.provide('ol.test.source.TileSource'); -describe('ol.source.TileSource', function() { +describe('ol.source.Tile', function() { describe('constructor', function() { it('returns a tile source', function() { - var source = new ol.source.TileSource({ + var source = new ol.source.Tile({ projection: ol.proj.get('EPSG:4326') }); expect(source).to.be.a(ol.source.Source); - expect(source).to.be.a(ol.source.TileSource); + expect(source).to.be.a(ol.source.Tile); }); }); @@ -188,7 +188,7 @@ describe('ol.source.TileSource', function() { * 256x256 tiles. * * @constructor - * @extends {ol.source.TileSource} + * @extends {ol.source.Tile} * @param {Object.} loaded Lookup of already loaded tiles. */ ol.test.source.MockTileSource = function(loaded) { @@ -213,7 +213,7 @@ ol.test.source.MockTileSource = function(loaded) { this.loaded_ = loaded; }; -goog.inherits(ol.test.source.MockTileSource, ol.source.TileSource); +goog.inherits(ol.test.source.MockTileSource, ol.source.Tile); /** @@ -231,7 +231,7 @@ describe('ol.test.source.MockTileSource', function() { describe('constructor', function() { it('creates a tile source', function() { var source = new ol.test.source.MockTileSource({}); - expect(source).to.be.a(ol.source.TileSource); + expect(source).to.be.a(ol.source.Tile); expect(source).to.be.a(ol.test.source.MockTileSource); }); }); @@ -270,5 +270,5 @@ goog.require('ol.TileCoord'); goog.require('ol.TileState'); goog.require('ol.proj'); goog.require('ol.source.Source'); -goog.require('ol.source.TileSource'); +goog.require('ol.source.Tile'); goog.require('ol.tilegrid.TileGrid'); From bf1d804a5e816473c62d248d97574c361ba43814 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 9 Sep 2013 15:07:05 +0200 Subject: [PATCH 06/12] Rename ol.source.DebugTileSource to ol.source.TileDebug --- examples/canvas-tiles.js | 4 ++-- src/objectliterals.jsdoc | 2 +- src/ol/source/debugtilesource.exports | 2 +- src/ol/source/debugtilesource.js | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js index 69c60a133f..0a14f225f6 100644 --- a/examples/canvas-tiles.js +++ b/examples/canvas-tiles.js @@ -3,8 +3,8 @@ goog.require('ol.RendererHints'); goog.require('ol.View2D'); goog.require('ol.layer.TileLayer'); goog.require('ol.proj'); -goog.require('ol.source.DebugTileSource'); goog.require('ol.source.OSM'); +goog.require('ol.source.TileDebug'); goog.require('ol.tilegrid.XYZ'); @@ -14,7 +14,7 @@ var map = new ol.Map({ source: new ol.source.OSM() }), new ol.layer.TileLayer({ - source: new ol.source.DebugTileSource({ + source: new ol.source.TileDebug({ projection: 'EPSG:3857', tileGrid: new ol.tilegrid.XYZ({ maxZoom: 22 diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index 11812e8adf..8b1c99598c 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -457,7 +457,7 @@ */ /** - * @typedef {Object} ol.source.DebugTileSourceOptions + * @typedef {Object} ol.source.TileDebugOptions * @property {ol.Extent|undefined} extent Extent. * @property {ol.ProjectionLike} projection Projection. * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid. diff --git a/src/ol/source/debugtilesource.exports b/src/ol/source/debugtilesource.exports index 2c74b974f3..cc26dab6ad 100644 --- a/src/ol/source/debugtilesource.exports +++ b/src/ol/source/debugtilesource.exports @@ -1 +1 @@ -@exportClass ol.source.DebugTileSource ol.source.DebugTileSourceOptions +@exportClass ol.source.TileDebug ol.source.TileDebugOptions diff --git a/src/ol/source/debugtilesource.js b/src/ol/source/debugtilesource.js index 47354b994c..df9f2cf0d1 100644 --- a/src/ol/source/debugtilesource.js +++ b/src/ol/source/debugtilesource.js @@ -1,4 +1,4 @@ -goog.provide('ol.source.DebugTileSource'); +goog.provide('ol.source.TileDebug'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); @@ -84,9 +84,9 @@ ol.DebugTile_.prototype.getImage = function(opt_context) { /** * @constructor * @extends {ol.source.Tile} - * @param {ol.source.DebugTileSourceOptions} options Debug tile options. + * @param {ol.source.TileDebugOptions} options Debug tile options. */ -ol.source.DebugTileSource = function(options) { +ol.source.TileDebug = function(options) { goog.base(this, { extent: options.extent, @@ -102,13 +102,13 @@ ol.source.DebugTileSource = function(options) { this.tileCache_ = new ol.TileCache(); }; -goog.inherits(ol.source.DebugTileSource, ol.source.Tile); +goog.inherits(ol.source.TileDebug, ol.source.Tile); /** * @inheritDoc */ -ol.source.DebugTileSource.prototype.canExpireCache = function() { +ol.source.TileDebug.prototype.canExpireCache = function() { return this.tileCache_.canExpireCache(); }; @@ -116,7 +116,7 @@ ol.source.DebugTileSource.prototype.canExpireCache = function() { /** * @inheritDoc */ -ol.source.DebugTileSource.prototype.expireCache = function(usedTiles) { +ol.source.TileDebug.prototype.expireCache = function(usedTiles) { this.tileCache_.expireCache(usedTiles); }; @@ -124,7 +124,7 @@ ol.source.DebugTileSource.prototype.expireCache = function(usedTiles) { /** * @inheritDoc */ -ol.source.DebugTileSource.prototype.getTile = function(z, x, y) { +ol.source.TileDebug.prototype.getTile = function(z, x, y) { var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y); if (this.tileCache_.containsKey(tileCoordKey)) { return /** @type {!ol.DebugTile_} */ (this.tileCache_.get(tileCoordKey)); From 0235caa1e0f9f907eb673c3cb7fd5e6ab2eb7957 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 9 Sep 2013 15:09:25 +0200 Subject: [PATCH 07/12] Rename ol.source.ImageTileSource to ol.source.TileImage --- src/ol/source/bingmapssource.js | 6 +++--- src/ol/source/imagetilesource.js | 14 +++++++------- src/ol/source/tiledwmssource.js | 6 +++--- src/ol/source/tilejsonsource.js | 6 +++--- src/ol/source/wmtssource.js | 6 +++--- src/ol/source/xyzsource.js | 6 +++--- src/ol/tileurlfunction.js | 14 +++++++------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index ceb5588d04..f2294d2f60 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -9,14 +9,14 @@ goog.require('ol.TileRange'); goog.require('ol.TileUrlFunction'); goog.require('ol.extent'); goog.require('ol.proj'); -goog.require('ol.source.ImageTileSource'); +goog.require('ol.source.TileImage'); goog.require('ol.tilegrid.XYZ'); /** * @constructor - * @extends {ol.source.ImageTileSource} + * @extends {ol.source.TileImage} * @param {ol.source.BingMapsOptions} options Bing Maps options. */ ol.source.BingMaps = function(options) { @@ -48,7 +48,7 @@ ol.source.BingMaps = function(options) { }, goog.bind(this.handleImageryMetadataResponse, this)); }; -goog.inherits(ol.source.BingMaps, ol.source.ImageTileSource); +goog.inherits(ol.source.BingMaps, ol.source.TileImage); /** diff --git a/src/ol/source/imagetilesource.js b/src/ol/source/imagetilesource.js index 6b3904ef20..f26aa9f4b0 100644 --- a/src/ol/source/imagetilesource.js +++ b/src/ol/source/imagetilesource.js @@ -1,4 +1,4 @@ -goog.provide('ol.source.ImageTileSource'); +goog.provide('ol.source.TileImage'); goog.require('goog.asserts'); goog.require('ol.Attribution'); @@ -34,7 +34,7 @@ ol.source.ImageTileOptions; * @extends {ol.source.Tile} * @param {ol.source.ImageTileOptions} options Image tile options. */ -ol.source.ImageTileSource = function(options) { +ol.source.TileImage = function(options) { goog.base(this, { attributions: options.attributions, @@ -67,13 +67,13 @@ ol.source.ImageTileSource = function(options) { this.tileCache_ = new ol.TileCache(); }; -goog.inherits(ol.source.ImageTileSource, ol.source.Tile); +goog.inherits(ol.source.TileImage, ol.source.Tile); /** * @inheritDoc */ -ol.source.ImageTileSource.prototype.canExpireCache = function() { +ol.source.TileImage.prototype.canExpireCache = function() { return this.tileCache_.canExpireCache(); }; @@ -81,7 +81,7 @@ ol.source.ImageTileSource.prototype.canExpireCache = function() { /** * @inheritDoc */ -ol.source.ImageTileSource.prototype.expireCache = function(usedTiles) { +ol.source.TileImage.prototype.expireCache = function(usedTiles) { this.tileCache_.expireCache(usedTiles); }; @@ -89,7 +89,7 @@ ol.source.ImageTileSource.prototype.expireCache = function(usedTiles) { /** * @inheritDoc */ -ol.source.ImageTileSource.prototype.getTile = function(z, x, y, projection) { +ol.source.TileImage.prototype.getTile = function(z, x, y, projection) { var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y); if (this.tileCache_.containsKey(tileCoordKey)) { return /** @type {!ol.Tile} */ (this.tileCache_.get(tileCoordKey)); @@ -111,7 +111,7 @@ ol.source.ImageTileSource.prototype.getTile = function(z, x, y, projection) { /** * @inheritDoc */ -ol.source.ImageTileSource.prototype.useTile = function(z, x, y) { +ol.source.TileImage.prototype.useTile = function(z, x, y) { var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y); if (this.tileCache_.containsKey(tileCoordKey)) { this.tileCache_.get(tileCoordKey); diff --git a/src/ol/source/tiledwmssource.js b/src/ol/source/tiledwmssource.js index 6f3b1817cd..59aecaf7f9 100644 --- a/src/ol/source/tiledwmssource.js +++ b/src/ol/source/tiledwmssource.js @@ -9,14 +9,14 @@ goog.require('ol.TileCoord'); goog.require('ol.TileUrlFunction'); goog.require('ol.extent'); goog.require('ol.source.FeatureInfoSource'); -goog.require('ol.source.ImageTileSource'); +goog.require('ol.source.TileImage'); goog.require('ol.source.wms'); /** * @constructor - * @extends {ol.source.ImageTileSource} + * @extends {ol.source.TileImage} * @implements {ol.source.FeatureInfoSource} * @param {ol.source.TiledWMSOptions} options Tiled WMS options. */ @@ -94,7 +94,7 @@ ol.source.TiledWMS = function(options) { options.getFeatureInfoOptions : {}; }; -goog.inherits(ol.source.TiledWMS, ol.source.ImageTileSource); +goog.inherits(ol.source.TiledWMS, ol.source.TileImage); /** diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js index 9d01f57acb..337791f970 100644 --- a/src/ol/source/tilejsonsource.js +++ b/src/ol/source/tilejsonsource.js @@ -15,7 +15,7 @@ goog.require('ol.TileRange'); goog.require('ol.TileUrlFunction'); goog.require('ol.extent'); goog.require('ol.proj'); -goog.require('ol.source.ImageTileSource'); +goog.require('ol.source.TileImage'); goog.require('ol.tilegrid.XYZ'); @@ -38,7 +38,7 @@ goog.exportSymbol('grid', grid); /** * @constructor - * @extends {ol.source.ImageTileSource} + * @extends {ol.source.TileImage} * @param {ol.source.TileJSONOptions} options TileJSON options. */ ol.source.TileJSON = function(options) { @@ -62,7 +62,7 @@ ol.source.TileJSON = function(options) { this.deferred_.addCallback(this.handleTileJSONResponse, this); }; -goog.inherits(ol.source.TileJSON, ol.source.ImageTileSource); +goog.inherits(ol.source.TileJSON, ol.source.TileImage); /** diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index 12132d7d45..8db43772df 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -11,7 +11,7 @@ goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunctionType'); goog.require('ol.extent'); goog.require('ol.proj'); -goog.require('ol.source.ImageTileSource'); +goog.require('ol.source.TileImage'); goog.require('ol.tilegrid.WMTS'); @@ -27,7 +27,7 @@ ol.source.WMTSRequestEncoding = { /** * @constructor - * @extends {ol.source.ImageTileSource} + * @extends {ol.source.TileImage} * @param {ol.source.WMTSOptions} options WMTS options. */ ol.source.WMTS = function(options) { @@ -170,7 +170,7 @@ ol.source.WMTS = function(options) { }); }; -goog.inherits(ol.source.WMTS, ol.source.ImageTileSource); +goog.inherits(ol.source.WMTS, ol.source.TileImage); /** diff --git a/src/ol/source/xyzsource.js b/src/ol/source/xyzsource.js index 5c8040e714..0711564798 100644 --- a/src/ol/source/xyzsource.js +++ b/src/ol/source/xyzsource.js @@ -6,7 +6,7 @@ goog.require('ol.Projection'); goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunctionType'); goog.require('ol.proj'); -goog.require('ol.source.ImageTileSource'); +goog.require('ol.source.TileImage'); goog.require('ol.tilegrid.XYZ'); @@ -28,7 +28,7 @@ ol.source.XYZOptions; /** * @constructor - * @extends {ol.source.ImageTileSource} + * @extends {ol.source.TileImage} * @param {ol.source.XYZOptions} options XYZ options. */ ol.source.XYZ = function(options) { @@ -72,4 +72,4 @@ ol.source.XYZ = function(options) { }); }; -goog.inherits(ol.source.XYZ, ol.source.ImageTileSource); +goog.inherits(ol.source.XYZ, ol.source.TileImage); diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js index 4ba3922ddf..d2d348a7e0 100644 --- a/src/ol/tileurlfunction.js +++ b/src/ol/tileurlfunction.js @@ -8,7 +8,7 @@ goog.require('ol.extent'); /** - * @typedef {function(this: ol.source.ImageTileSource, ol.TileCoord, + * @typedef {function(this: ol.source.TileImage, ol.TileCoord, * ol.Projection): (string|undefined)} */ ol.TileUrlFunctionType; @@ -21,7 +21,7 @@ ol.TileUrlFunctionType; ol.TileUrlFunction.createFromTemplate = function(template) { return ( /** - * @this {ol.source.ImageTileSource} + * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.Projection} projection Projection. * @return {string|undefined} Tile URL. @@ -58,7 +58,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) { } return ( /** - * @this {ol.source.ImageTileSource} + * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.Projection} projection Projection. * @return {string|undefined} Tile URL. @@ -78,7 +78,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) { /** * @param {string} baseUrl Base URL (may have query data). * @param {Object.} params to encode in the url. - * @param {function(this: ol.source.ImageTileSource, string, Object., + * @param {function(this: ol.source.TileImage, string, Object., * ol.Extent, ol.Size, ol.Projection)} paramsFunction params function. * @return {ol.TileUrlFunctionType} Tile URL function. */ @@ -87,7 +87,7 @@ ol.TileUrlFunction.createFromParamsFunction = var tmpExtent = ol.extent.createEmpty(); return ( /** - * @this {ol.source.ImageTileSource} + * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.Projection} projection Projection. * @return {string|undefined} Tile URL. @@ -110,7 +110,7 @@ ol.TileUrlFunction.createFromParamsFunction = /** - * @this {ol.source.ImageTileSource} + * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile coordinate. * @param {ol.Projection} projection Projection. * @return {string|undefined} Tile URL. @@ -131,7 +131,7 @@ ol.TileUrlFunction.withTileCoordTransform = var tmpTileCoord = new ol.TileCoord(0, 0, 0); return ( /** - * @this {ol.source.ImageTileSource} + * @this {ol.source.TileImage} * @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.Projection} projection Projection. * @return {string|undefined} Tile URL. From 8f6f5e42c64ecab68739ed0ac7fb8772f313d58b Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 9 Sep 2013 15:12:38 +0200 Subject: [PATCH 08/12] Rename ol.source.TiledWMS to ol.source.TileWMS --- examples/epsg-4326.js | 4 ++-- examples/getfeatureinfo.js | 4 ++-- examples/kml.js | 4 ++-- examples/wms-custom-proj.js | 6 +++--- examples/wms-no-proj.js | 4 ++-- examples/wms-tiled.js | 4 ++-- src/objectliterals.jsdoc | 2 +- src/ol/source/tiledwmssource.exports | 2 +- src/ol/source/tiledwmssource.js | 12 ++++++------ 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js index 2602a778d1..530a00a0ff 100644 --- a/examples/epsg-4326.js +++ b/examples/epsg-4326.js @@ -5,12 +5,12 @@ goog.require('ol.control'); goog.require('ol.control.ScaleLine'); goog.require('ol.control.ScaleLineUnits'); goog.require('ol.layer.TileLayer'); -goog.require('ol.source.TiledWMS'); +goog.require('ol.source.TileWMS'); var layers = [ new ol.layer.TileLayer({ - source: new ol.source.TiledWMS({ + source: new ol.source.TileWMS({ url: 'http://vmap0.tiles.osgeo.org/wms/vmap0', params: { 'VERSION': '1.1.1', diff --git a/examples/getfeatureinfo.js b/examples/getfeatureinfo.js index d40f77e859..d310b5804e 100644 --- a/examples/getfeatureinfo.js +++ b/examples/getfeatureinfo.js @@ -4,14 +4,14 @@ goog.require('ol.View2D'); goog.require('ol.layer.TileLayer'); goog.require('ol.layer.Vector'); goog.require('ol.parser.GeoJSON'); -goog.require('ol.source.TiledWMS'); +goog.require('ol.source.TileWMS'); goog.require('ol.source.Vector'); goog.require('ol.style.Stroke'); goog.require('ol.style.Style'); var wms = new ol.layer.TileLayer({ - source: new ol.source.TiledWMS({ + source: new ol.source.TileWMS({ url: 'http://demo.opengeo.org/geoserver/wms', params: {'LAYERS': 'ne:ne'} }) diff --git a/examples/kml.js b/examples/kml.js index 148b73a1f4..1ce37d75d3 100644 --- a/examples/kml.js +++ b/examples/kml.js @@ -4,11 +4,11 @@ goog.require('ol.View2D'); goog.require('ol.layer.TileLayer'); goog.require('ol.layer.Vector'); goog.require('ol.parser.KML'); -goog.require('ol.source.TiledWMS'); +goog.require('ol.source.TileWMS'); goog.require('ol.source.Vector'); var raster = new ol.layer.TileLayer({ - source: new ol.source.TiledWMS({ + source: new ol.source.TileWMS({ url: 'http://vmap0.tiles.osgeo.org/wms/vmap0', crossOrigin: null, params: { diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index 4c7524dcc2..f85fa221b9 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -7,7 +7,7 @@ goog.require('ol.control.ScaleLine'); goog.require('ol.control.ScaleLineUnits'); goog.require('ol.layer.TileLayer'); goog.require('ol.proj'); -goog.require('ol.source.TiledWMS'); +goog.require('ol.source.TileWMS'); var projection = ol.proj.configureProj4jsProjection({ @@ -18,7 +18,7 @@ var projection = ol.proj.configureProj4jsProjection({ var extent = [420000, 900000, 30000, 350000]; var layers = [ new ol.layer.TileLayer({ - source: new ol.source.TiledWMS({ + source: new ol.source.TileWMS({ url: 'http://wms.geo.admin.ch/', crossOrigin: 'anonymous', attributions: [new ol.Attribution({ @@ -35,7 +35,7 @@ var layers = [ }) }), new ol.layer.TileLayer({ - source: new ol.source.TiledWMS({ + source: new ol.source.TileWMS({ url: 'http://wms.geo.admin.ch/', crossOrigin: 'anonymous', attributions: [new ol.Attribution({ diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js index 901ee764f6..255f84d402 100644 --- a/examples/wms-no-proj.js +++ b/examples/wms-no-proj.js @@ -7,12 +7,12 @@ goog.require('ol.View2D'); goog.require('ol.layer.Image'); goog.require('ol.layer.TileLayer'); goog.require('ol.source.SingleImageWMS'); -goog.require('ol.source.TiledWMS'); +goog.require('ol.source.TileWMS'); var layers = [ new ol.layer.TileLayer({ - source: new ol.source.TiledWMS({ + source: new ol.source.TileWMS({ attributions: [new ol.Attribution({ html: '© ' + '