diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index 972e0e0a3b..d941a65ff5 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -527,7 +527,7 @@ * on. * @property {Array.|undefined} resolutions Resolutions. If specified, * 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} maxZoom Maximum zoom. * @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.Size|undefined} imageSize Size of the image. * @property {ol.proj.ProjectionLike} projection Projection. - * @property {string|undefined} url Url. + * @property {string|undefined} url URL. */ /** * @typedef {Object} ol.source.TileJSONOptions * @property {null|string|undefined} crossOrigin crossOriin setting for image * requests. - * @property {string} url Url. + * @property {string} url URL. */ /** @@ -581,7 +581,7 @@ * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid. * @property {number|undefined} maxZoom Maximum zoom. * @property {ol.proj.ProjectionLike} projection Projection. - * @property {string|undefined} url WMS service url. + * @property {string|undefined} url WMS service URL. * @property {Array.|undefined} urls WMS service urls. Use this instead * of `url` when the WMS supports multiple urls for GetMap requests. */ @@ -638,7 +638,7 @@ * @property {string|undefined} format Format. * @property {string} matrixSet Matrix set. * @property {Object|undefined} dimensions Dimensions. - * @property {string|undefined} url Url. + * @property {string|undefined} url URL. * @property {number|undefined} maxZoom Maximum zoom. * @property {Array.|undefined} urls Urls. */ @@ -666,7 +666,7 @@ /** * @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 * in pixels. Default is the width of the icon image. * @property {number|ol.expr.Expression|undefined} height Height of the diff --git a/src/ol/imageurlfunction.js b/src/ol/imageurlfunction.js index 602c4d0796..fe52c718c0 100644 --- a/src/ol/imageurlfunction.js +++ b/src/ol/imageurlfunction.js @@ -13,7 +13,7 @@ ol.ImageUrlFunctionType; /** * @param {string} baseUrl Base URL (may have query data). - * @param {Object.} params to encode in the url. + * @param {Object.} params to encode in the URL. * @param {function(string, Object., ol.Extent, ol.Size, * ol.proj.Projection): (string|undefined)} paramsFunction params function. * @return {ol.ImageUrlFunctionType} Image URL function. diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js index 2445312dc0..e3293703a9 100644 --- a/src/ol/source/imagewmssource.js +++ b/src/ol/source/imagewmssource.js @@ -111,7 +111,7 @@ ol.source.ImageWMS.prototype.getFeatureInfoForPixel = extent = [bottomLeft[0], topRight[0], bottomLeft[1], topRight[1]], url = this.imageUrlFunction(extent, size, projection); 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, opt_error); }; diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js index 6f582b039c..91013494fa 100644 --- a/src/ol/source/tilewmssource.js +++ b/src/ol/source/tilewmssource.js @@ -147,7 +147,7 @@ ol.source.TileWMS.prototype.getFeatureInfoForPixel = offset = map.getPixelFromCoordinate(ol.extent.getTopLeft(tileExtent)), url = this.tileUrlFunction(tileCoord, projection); 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, [pixel[0] - offset[0], pixel[1] - offset[1]], this.getFeatureInfoOptions_, success, opt_error); diff --git a/src/ol/source/wmssource.js b/src/ol/source/wmssource.js index 52e8d973cd..36626c7257 100644 --- a/src/ol/source/wmssource.js +++ b/src/ol/source/wmssource.js @@ -25,7 +25,7 @@ ol.source.WMSGetFeatureInfoMethod = { /** - * @param {string} baseUrl WMS base url. + * @param {string} baseUrl WMS base URL. * @param {Object.} params Request parameters. * @param {ol.Extent} extent Extent. * @param {ol.Size} size Size. diff --git a/src/ol/style/iconsymbolizer.js b/src/ol/style/iconsymbolizer.js index 2443ea6d3b..321ca0b5a6 100644 --- a/src/ol/style/iconsymbolizer.js +++ b/src/ol/style/iconsymbolizer.js @@ -173,8 +173,8 @@ ol.style.Icon.prototype.getRotation = function() { /** - * Get the url. - * @return {ol.expr.Expression} Icon url. + * Get the URL. + * @return {ol.expr.Expression} Icon URL. */ ol.style.Icon.prototype.getUrl = function() { return this.url_; @@ -239,8 +239,8 @@ ol.style.Icon.prototype.setRotation = function(rotation) { /** - * Set the url. - * @param {ol.expr.Expression} url Icon url. + * Set the URL. + * @param {ol.expr.Expression} url Icon URL. */ ol.style.Icon.prototype.setUrl = function(url) { goog.asserts.assertInstanceof(url, ol.expr.Expression); diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js index b9da756063..c883fbfe16 100644 --- a/src/ol/tileurlfunction.js +++ b/src/ol/tileurlfunction.js @@ -84,7 +84,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) { /** * @param {string} baseUrl Base URL (may have query data). - * @param {Object.} params to encode in the url. + * @param {Object.} params to encode in the URL. * @param {function(this: ol.source.TileImage, string, Object., * ol.Extent, ol.Size, ol.proj.Projection)} paramsFunction params function. * @return {ol.TileUrlFunctionType} Tile URL function. @@ -156,7 +156,7 @@ ol.TileUrlFunction.withTileCoordTransform = /** - * @param {string} url Url. + * @param {string} url URL. * @return {Array.} Array of urls. */ ol.TileUrlFunction.expandUrl = function(url) {