Use olx namespace for options types in source code
sed command used: find src/ol -name '*.js' -exec sed -ri 's/\{ol(\.(\w|\.)+Options\=?\})/{olx\1/' \{\} \;
This commit is contained in:
@@ -18,7 +18,7 @@ goog.require('ol.tilegrid.XYZ');
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.TileImage}
|
||||
* @param {ol.source.BingMapsOptions} options Bing Maps options.
|
||||
* @param {olx.source.BingMapsOptions} options Bing Maps options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.BingMaps = function(options) {
|
||||
|
||||
@@ -85,7 +85,7 @@ ol.DebugTile_.prototype.getImage = function(opt_context) {
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.Tile}
|
||||
* @param {ol.source.TileDebugOptions} options Debug tile options.
|
||||
* @param {olx.source.TileDebugOptions} options Debug tile options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.TileDebug = function(options) {
|
||||
|
||||
@@ -30,7 +30,7 @@ ol.source.ImageOptions;
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.Source}
|
||||
* @param {ol.source.ImageOptions} options Single image source options.
|
||||
* @param {olx.source.ImageOptions} options Single image source options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.Image = function(options) {
|
||||
|
||||
@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.Image}
|
||||
* @param {ol.source.ImageStaticOptions} options Options.
|
||||
* @param {olx.source.ImageStaticOptions} options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.ImageStatic = function(options) {
|
||||
|
||||
@@ -15,7 +15,7 @@ goog.require('ol.source.wms');
|
||||
* @constructor
|
||||
* @extends {ol.source.Image}
|
||||
* @implements {ol.source.FeatureInfoSource}
|
||||
* @param {ol.source.ImageWMSOptions} options Options.
|
||||
* @param {olx.source.ImageWMSOptions} options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.ImageWMS = function(options) {
|
||||
@@ -42,11 +42,11 @@ ol.source.ImageWMS = function(options) {
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @type {ol.source.WMSGetFeatureInfoOptions}
|
||||
* @type {olx.source.WMSGetFeatureInfoOptions}
|
||||
*/
|
||||
this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
|
||||
options.getFeatureInfoOptions :
|
||||
/** @type {ol.source.WMSGetFeatureInfoOptions} */ ({});
|
||||
/** @type {olx.source.WMSGetFeatureInfoOptions} */ ({});
|
||||
|
||||
/**
|
||||
* @private
|
||||
|
||||
@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.Image}
|
||||
* @param {ol.source.MapGuideOptions} options Options.
|
||||
* @param {olx.source.MapGuideOptions} options Options.
|
||||
*/
|
||||
ol.source.MapGuide = function(options) {
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ goog.require('ol.source.XYZ');
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.XYZ}
|
||||
* @param {ol.source.MapQuestOptions=} opt_options MapQuest options.
|
||||
* @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.MapQuestOSM = function(opt_options) {
|
||||
@@ -43,7 +43,7 @@ goog.inherits(ol.source.MapQuestOSM, ol.source.XYZ);
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.XYZ}
|
||||
* @param {ol.source.MapQuestOptions=} opt_options MapQuest options.
|
||||
* @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.MapQuestOpenAerial = function(opt_options) {
|
||||
|
||||
@@ -8,7 +8,7 @@ goog.require('ol.source.XYZ');
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.XYZ}
|
||||
* @param {ol.source.OSMOptions=} opt_options Open Street Map options.
|
||||
* @param {olx.source.OSMOptions=} opt_options Open Street Map options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.OSM = function(opt_options) {
|
||||
|
||||
@@ -33,7 +33,7 @@ ol.source.SourceOptions;
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {goog.events.EventTarget}
|
||||
* @param {ol.source.SourceOptions} options Source options.
|
||||
* @param {olx.source.SourceOptions} options Source options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.Source = function(options) {
|
||||
|
||||
@@ -80,7 +80,7 @@ ol.source.StamenProviderConfig = {
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.XYZ}
|
||||
* @param {ol.source.StamenOptions} options Stamen options.
|
||||
* @param {olx.source.StamenOptions} options Stamen options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.Stamen = function(options) {
|
||||
|
||||
@@ -34,7 +34,7 @@ ol.source.TileImageOptions;
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.Tile}
|
||||
* @param {ol.source.TileImageOptions} options Image tile options.
|
||||
* @param {olx.source.TileImageOptions} options Image tile options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.TileImage = function(options) {
|
||||
|
||||
@@ -40,7 +40,7 @@ goog.exportSymbol('grid', grid);
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.TileImage}
|
||||
* @param {ol.source.TileJSONOptions} options TileJSON options.
|
||||
* @param {olx.source.TileJSONOptions} options TileJSON options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.TileJSON = function(options) {
|
||||
|
||||
@@ -27,7 +27,7 @@ ol.source.TileOptions;
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.Source}
|
||||
* @param {ol.source.TileOptions} options Tile source options.
|
||||
* @param {olx.source.TileOptions} options Tile source options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.Tile = function(options) {
|
||||
|
||||
@@ -19,7 +19,7 @@ goog.require('ol.source.wms');
|
||||
* @constructor
|
||||
* @extends {ol.source.TileImage}
|
||||
* @implements {ol.source.FeatureInfoSource}
|
||||
* @param {ol.source.TileWMSOptions} options Tile WMS options.
|
||||
* @param {olx.source.TileWMSOptions} options Tile WMS options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.TileWMS = function(options) {
|
||||
@@ -107,11 +107,11 @@ ol.source.TileWMS = function(options) {
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @type {ol.source.WMSGetFeatureInfoOptions}
|
||||
* @type {olx.source.WMSGetFeatureInfoOptions}
|
||||
*/
|
||||
this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
|
||||
options.getFeatureInfoOptions :
|
||||
/** @type {ol.source.WMSGetFeatureInfoOptions} */ ({});
|
||||
/** @type {olx.source.WMSGetFeatureInfoOptions} */ ({});
|
||||
|
||||
};
|
||||
goog.inherits(ol.source.TileWMS, ol.source.TileImage);
|
||||
|
||||
@@ -32,7 +32,7 @@ ol.source.VectorLoadState = {
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.Source}
|
||||
* @param {ol.source.VectorOptions=} opt_options Vector source options.
|
||||
* @param {olx.source.VectorOptions=} opt_options Vector source options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.Vector = function(opt_options) {
|
||||
|
||||
@@ -74,7 +74,7 @@ ol.source.wms.getUrl =
|
||||
/**
|
||||
* @param {string} url URL as provided by the url function.
|
||||
* @param {ol.Pixel} pixel Pixel.
|
||||
* @param {ol.source.WMSGetFeatureInfoOptions} options Options as defined in the
|
||||
* @param {olx.source.WMSGetFeatureInfoOptions} options Options as defined in the
|
||||
* source.
|
||||
* @param {function(string)} success Callback function for successful queries.
|
||||
* @param {function()=} opt_error Optional callback function for unsuccessful
|
||||
@@ -86,9 +86,9 @@ ol.source.wms.getFeatureInfo =
|
||||
// closure
|
||||
url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo')
|
||||
.replace(ol.source.wms.regExes.layers, 'LAYERS=$1&QUERY_LAYERS=$1');
|
||||
options = /** @type {ol.source.WMSGetFeatureInfoOptions} */
|
||||
options = /** @type {olx.source.WMSGetFeatureInfoOptions} */
|
||||
(goog.isDef(options) ? goog.object.clone(options) : {});
|
||||
var localOptions = /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({
|
||||
var localOptions = /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({
|
||||
method: ol.source.WMSGetFeatureInfoMethod.IFRAME,
|
||||
params: {}
|
||||
});
|
||||
|
||||
@@ -28,7 +28,7 @@ ol.source.WMTSRequestEncoding = {
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.TileImage}
|
||||
* @param {ol.source.WMTSOptions} options WMTS options.
|
||||
* @param {olx.source.WMTSOptions} options WMTS options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.WMTS = function(options) {
|
||||
@@ -237,7 +237,7 @@ ol.source.WMTS.prototype.updateDimensions = function(dimensions) {
|
||||
/**
|
||||
* @param {Object} wmtsCap An object representing the capabilities document.
|
||||
* @param {string} layer The layer identifier.
|
||||
* @return {ol.source.WMTSOptions} WMTS source options object.
|
||||
* @return {olx.source.WMTSOptions} WMTS source options object.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.WMTS.optionsFromCapabilities = function(wmtsCap, layer) {
|
||||
|
||||
@@ -12,7 +12,7 @@ goog.require('ol.tilegrid.XYZ');
|
||||
/**
|
||||
* @constructor
|
||||
* @extends {ol.source.TileImage}
|
||||
* @param {ol.source.XYZOptions} options XYZ options.
|
||||
* @param {olx.source.XYZOptions} options XYZ options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.XYZ = function(options) {
|
||||
|
||||
Reference in New Issue
Block a user