Manual adjustment of indentation

This commit is contained in:
Marc Jansen
2017-06-20 10:41:03 +02:00
parent d0ef05977b
commit 7d6929c710
28 changed files with 266 additions and 262 deletions

View File

@@ -9,10 +9,10 @@ goog.require('ol.math');
*/ */
ol.CenterConstraint.createExtent = function(extent) { ol.CenterConstraint.createExtent = function(extent) {
return ( return (
/** /**
* @param {ol.Coordinate|undefined} center Center. * @param {ol.Coordinate|undefined} center Center.
* @return {ol.Coordinate|undefined} Center. * @return {ol.Coordinate|undefined} Center.
*/ */
function(center) { function(center) {
if (center) { if (center) {
return [ return [

View File

@@ -79,26 +79,26 @@ ol.color.fromString = (
// arbitrary 25% of the entries. // arbitrary 25% of the entries.
/** /**
* @const * @const
* @type {number} * @type {number}
*/ */
var MAX_CACHE_SIZE = 1024; var MAX_CACHE_SIZE = 1024;
/** /**
* @type {Object.<string, ol.Color>} * @type {Object.<string, ol.Color>}
*/ */
var cache = {}; var cache = {};
/** /**
* @type {number} * @type {number}
*/ */
var cacheSize = 0; var cacheSize = 0;
return ( return (
/** /**
* @param {string} s String. * @param {string} s String.
* @return {ol.Color} Color. * @return {ol.Color} Color.
*/ */
function(s) { function(s) {
var color; var color;
if (cache.hasOwnProperty(s)) { if (cache.hasOwnProperty(s)) {

View File

@@ -24,7 +24,7 @@ ol.colorlike.asColorLike = function(color) {
ol.colorlike.isColorLike = function(color) { ol.colorlike.isColorLike = function(color) {
return ( return (
typeof color === 'string' || typeof color === 'string' ||
color instanceof CanvasPattern || color instanceof CanvasPattern ||
color instanceof CanvasGradient color instanceof CanvasGradient
); );
}; };

View File

@@ -121,10 +121,10 @@ ol.coordinate.closestOnSegment = function(coordinate, segment) {
*/ */
ol.coordinate.createStringXY = function(opt_fractionDigits) { ol.coordinate.createStringXY = function(opt_fractionDigits) {
return ( return (
/** /**
* @param {ol.Coordinate|undefined} coordinate Coordinate. * @param {ol.Coordinate|undefined} coordinate Coordinate.
* @return {string} String XY. * @return {string} String XY.
*/ */
function(coordinate) { function(coordinate) {
return ol.coordinate.toStringXY(coordinate, opt_fractionDigits); return ol.coordinate.toStringXY(coordinate, opt_fractionDigits);
}); });

View File

@@ -47,12 +47,12 @@ ol.events.Event = function(type) {
*/ */
ol.events.Event.prototype.preventDefault = ol.events.Event.prototype.preventDefault =
/** /**
* Stop event propagation. * Stop event propagation.
* @function * @function
* @override * @override
* @api * @api
*/ */
ol.events.Event.prototype.stopPropagation = function() { ol.events.Event.prototype.stopPropagation = function() {
this.propagationStopped = true; this.propagationStopped = true;
}; };

View File

@@ -18,12 +18,12 @@ goog.require('ol.xml');
*/ */
ol.featureloader.loadFeaturesXhr = function(url, format, success, failure) { ol.featureloader.loadFeaturesXhr = function(url, format, success, failure) {
return ( return (
/** /**
* @param {ol.Extent} extent Extent. * @param {ol.Extent} extent Extent.
* @param {number} resolution Resolution. * @param {number} resolution Resolution.
* @param {ol.proj.Projection} projection Projection. * @param {ol.proj.Projection} projection Projection.
* @this {ol.source.Vector|ol.VectorTile} * @this {ol.source.Vector|ol.VectorTile}
*/ */
function(extent, resolution, projection) { function(extent, resolution, projection) {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', xhr.open('GET',
@@ -33,9 +33,9 @@ ol.featureloader.loadFeaturesXhr = function(url, format, success, failure) {
xhr.responseType = 'arraybuffer'; xhr.responseType = 'arraybuffer';
} }
/** /**
* @param {Event} event Event. * @param {Event} event Event.
* @private * @private
*/ */
xhr.onload = function(event) { xhr.onload = function(event) {
// status will be 0 for file:// urls // status will be 0 for file:// urls
if (!xhr.status || xhr.status >= 200 && xhr.status < 300) { if (!xhr.status || xhr.status >= 200 && xhr.status < 300) {
@@ -65,8 +65,8 @@ ol.featureloader.loadFeaturesXhr = function(url, format, success, failure) {
} }
}.bind(this); }.bind(this);
/** /**
* @private * @private
*/ */
xhr.onerror = function() { xhr.onerror = function() {
failure.call(this); failure.call(this);
}.bind(this); }.bind(this);

View File

@@ -121,9 +121,11 @@ ol.format.EsriJSON.convertRings_ = function(rings, layout) {
// loop over all outer rings and see if they contain our hole. // loop over all outer rings and see if they contain our hole.
for (i = outerRings.length - 1; i >= 0; i--) { for (i = outerRings.length - 1; i >= 0; i--) {
var outerRing = outerRings[i][0]; var outerRing = outerRings[i][0];
if (ol.extent.containsExtent(new ol.geom.LinearRing( var containsHole = ol.extent.containsExtent(
outerRing).getExtent(), new ol.geom.LinearRing(outerRing).getExtent(),
new ol.geom.LinearRing(hole).getExtent())) { new ol.geom.LinearRing(hole).getExtent()
);
if (containsHole) {
// the hole is contained push it into our polygon // the hole is contained push it into our polygon
outerRings[i].push(hole); outerRings[i].push(hole);
matched = true; matched = true;

View File

@@ -24,88 +24,88 @@ ol.Graticule = function(opt_options) {
var options = opt_options || {}; var options = opt_options || {};
/** /**
* @type {ol.Map} * @type {ol.Map}
* @private * @private
*/ */
this.map_ = null; this.map_ = null;
/** /**
* @type {ol.proj.Projection} * @type {ol.proj.Projection}
* @private * @private
*/ */
this.projection_ = null; this.projection_ = null;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.maxLat_ = Infinity; this.maxLat_ = Infinity;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.maxLon_ = Infinity; this.maxLon_ = Infinity;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.minLat_ = -Infinity; this.minLat_ = -Infinity;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.minLon_ = -Infinity; this.minLon_ = -Infinity;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.maxLatP_ = Infinity; this.maxLatP_ = Infinity;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.maxLonP_ = Infinity; this.maxLonP_ = Infinity;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.minLatP_ = -Infinity; this.minLatP_ = -Infinity;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.minLonP_ = -Infinity; this.minLonP_ = -Infinity;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.targetSize_ = options.targetSize !== undefined ? this.targetSize_ = options.targetSize !== undefined ?
options.targetSize : 100; options.targetSize : 100;
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.maxLines_ = options.maxLines !== undefined ? options.maxLines : 100; this.maxLines_ = options.maxLines !== undefined ? options.maxLines : 100;
/** /**
* @type {Array.<ol.geom.LineString>} * @type {Array.<ol.geom.LineString>}
* @private * @private
*/ */
this.meridians_ = []; this.meridians_ = [];
/** /**
* @type {Array.<ol.geom.LineString>} * @type {Array.<ol.geom.LineString>}
* @private * @private
*/ */
this.parallels_ = []; this.parallels_ = [];
/** /**

View File

@@ -57,8 +57,8 @@ ol.has.CANVAS_LINE_DASH = false;
*/ */
ol.has.CANVAS = ol.ENABLE_CANVAS && ( ol.has.CANVAS = ol.ENABLE_CANVAS && (
/** /**
* @return {boolean} Canvas supported. * @return {boolean} Canvas supported.
*/ */
function() { function() {
if (!('HTMLCanvasElement' in window)) { if (!('HTMLCanvasElement' in window)) {
return false; return false;

View File

@@ -217,11 +217,12 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
// the pixel. // the pixel.
ol.obj.clear(this.featureLayerAssociation_); ol.obj.clear(this.featureLayerAssociation_);
map.forEachFeatureAtPixel(mapBrowserEvent.pixel, map.forEachFeatureAtPixel(mapBrowserEvent.pixel,
(/** (
* @param {ol.Feature|ol.render.Feature} feature Feature. /**
* @param {ol.layer.Layer} layer Layer. * @param {ol.Feature|ol.render.Feature} feature Feature.
* @return {boolean|undefined} Continue to iterate over the features. * @param {ol.layer.Layer} layer Layer.
*/ * @return {boolean|undefined} Continue to iterate over the features.
*/
function(feature, layer) { function(feature, layer) {
if (this.filter_(feature, layer)) { if (this.filter_(feature, layer)) {
selected.push(feature); selected.push(feature);
@@ -250,11 +251,12 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
} else { } else {
// Modify the currently selected feature(s). // Modify the currently selected feature(s).
map.forEachFeatureAtPixel(mapBrowserEvent.pixel, map.forEachFeatureAtPixel(mapBrowserEvent.pixel,
(/** (
* @param {ol.Feature|ol.render.Feature} feature Feature. /**
* @param {ol.layer.Layer} layer Layer. * @param {ol.Feature|ol.render.Feature} feature Feature.
* @return {boolean|undefined} Continue to iterate over the features. * @param {ol.layer.Layer} layer Layer.
*/ * @return {boolean|undefined} Continue to iterate over the features.
*/
function(feature, layer) { function(feature, layer) {
if (this.filter_(feature, layer)) { if (this.filter_(feature, layer)) {
if ((add || toggle) && if ((add || toggle) &&

View File

@@ -35,39 +35,39 @@ ol.layer.Vector = function(opt_options) {
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions)); ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
/** /**
* @type {number} * @type {number}
* @private * @private
*/ */
this.renderBuffer_ = options.renderBuffer !== undefined ? this.renderBuffer_ = options.renderBuffer !== undefined ?
options.renderBuffer : 100; options.renderBuffer : 100;
/** /**
* User provided style. * User provided style.
* @type {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction} * @type {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction}
* @private * @private
*/ */
this.style_ = null; this.style_ = null;
/** /**
* Style function for use within the library. * Style function for use within the library.
* @type {ol.StyleFunction|undefined} * @type {ol.StyleFunction|undefined}
* @private * @private
*/ */
this.styleFunction_ = undefined; this.styleFunction_ = undefined;
this.setStyle(options.style); this.setStyle(options.style);
/** /**
* @type {boolean} * @type {boolean}
* @private * @private
*/ */
this.updateWhileAnimating_ = options.updateWhileAnimating !== undefined ? this.updateWhileAnimating_ = options.updateWhileAnimating !== undefined ?
options.updateWhileAnimating : false; options.updateWhileAnimating : false;
/** /**
* @type {boolean} * @type {boolean}
* @private * @private
*/ */
this.updateWhileInteracting_ = options.updateWhileInteracting !== undefined ? this.updateWhileInteracting_ = options.updateWhileInteracting !== undefined ?
options.updateWhileInteracting : false; options.updateWhileInteracting : false;
}; };

View File

@@ -221,12 +221,12 @@ ol.proj.addCoordinateTransforms = function(source, destination, forward, inverse
*/ */
ol.proj.createTransformFromCoordinateTransform = function(transform) { ol.proj.createTransformFromCoordinateTransform = function(transform) {
return ( return (
/** /**
* @param {Array.<number>} input Input. * @param {Array.<number>} input Input.
* @param {Array.<number>=} opt_output Output. * @param {Array.<number>=} opt_output Output.
* @param {number=} opt_dimension Dimension. * @param {number=} opt_dimension Dimension.
* @return {Array.<number>} Output. * @return {Array.<number>} Output.
*/ */
function(input, opt_output, opt_dimension) { function(input, opt_output, opt_dimension) {
var length = input.length; var length = input.length;
var dimension = opt_dimension !== undefined ? opt_dimension : 2; var dimension = opt_dimension !== undefined ? opt_dimension : 2;

View File

@@ -37,65 +37,65 @@ goog.require('ol.proj.proj4');
*/ */
ol.proj.Projection = function(options) { ol.proj.Projection = function(options) {
/** /**
* @private * @private
* @type {string} * @type {string}
*/ */
this.code_ = options.code; this.code_ = options.code;
/** /**
* @private * @private
* @type {ol.proj.Units} * @type {ol.proj.Units}
*/ */
this.units_ = /** @type {ol.proj.Units} */ (options.units); this.units_ = /** @type {ol.proj.Units} */ (options.units);
/** /**
* @private * @private
* @type {ol.Extent} * @type {ol.Extent}
*/ */
this.extent_ = options.extent !== undefined ? options.extent : null; this.extent_ = options.extent !== undefined ? options.extent : null;
/** /**
* @private * @private
* @type {ol.Extent} * @type {ol.Extent}
*/ */
this.worldExtent_ = options.worldExtent !== undefined ? this.worldExtent_ = options.worldExtent !== undefined ?
options.worldExtent : null; options.worldExtent : null;
/** /**
* @private * @private
* @type {string} * @type {string}
*/ */
this.axisOrientation_ = options.axisOrientation !== undefined ? this.axisOrientation_ = options.axisOrientation !== undefined ?
options.axisOrientation : 'enu'; options.axisOrientation : 'enu';
/** /**
* @private * @private
* @type {boolean} * @type {boolean}
*/ */
this.global_ = options.global !== undefined ? options.global : false; this.global_ = options.global !== undefined ? options.global : false;
/** /**
* @private * @private
* @type {boolean} * @type {boolean}
*/ */
this.canWrapX_ = !!(this.global_ && this.extent_); this.canWrapX_ = !!(this.global_ && this.extent_);
/** /**
* @private * @private
* @type {function(number, ol.Coordinate):number|undefined} * @type {function(number, ol.Coordinate):number|undefined}
*/ */
this.getPointResolutionFunc_ = options.getPointResolution; this.getPointResolutionFunc_ = options.getPointResolution;
/** /**
* @private * @private
* @type {ol.tilegrid.TileGrid} * @type {ol.tilegrid.TileGrid}
*/ */
this.defaultTileGrid_ = null; this.defaultTileGrid_ = null;
/** /**
* @private * @private
* @type {number|undefined} * @type {number|undefined}
*/ */
this.metersPerUnit_ = options.metersPerUnit; this.metersPerUnit_ = options.metersPerUnit;
var code = options.code; var code = options.code;

View File

@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.render.webgl.circlereplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ? ol.render.webgl.circlereplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
ol.render.webgl.circlereplay.defaultshader.Fragment.DEBUG_SOURCE : ol.render.webgl.circlereplay.defaultshader.Fragment.DEBUG_SOURCE :
ol.render.webgl.circlereplay.defaultshader.Fragment.OPTIMIZED_SOURCE; ol.render.webgl.circlereplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
ol.render.webgl.circlereplay.defaultshader.fragment = new ol.render.webgl.circlereplay.defaultshader.Fragment(); ol.render.webgl.circlereplay.defaultshader.fragment = new ol.render.webgl.circlereplay.defaultshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.render.webgl.circlereplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ? ol.render.webgl.circlereplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
ol.render.webgl.circlereplay.defaultshader.Vertex.DEBUG_SOURCE : ol.render.webgl.circlereplay.defaultshader.Vertex.DEBUG_SOURCE :
ol.render.webgl.circlereplay.defaultshader.Vertex.OPTIMIZED_SOURCE; ol.render.webgl.circlereplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
ol.render.webgl.circlereplay.defaultshader.vertex = new ol.render.webgl.circlereplay.defaultshader.Vertex(); ol.render.webgl.circlereplay.defaultshader.vertex = new ol.render.webgl.circlereplay.defaultshader.Vertex();

View File

@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.render.webgl.imagereplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ? ol.render.webgl.imagereplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
ol.render.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE : ol.render.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE :
ol.render.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE; ol.render.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
ol.render.webgl.imagereplay.defaultshader.fragment = new ol.render.webgl.imagereplay.defaultshader.Fragment(); ol.render.webgl.imagereplay.defaultshader.fragment = new ol.render.webgl.imagereplay.defaultshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.render.webgl.imagereplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ? ol.render.webgl.imagereplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
ol.render.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE : ol.render.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE :
ol.render.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE; ol.render.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
ol.render.webgl.imagereplay.defaultshader.vertex = new ol.render.webgl.imagereplay.defaultshader.Vertex(); ol.render.webgl.imagereplay.defaultshader.vertex = new ol.render.webgl.imagereplay.defaultshader.Vertex();

View File

@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.render.webgl.linestringreplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ? ol.render.webgl.linestringreplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
ol.render.webgl.linestringreplay.defaultshader.Fragment.DEBUG_SOURCE : ol.render.webgl.linestringreplay.defaultshader.Fragment.DEBUG_SOURCE :
ol.render.webgl.linestringreplay.defaultshader.Fragment.OPTIMIZED_SOURCE; ol.render.webgl.linestringreplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
ol.render.webgl.linestringreplay.defaultshader.fragment = new ol.render.webgl.linestringreplay.defaultshader.Fragment(); ol.render.webgl.linestringreplay.defaultshader.fragment = new ol.render.webgl.linestringreplay.defaultshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.render.webgl.linestringreplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ? ol.render.webgl.linestringreplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
ol.render.webgl.linestringreplay.defaultshader.Vertex.DEBUG_SOURCE : ol.render.webgl.linestringreplay.defaultshader.Vertex.DEBUG_SOURCE :
ol.render.webgl.linestringreplay.defaultshader.Vertex.OPTIMIZED_SOURCE; ol.render.webgl.linestringreplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
ol.render.webgl.linestringreplay.defaultshader.vertex = new ol.render.webgl.linestringreplay.defaultshader.Vertex(); ol.render.webgl.linestringreplay.defaultshader.vertex = new ol.render.webgl.linestringreplay.defaultshader.Vertex();

View File

@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.render.webgl.polygonreplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ? ol.render.webgl.polygonreplay.defaultshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
ol.render.webgl.polygonreplay.defaultshader.Fragment.DEBUG_SOURCE : ol.render.webgl.polygonreplay.defaultshader.Fragment.DEBUG_SOURCE :
ol.render.webgl.polygonreplay.defaultshader.Fragment.OPTIMIZED_SOURCE; ol.render.webgl.polygonreplay.defaultshader.Fragment.OPTIMIZED_SOURCE;
ol.render.webgl.polygonreplay.defaultshader.fragment = new ol.render.webgl.polygonreplay.defaultshader.Fragment(); ol.render.webgl.polygonreplay.defaultshader.fragment = new ol.render.webgl.polygonreplay.defaultshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.render.webgl.polygonreplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ? ol.render.webgl.polygonreplay.defaultshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
ol.render.webgl.polygonreplay.defaultshader.Vertex.DEBUG_SOURCE : ol.render.webgl.polygonreplay.defaultshader.Vertex.DEBUG_SOURCE :
ol.render.webgl.polygonreplay.defaultshader.Vertex.OPTIMIZED_SOURCE; ol.render.webgl.polygonreplay.defaultshader.Vertex.OPTIMIZED_SOURCE;
ol.render.webgl.polygonreplay.defaultshader.vertex = new ol.render.webgl.polygonreplay.defaultshader.Vertex(); ol.render.webgl.polygonreplay.defaultshader.vertex = new ol.render.webgl.polygonreplay.defaultshader.Vertex();

View File

@@ -66,11 +66,11 @@ ol.renderer.Layer.prototype.hasFeatureAtCoordinate = ol.functions.FALSE;
*/ */
ol.renderer.Layer.prototype.createLoadedTileFinder = function(source, projection, tiles) { ol.renderer.Layer.prototype.createLoadedTileFinder = function(source, projection, tiles) {
return ( return (
/** /**
* @param {number} zoom Zoom level. * @param {number} zoom Zoom level.
* @param {ol.TileRange} tileRange Tile range. * @param {ol.TileRange} tileRange Tile range.
* @return {boolean} The tile range is fully loaded. * @return {boolean} The tile range is fully loaded.
*/ */
function(zoom, tileRange) { function(zoom, tileRange) {
function callback(tile) { function callback(tile) {
if (!tiles[zoom]) { if (!tiles[zoom]) {

View File

@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.defaultmapshader.Fragment.SOURCE = ol.DEBUG_WEBGL ? ol.renderer.webgl.defaultmapshader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
ol.renderer.webgl.defaultmapshader.Fragment.DEBUG_SOURCE : ol.renderer.webgl.defaultmapshader.Fragment.DEBUG_SOURCE :
ol.renderer.webgl.defaultmapshader.Fragment.OPTIMIZED_SOURCE; ol.renderer.webgl.defaultmapshader.Fragment.OPTIMIZED_SOURCE;
ol.renderer.webgl.defaultmapshader.fragment = new ol.renderer.webgl.defaultmapshader.Fragment(); ol.renderer.webgl.defaultmapshader.fragment = new ol.renderer.webgl.defaultmapshader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.defaultmapshader.Vertex.SOURCE = ol.DEBUG_WEBGL ? ol.renderer.webgl.defaultmapshader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
ol.renderer.webgl.defaultmapshader.Vertex.DEBUG_SOURCE : ol.renderer.webgl.defaultmapshader.Vertex.DEBUG_SOURCE :
ol.renderer.webgl.defaultmapshader.Vertex.OPTIMIZED_SOURCE; ol.renderer.webgl.defaultmapshader.Vertex.OPTIMIZED_SOURCE;
ol.renderer.webgl.defaultmapshader.vertex = new ol.renderer.webgl.defaultmapshader.Vertex(); ol.renderer.webgl.defaultmapshader.vertex = new ol.renderer.webgl.defaultmapshader.Vertex();

View File

@@ -103,11 +103,11 @@ if (ol.ENABLE_WEBGL) {
var mapRenderer = this.mapRenderer; var mapRenderer = this.mapRenderer;
return ( return (
/** /**
* @param {number} zoom Zoom level. * @param {number} zoom Zoom level.
* @param {ol.TileRange} tileRange Tile range. * @param {ol.TileRange} tileRange Tile range.
* @return {boolean} The tile range is fully loaded. * @return {boolean} The tile range is fully loaded.
*/ */
function(zoom, tileRange) { function(zoom, tileRange) {
function callback(tile) { function callback(tile) {
var loaded = mapRenderer.isTileTextureLoaded(tile); var loaded = mapRenderer.isTileTextureLoaded(tile);

View File

@@ -38,8 +38,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.tilelayershader.Fragment.SOURCE = ol.DEBUG_WEBGL ? ol.renderer.webgl.tilelayershader.Fragment.SOURCE = ol.DEBUG_WEBGL ?
ol.renderer.webgl.tilelayershader.Fragment.DEBUG_SOURCE : ol.renderer.webgl.tilelayershader.Fragment.DEBUG_SOURCE :
ol.renderer.webgl.tilelayershader.Fragment.OPTIMIZED_SOURCE; ol.renderer.webgl.tilelayershader.Fragment.OPTIMIZED_SOURCE;
ol.renderer.webgl.tilelayershader.fragment = new ol.renderer.webgl.tilelayershader.Fragment(); ol.renderer.webgl.tilelayershader.fragment = new ol.renderer.webgl.tilelayershader.Fragment();
@@ -75,8 +75,8 @@ if (ol.ENABLE_WEBGL) {
* @type {string} * @type {string}
*/ */
ol.renderer.webgl.tilelayershader.Vertex.SOURCE = ol.DEBUG_WEBGL ? ol.renderer.webgl.tilelayershader.Vertex.SOURCE = ol.DEBUG_WEBGL ?
ol.renderer.webgl.tilelayershader.Vertex.DEBUG_SOURCE : ol.renderer.webgl.tilelayershader.Vertex.DEBUG_SOURCE :
ol.renderer.webgl.tilelayershader.Vertex.OPTIMIZED_SOURCE; ol.renderer.webgl.tilelayershader.Vertex.OPTIMIZED_SOURCE;
ol.renderer.webgl.tilelayershader.vertex = new ol.renderer.webgl.tilelayershader.Vertex(); ol.renderer.webgl.tilelayershader.vertex = new ol.renderer.webgl.tilelayershader.Vertex();

View File

@@ -10,12 +10,12 @@ goog.require('ol.math');
*/ */
ol.ResolutionConstraint.createSnapToResolutions = function(resolutions) { ol.ResolutionConstraint.createSnapToResolutions = function(resolutions) {
return ( return (
/** /**
* @param {number|undefined} resolution Resolution. * @param {number|undefined} resolution Resolution.
* @param {number} delta Delta. * @param {number} delta Delta.
* @param {number} direction Direction. * @param {number} direction Direction.
* @return {number|undefined} Resolution. * @return {number|undefined} Resolution.
*/ */
function(resolution, delta, direction) { function(resolution, delta, direction) {
if (resolution !== undefined) { if (resolution !== undefined) {
var z = var z =
@@ -43,12 +43,12 @@ ol.ResolutionConstraint.createSnapToResolutions = function(resolutions) {
*/ */
ol.ResolutionConstraint.createSnapToPower = function(power, maxResolution, opt_maxLevel) { ol.ResolutionConstraint.createSnapToPower = function(power, maxResolution, opt_maxLevel) {
return ( return (
/** /**
* @param {number|undefined} resolution Resolution. * @param {number|undefined} resolution Resolution.
* @param {number} delta Delta. * @param {number} delta Delta.
* @param {number} direction Direction. * @param {number} direction Direction.
* @return {number|undefined} Resolution. * @return {number|undefined} Resolution.
*/ */
function(resolution, delta, direction) { function(resolution, delta, direction) {
if (resolution !== undefined) { if (resolution !== undefined) {
var offset = -direction / 2 + 0.5; var offset = -direction / 2 + 0.5;

View File

@@ -38,11 +38,11 @@ ol.RotationConstraint.none = function(rotation, delta) {
ol.RotationConstraint.createSnapToN = function(n) { ol.RotationConstraint.createSnapToN = function(n) {
var theta = 2 * Math.PI / n; var theta = 2 * Math.PI / n;
return ( return (
/** /**
* @param {number|undefined} rotation Rotation. * @param {number|undefined} rotation Rotation.
* @param {number} delta Delta. * @param {number} delta Delta.
* @return {number|undefined} Rotation. * @return {number|undefined} Rotation.
*/ */
function(rotation, delta) { function(rotation, delta) {
if (rotation !== undefined) { if (rotation !== undefined) {
rotation = Math.floor((rotation + delta) / theta + 0.5) * theta; rotation = Math.floor((rotation + delta) / theta + 0.5) * theta;
@@ -61,11 +61,11 @@ ol.RotationConstraint.createSnapToN = function(n) {
ol.RotationConstraint.createSnapToZero = function(opt_tolerance) { ol.RotationConstraint.createSnapToZero = function(opt_tolerance) {
var tolerance = opt_tolerance || ol.math.toRadians(5); var tolerance = opt_tolerance || ol.math.toRadians(5);
return ( return (
/** /**
* @param {number|undefined} rotation Rotation. * @param {number|undefined} rotation Rotation.
* @param {number} delta Delta. * @param {number} delta Delta.
* @return {number|undefined} Rotation. * @return {number|undefined} Rotation.
*/ */
function(rotation, delta) { function(rotation, delta) {
if (rotation !== undefined) { if (rotation !== undefined) {
if (Math.abs(rotation + delta) <= tolerance) { if (Math.abs(rotation + delta) <= tolerance) {

View File

@@ -154,12 +154,12 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = function(response)
.replace('{subdomain}', subdomain) .replace('{subdomain}', subdomain)
.replace('{culture}', culture); .replace('{culture}', culture);
return ( return (
/** /**
* @param {ol.TileCoord} tileCoord Tile coordinate. * @param {ol.TileCoord} tileCoord Tile coordinate.
* @param {number} pixelRatio Pixel ratio. * @param {number} pixelRatio Pixel ratio.
* @param {ol.proj.Projection} projection Projection. * @param {ol.proj.Projection} projection Projection.
* @return {string|undefined} Tile URL. * @return {string|undefined} Tile URL.
*/ */
function(tileCoord, pixelRatio, projection) { function(tileCoord, pixelRatio, projection) {
if (!tileCoord) { if (!tileCoord) {
return undefined; return undefined;

View File

@@ -119,12 +119,12 @@ ol.source.WMTS = function(options) {
}); });
return ( return (
/** /**
* @param {ol.TileCoord} tileCoord Tile coordinate. * @param {ol.TileCoord} tileCoord Tile coordinate.
* @param {number} pixelRatio Pixel ratio. * @param {number} pixelRatio Pixel ratio.
* @param {ol.proj.Projection} projection Projection. * @param {ol.proj.Projection} projection Projection.
* @return {string|undefined} Tile URL. * @return {string|undefined} Tile URL.
*/ */
function(tileCoord, pixelRatio, projection) { function(tileCoord, pixelRatio, projection) {
if (!tileCoord) { if (!tileCoord) {
return undefined; return undefined;

View File

@@ -16,12 +16,12 @@ ol.TileUrlFunction.createFromTemplate = function(template, tileGrid) {
var yRegEx = /\{y\}/g; var yRegEx = /\{y\}/g;
var dashYRegEx = /\{-y\}/g; var dashYRegEx = /\{-y\}/g;
return ( return (
/** /**
* @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.TileCoord} tileCoord Tile Coordinate.
* @param {number} pixelRatio Pixel ratio. * @param {number} pixelRatio Pixel ratio.
* @param {ol.proj.Projection} projection Projection. * @param {ol.proj.Projection} projection Projection.
* @return {string|undefined} Tile URL. * @return {string|undefined} Tile URL.
*/ */
function(tileCoord, pixelRatio, projection) { function(tileCoord, pixelRatio, projection) {
if (!tileCoord) { if (!tileCoord) {
return undefined; return undefined;
@@ -69,12 +69,12 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
return tileUrlFunctions[0]; return tileUrlFunctions[0];
} }
return ( return (
/** /**
* @param {ol.TileCoord} tileCoord Tile Coordinate. * @param {ol.TileCoord} tileCoord Tile Coordinate.
* @param {number} pixelRatio Pixel ratio. * @param {number} pixelRatio Pixel ratio.
* @param {ol.proj.Projection} projection Projection. * @param {ol.proj.Projection} projection Projection.
* @return {string|undefined} Tile URL. * @return {string|undefined} Tile URL.
*/ */
function(tileCoord, pixelRatio, projection) { function(tileCoord, pixelRatio, projection) {
if (!tileCoord) { if (!tileCoord) {
return undefined; return undefined;

View File

@@ -697,10 +697,10 @@ ol.View.prototype.getResolutionForValueFunction = function(opt_power) {
var minResolution = this.minResolution_; var minResolution = this.minResolution_;
var max = Math.log(maxResolution / minResolution) / Math.log(power); var max = Math.log(maxResolution / minResolution) / Math.log(power);
return ( return (
/** /**
* @param {number} value Value. * @param {number} value Value.
* @return {number} Resolution. * @return {number} Resolution.
*/ */
function(value) { function(value) {
var resolution = maxResolution / Math.pow(power, value * max); var resolution = maxResolution / Math.pow(power, value * max);
return resolution; return resolution;
@@ -731,10 +731,10 @@ ol.View.prototype.getValueForResolutionFunction = function(opt_power) {
var minResolution = this.minResolution_; var minResolution = this.minResolution_;
var max = Math.log(maxResolution / minResolution) / Math.log(power); var max = Math.log(maxResolution / minResolution) / Math.log(power);
return ( return (
/** /**
* @param {number} resolution Resolution. * @param {number} resolution Resolution.
* @return {number} Value. * @return {number} Value.
*/ */
function(resolution) { function(resolution) {
var value = var value =
(Math.log(maxResolution / resolution) / Math.log(power)) / max; (Math.log(maxResolution / resolution) / Math.log(power)) / max;

View File

@@ -125,10 +125,10 @@ ol.xml.parse = function(xml) {
*/ */
ol.xml.makeArrayExtender = function(valueReader, opt_this) { ol.xml.makeArrayExtender = function(valueReader, opt_this) {
return ( return (
/** /**
* @param {Node} node Node. * @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
*/ */
function(node, objectStack) { function(node, objectStack) {
var value = valueReader.call(opt_this, node, objectStack); var value = valueReader.call(opt_this, node, objectStack);
if (value !== undefined) { if (value !== undefined) {
@@ -150,10 +150,10 @@ ol.xml.makeArrayExtender = function(valueReader, opt_this) {
*/ */
ol.xml.makeArrayPusher = function(valueReader, opt_this) { ol.xml.makeArrayPusher = function(valueReader, opt_this) {
return ( return (
/** /**
* @param {Node} node Node. * @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
*/ */
function(node, objectStack) { function(node, objectStack) {
var value = valueReader.call(opt_this !== undefined ? opt_this : this, var value = valueReader.call(opt_this !== undefined ? opt_this : this,
node, objectStack); node, objectStack);
@@ -175,10 +175,10 @@ ol.xml.makeArrayPusher = function(valueReader, opt_this) {
*/ */
ol.xml.makeReplacer = function(valueReader, opt_this) { ol.xml.makeReplacer = function(valueReader, opt_this) {
return ( return (
/** /**
* @param {Node} node Node. * @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
*/ */
function(node, objectStack) { function(node, objectStack) {
var value = valueReader.call(opt_this !== undefined ? opt_this : this, var value = valueReader.call(opt_this !== undefined ? opt_this : this,
node, objectStack); node, objectStack);
@@ -200,10 +200,10 @@ ol.xml.makeReplacer = function(valueReader, opt_this) {
*/ */
ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this) { ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this) {
return ( return (
/** /**
* @param {Node} node Node. * @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
*/ */
function(node, objectStack) { function(node, objectStack) {
var value = valueReader.call(opt_this !== undefined ? opt_this : this, var value = valueReader.call(opt_this !== undefined ? opt_this : this,
node, objectStack); node, objectStack);
@@ -234,10 +234,10 @@ ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this)
*/ */
ol.xml.makeObjectPropertySetter = function(valueReader, opt_property, opt_this) { ol.xml.makeObjectPropertySetter = function(valueReader, opt_property, opt_this) {
return ( return (
/** /**
* @param {Node} node Node. * @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
*/ */
function(node, objectStack) { function(node, objectStack) {
var value = valueReader.call(opt_this !== undefined ? opt_this : this, var value = valueReader.call(opt_this !== undefined ? opt_this : this,
node, objectStack); node, objectStack);
@@ -317,12 +317,12 @@ ol.xml.makeArraySerializer = function(nodeWriter, opt_this) {
ol.xml.makeSimpleNodeFactory = function(opt_nodeName, opt_namespaceURI) { ol.xml.makeSimpleNodeFactory = function(opt_nodeName, opt_namespaceURI) {
var fixedNodeName = opt_nodeName; var fixedNodeName = opt_nodeName;
return ( return (
/** /**
* @param {*} value Value. * @param {*} value Value.
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @param {string=} opt_nodeName Node name. * @param {string=} opt_nodeName Node name.
* @return {Node} Node. * @return {Node} Node.
*/ */
function(value, objectStack, opt_nodeName) { function(value, objectStack, opt_nodeName) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
var node = context.node; var node = context.node;