ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prefer single line assignment to 80 character limit

Browse Source
This commit is contained in:
Tim Schaub
2016-01-09 12:16:11 -07:00
parent 59a66c7aaa
commit 3cf8618fc7
105 changed files with 445 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ol/renderer/webgl/webglimagelayerrenderer.js
View File

@@ -74,8 +74,7 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
/**
* @inheritDoc
*/
ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate =
function(coordinate, frameState, callback, thisArg) {
ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg) {
var layer = this.getLayer();
var source = layer.getSource();
var resolution = frameState.viewState.resolution;
@@ -97,8 +96,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate =
/**
* @inheritDoc
*/
ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
function(frameState, layerState, context) {
ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layerState, context) {
var gl = this.mapRenderer.getGL();
@@ -194,8 +192,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
* @param {ol.Extent} imageExtent Image extent.
* @private
*/
ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ =
function(canvasWidth, canvasHeight, pixelRatio,
ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = function(canvasWidth, canvasHeight, pixelRatio,
viewCenter, viewResolution, viewRotation, imageExtent) {
var canvasExtentWidth = canvasWidth * viewResolution;
@@ -223,8 +220,7 @@ ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ =
/**
* @inheritDoc
*/
ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate =
function(coordinate, frameState) {
ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
var hasFeature = this.forEachFeatureAtCoordinate(
coordinate, frameState, goog.functions.TRUE, this);
return hasFeature !== undefined;
@@ -234,8 +230,7 @@ ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate =
/**
* @inheritDoc
*/
ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel =
function(pixel, frameState, callback, thisArg) {
ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
if (!this.image_ || !this.image_.getImage()) {
return undefined;
}
@@ -299,8 +294,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel =
* @return {goog.vec.Mat4.Number} The transformation matrix.
* @private
*/
ol.renderer.webgl.ImageLayer.prototype.getHitTransformationMatrix_ =
function(mapSize, imageSize) {
ol.renderer.webgl.ImageLayer.prototype.getHitTransformationMatrix_ = function(mapSize, imageSize) {
// the first matrix takes a map pixel, flips the y-axis and scales to
// a range between -1 ... 1
var mapCoordMatrix = goog.vec.Mat4.createNumber();

9
src/ol/renderer/webgl/webgllayerrenderer.js
View File

@@ -88,8 +88,7 @@ goog.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer);
* @param {number} framebufferDimension Framebuffer dimension.
* @protected
*/
ol.renderer.webgl.Layer.prototype.bindFramebuffer =
function(frameState, framebufferDimension) {
ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebufferDimension) {
var gl = this.mapRenderer.getGL();
@@ -134,8 +133,7 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer =
* @param {ol.layer.LayerState} layerState Layer state.
* @param {ol.webgl.Context} context Context.
*/
ol.renderer.webgl.Layer.prototype.composeFrame =
function(frameState, layerState, context) {
ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState, context) {
this.dispatchComposeEvent_(
ol.render.EventType.PRECOMPOSE, context, frameState);
@@ -189,8 +187,7 @@ ol.renderer.webgl.Layer.prototype.composeFrame =
* @param {olx.FrameState} frameState Frame state.
* @private
*/
ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ =
function(type, context, frameState) {
ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ = function(type, context, frameState) {
var layer = this.getLayer();
if (layer.hasListener(type)) {
var viewState = frameState.viewState;

15
src/ol/renderer/webgl/webglmaprenderer.js
View File

@@ -187,8 +187,7 @@ goog.inherits(ol.renderer.webgl.Map, ol.renderer.Map);
* @param {number} magFilter Mag filter.
* @param {number} minFilter Min filter.
*/
ol.renderer.webgl.Map.prototype.bindTileTexture =
function(tile, tileSize, tileGutter, magFilter, minFilter) {
ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileGutter, magFilter, minFilter) {
var gl = this.getGL();
var tileKey = tile.getKey();
if (this.textureCache_.containsKey(tileKey)) {
@@ -270,8 +269,7 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
* @param {olx.FrameState} frameState Frame state.
* @private
*/
ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ =
function(type, frameState) {
ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ = function(type, frameState) {
var map = this.getMap();
if (map.hasListener(type)) {
var context = this.context_;
@@ -536,8 +534,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate =
function(coordinate, frameState, callback, thisArg,
ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg,
layerFilter, thisArg2) {
var result;
@@ -570,8 +567,7 @@ ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate =
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate =
function(coordinate, frameState, layerFilter, thisArg) {
ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, layerFilter, thisArg) {
var hasFeature = false;
if (this.getGL().isContextLost()) {
@@ -603,8 +599,7 @@ ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate =
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.forEachLayerAtPixel =
function(pixel, frameState, callback, thisArg,
ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg,
layerFilter, thisArg2) {
if (this.getGL().isContextLost()) {
return false;

31
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -112,8 +112,7 @@ ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
* lookup.
* @protected
*/
ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder =
function(source, projection, tiles) {
ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = function(source, projection, tiles) {
var mapRenderer = this.mapRenderer;
return (
@@ -123,17 +122,17 @@ ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder =
* @return {boolean} The tile range is fully loaded.
*/
function(zoom, tileRange) {
return source.forEachLoadedTile(projection, zoom,
tileRange, function(tile) {
var loaded = mapRenderer.isTileTextureLoaded(tile);
if (loaded) {
if (!tiles[zoom]) {
tiles[zoom] = {};
}
tiles[zoom][tile.tileCoord.toString()] = tile;
}
return loaded;
});
function callback(tile) {
var loaded = mapRenderer.isTileTextureLoaded(tile);
if (loaded) {
if (!tiles[zoom]) {
tiles[zoom] = {};
}
tiles[zoom][tile.tileCoord.toString()] = tile;
}
return loaded;
}
return source.forEachLoadedTile(projection, zoom, tileRange, callback);
});
};
@@ -150,8 +149,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
/**
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.prepareFrame =
function(frameState, layerState, context) {
ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerState, context) {
var mapRenderer = this.mapRenderer;
var gl = context.getGL();
@@ -385,8 +383,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
/**
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel =
function(pixel, frameState, callback, thisArg) {
ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
if (!this.framebuffer) {
return undefined;
}

32
src/ol/renderer/webgl/webglvectorlayerrenderer.js
View File

@@ -72,8 +72,7 @@ goog.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer);
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.composeFrame =
function(frameState, layerState, context) {
ol.renderer.webgl.VectorLayer.prototype.composeFrame = function(frameState, layerState, context) {
this.layerState_ = layerState;
var viewState = frameState.viewState;
var replayGroup = this.replayGroup_;
@@ -104,8 +103,7 @@ ol.renderer.webgl.VectorLayer.prototype.disposeInternal = function() {
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate =
function(coordinate, frameState, callback, thisArg) {
ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg) {
if (!this.replayGroup_ || !this.layerState_) {
return undefined;
} else {
@@ -138,8 +136,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate =
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate =
function(coordinate, frameState) {
ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
if (!this.replayGroup_ || !this.layerState_) {
return false;
} else {
@@ -157,8 +154,7 @@ ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate =
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel =
function(pixel, frameState, callback, thisArg) {
ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
var coordinate = pixel.slice();
ol.vec.Mat4.multVec2(
frameState.pixelToCoordinateMatrix, coordinate, coordinate);
@@ -177,8 +173,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel =
* @param {goog.events.Event} event Image style change event.
* @private
*/
ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ =
function(event) {
ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ = function(event) {
this.renderIfReadyAndVisible();
};
@@ -186,8 +181,7 @@ ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ =
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.prepareFrame =
function(frameState, layerState, context) {
ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, layerState, context) {
var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer());
goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector,
@@ -243,12 +237,11 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame =
ol.renderer.vector.getTolerance(resolution, pixelRatio),
extent, vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection);
var renderFeature =
/**
* @param {ol.Feature} feature Feature.
* @this {ol.renderer.webgl.VectorLayer}
*/
function(feature) {
/**
* @param {ol.Feature} feature Feature.
* @this {ol.renderer.webgl.VectorLayer}
*/
var renderFeature = function(feature) {
var styles;
var styleFunction = feature.getStyleFunction();
if (styleFunction) {
@@ -301,8 +294,7 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame =
* @param {ol.render.webgl.ReplayGroup} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.
*/
ol.renderer.webgl.VectorLayer.prototype.renderFeature =
function(feature, resolution, pixelRatio, styles, replayGroup) {
ol.renderer.webgl.VectorLayer.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) {
if (!styles) {
return false;
}