Use URL instead of Url or url in comments and strings

This commit is contained in:
Tom Payne
2013-09-20 12:28:04 +01:00
parent f24c9a807f
commit abaa220314
7 changed files with 17 additions and 17 deletions

View File

@@ -527,7 +527,7 @@
* on. * on.
* @property {Array.<number>|undefined} resolutions Resolutions. If specified, * @property {Array.<number>|undefined} resolutions Resolutions. If specified,
* requests will be made for these resolutions only. * requests will be made for these resolutions only.
* @property {string|undefined} url WMS service url. * @property {string|undefined} url WMS service URL.
*/ */
/** /**
@@ -544,7 +544,7 @@
* @property {number|undefined} minZoom Minimum zoom. * @property {number|undefined} minZoom Minimum zoom.
* @property {number|undefined} maxZoom Maximum zoom. * @property {number|undefined} maxZoom Maximum zoom.
* @property {boolean|undefined} opaque Whether the layer is opaque. * @property {boolean|undefined} opaque Whether the layer is opaque.
* @property {string|undefined} url Url. * @property {string|undefined} url URL.
*/ */
/** /**
@@ -556,14 +556,14 @@
* @property {ol.Extent|undefined} imageExtent Extent of the image. * @property {ol.Extent|undefined} imageExtent Extent of the image.
* @property {ol.Size|undefined} imageSize Size of the image. * @property {ol.Size|undefined} imageSize Size of the image.
* @property {ol.proj.ProjectionLike} projection Projection. * @property {ol.proj.ProjectionLike} projection Projection.
* @property {string|undefined} url Url. * @property {string|undefined} url URL.
*/ */
/** /**
* @typedef {Object} ol.source.TileJSONOptions * @typedef {Object} ol.source.TileJSONOptions
* @property {null|string|undefined} crossOrigin crossOriin setting for image * @property {null|string|undefined} crossOrigin crossOriin setting for image
* requests. * requests.
* @property {string} url Url. * @property {string} url URL.
*/ */
/** /**
@@ -581,7 +581,7 @@
* @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid. * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid.
* @property {number|undefined} maxZoom Maximum zoom. * @property {number|undefined} maxZoom Maximum zoom.
* @property {ol.proj.ProjectionLike} projection Projection. * @property {ol.proj.ProjectionLike} projection Projection.
* @property {string|undefined} url WMS service url. * @property {string|undefined} url WMS service URL.
* @property {Array.<string>|undefined} urls WMS service urls. Use this instead * @property {Array.<string>|undefined} urls WMS service urls. Use this instead
* of `url` when the WMS supports multiple urls for GetMap requests. * of `url` when the WMS supports multiple urls for GetMap requests.
*/ */
@@ -638,7 +638,7 @@
* @property {string|undefined} format Format. * @property {string|undefined} format Format.
* @property {string} matrixSet Matrix set. * @property {string} matrixSet Matrix set.
* @property {Object|undefined} dimensions Dimensions. * @property {Object|undefined} dimensions Dimensions.
* @property {string|undefined} url Url. * @property {string|undefined} url URL.
* @property {number|undefined} maxZoom Maximum zoom. * @property {number|undefined} maxZoom Maximum zoom.
* @property {Array.<string>|undefined} urls Urls. * @property {Array.<string>|undefined} urls Urls.
*/ */
@@ -666,7 +666,7 @@
/** /**
* @typedef {Object} ol.style.IconOptions * @typedef {Object} ol.style.IconOptions
* @property {string|ol.expr.Expression} url Icon image url. * @property {string|ol.expr.Expression} url Icon image URL.
* @property {number|ol.expr.Expression|undefined} width Width of the icon * @property {number|ol.expr.Expression|undefined} width Width of the icon
* in pixels. Default is the width of the icon image. * in pixels. Default is the width of the icon image.
* @property {number|ol.expr.Expression|undefined} height Height of the * @property {number|ol.expr.Expression|undefined} height Height of the

View File

@@ -13,7 +13,7 @@ ol.ImageUrlFunctionType;
/** /**
* @param {string} baseUrl Base URL (may have query data). * @param {string} baseUrl Base URL (may have query data).
* @param {Object.<string,*>} params to encode in the url. * @param {Object.<string,*>} params to encode in the URL.
* @param {function(string, Object.<string,*>, ol.Extent, ol.Size, * @param {function(string, Object.<string,*>, ol.Extent, ol.Size,
* ol.proj.Projection): (string|undefined)} paramsFunction params function. * ol.proj.Projection): (string|undefined)} paramsFunction params function.
* @return {ol.ImageUrlFunctionType} Image URL function. * @return {ol.ImageUrlFunctionType} Image URL function.

View File

@@ -111,7 +111,7 @@ ol.source.ImageWMS.prototype.getFeatureInfoForPixel =
extent = [bottomLeft[0], topRight[0], bottomLeft[1], topRight[1]], extent = [bottomLeft[0], topRight[0], bottomLeft[1], topRight[1]],
url = this.imageUrlFunction(extent, size, projection); url = this.imageUrlFunction(extent, size, projection);
goog.asserts.assert(goog.isDef(url), goog.asserts.assert(goog.isDef(url),
'ol.source.ImageWMS#imageUrlFunction does not return a url'); 'ol.source.ImageWMS#imageUrlFunction does not return a URL');
ol.source.wms.getFeatureInfo(url, pixel, this.getFeatureInfoOptions_, success, ol.source.wms.getFeatureInfo(url, pixel, this.getFeatureInfoOptions_, success,
opt_error); opt_error);
}; };

View File

@@ -147,7 +147,7 @@ ol.source.TileWMS.prototype.getFeatureInfoForPixel =
offset = map.getPixelFromCoordinate(ol.extent.getTopLeft(tileExtent)), offset = map.getPixelFromCoordinate(ol.extent.getTopLeft(tileExtent)),
url = this.tileUrlFunction(tileCoord, projection); url = this.tileUrlFunction(tileCoord, projection);
goog.asserts.assert(goog.isDef(url), goog.asserts.assert(goog.isDef(url),
'ol.source.TileWMS#tileUrlFunction does not return a url'); 'ol.source.TileWMS#tileUrlFunction does not return a URL');
ol.source.wms.getFeatureInfo(url, ol.source.wms.getFeatureInfo(url,
[pixel[0] - offset[0], pixel[1] - offset[1]], this.getFeatureInfoOptions_, [pixel[0] - offset[0], pixel[1] - offset[1]], this.getFeatureInfoOptions_,
success, opt_error); success, opt_error);

View File

@@ -25,7 +25,7 @@ ol.source.WMSGetFeatureInfoMethod = {
/** /**
* @param {string} baseUrl WMS base url. * @param {string} baseUrl WMS base URL.
* @param {Object.<string, string|number>} params Request parameters. * @param {Object.<string, string|number>} params Request parameters.
* @param {ol.Extent} extent Extent. * @param {ol.Extent} extent Extent.
* @param {ol.Size} size Size. * @param {ol.Size} size Size.

View File

@@ -173,8 +173,8 @@ ol.style.Icon.prototype.getRotation = function() {
/** /**
* Get the url. * Get the URL.
* @return {ol.expr.Expression} Icon url. * @return {ol.expr.Expression} Icon URL.
*/ */
ol.style.Icon.prototype.getUrl = function() { ol.style.Icon.prototype.getUrl = function() {
return this.url_; return this.url_;
@@ -239,8 +239,8 @@ ol.style.Icon.prototype.setRotation = function(rotation) {
/** /**
* Set the url. * Set the URL.
* @param {ol.expr.Expression} url Icon url. * @param {ol.expr.Expression} url Icon URL.
*/ */
ol.style.Icon.prototype.setUrl = function(url) { ol.style.Icon.prototype.setUrl = function(url) {
goog.asserts.assertInstanceof(url, ol.expr.Expression); goog.asserts.assertInstanceof(url, ol.expr.Expression);

View File

@@ -84,7 +84,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
/** /**
* @param {string} baseUrl Base URL (may have query data). * @param {string} baseUrl Base URL (may have query data).
* @param {Object.<string,*>} params to encode in the url. * @param {Object.<string,*>} params to encode in the URL.
* @param {function(this: ol.source.TileImage, string, Object.<string,*>, * @param {function(this: ol.source.TileImage, string, Object.<string,*>,
* ol.Extent, ol.Size, ol.proj.Projection)} paramsFunction params function. * ol.Extent, ol.Size, ol.proj.Projection)} paramsFunction params function.
* @return {ol.TileUrlFunctionType} Tile URL function. * @return {ol.TileUrlFunctionType} Tile URL function.
@@ -156,7 +156,7 @@ ol.TileUrlFunction.withTileCoordTransform =
/** /**
* @param {string} url Url. * @param {string} url URL.
* @return {Array.<string>} Array of urls. * @return {Array.<string>} Array of urls.
*/ */
ol.TileUrlFunction.expandUrl = function(url) { ol.TileUrlFunction.expandUrl = function(url) {