From 6900c90bc5c0a3682999d407049dee6813ee9e92 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:46:54 +0200 Subject: [PATCH 01/13] Remove unused variables in examples --- examples/kml.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/kml.js b/examples/kml.js index 3892511508..8c228d611c 100644 --- a/examples/kml.js +++ b/examples/kml.js @@ -67,7 +67,6 @@ xhr.open('GET', url, true); xhr.onload = function() { if (xhr.status == 200) { // this is silly to have to tell the layer the destination projection - var projection = map.getView().getProjection(); vector.parseFeatures(xhr.responseText, kml, epsg4326); } }; From b021bfd70f9ce5e5cac4b78bf296ed7c96da679c Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:47:14 +0200 Subject: [PATCH 02/13] Remove unused variables in geom --- src/ol/geom/polygon.js | 7 ------- test/spec/ol/geom/linearring.test.js | 1 + test/spec/ol/geom/linestring.test.js | 1 + test/spec/ol/geom/multilinestring.test.js | 1 + test/spec/ol/geom/multipoint.test.js | 1 + test/spec/ol/geom/multipolygon.test.js | 1 + test/spec/ol/geom/point.test.js | 1 + test/spec/ol/geom/polygon.test.js | 1 + test/spec/ol/geom/sharedvertices.test.js | 22 +++++++++++----------- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ol/geom/polygon.js b/src/ol/geom/polygon.js index 7da4f2a82a..e9b6d7c600 100644 --- a/src/ol/geom/polygon.js +++ b/src/ol/geom/polygon.js @@ -1,7 +1,6 @@ goog.provide('ol.geom.Polygon'); goog.require('goog.asserts'); -goog.require('ol.Extent'); goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.LinearRing'); @@ -51,12 +50,6 @@ ol.geom.Polygon = function(coordinates, opt_shared) { this.dimension = vertices.getDimension(); goog.asserts.assert(this.dimension >= 2); - /** - * @type {ol.Extent} - * @private - */ - this.bounds_ = null; - }; goog.inherits(ol.geom.Polygon, ol.geom.Geometry); diff --git a/test/spec/ol/geom/linearring.test.js b/test/spec/ol/geom/linearring.test.js index 118b076f36..67b1da9935 100644 --- a/test/spec/ol/geom/linearring.test.js +++ b/test/spec/ol/geom/linearring.test.js @@ -12,6 +12,7 @@ describe('ol.geom.LinearRing', function() { it('throws when given mismatched dimension', function() { expect(function() { var ring = new ol.geom.LinearRing([[10, 20], [30, 40, 50]]); + ring = ring; // suppress gjslint warning about unused variable }).to.throwException(); }); diff --git a/test/spec/ol/geom/linestring.test.js b/test/spec/ol/geom/linestring.test.js index 22e7c16d84..dfdd1c37ee 100644 --- a/test/spec/ol/geom/linestring.test.js +++ b/test/spec/ol/geom/linestring.test.js @@ -13,6 +13,7 @@ describe('ol.geom.LineString', function() { it('throws when given mismatched dimension', function() { expect(function() { var line = new ol.geom.LineString([[10, 20], [30, 40, 50]]); + line = line; // suppress gjslint warning about unused variable }).to.throwException(); }); diff --git a/test/spec/ol/geom/multilinestring.test.js b/test/spec/ol/geom/multilinestring.test.js index a63f6fa64f..e5fbe9ee62 100644 --- a/test/spec/ol/geom/multilinestring.test.js +++ b/test/spec/ol/geom/multilinestring.test.js @@ -15,6 +15,7 @@ describe('ol.geom.MultiLineString', function() { it('throws when given with insufficient dimensions', function() { expect(function() { var multi = new ol.geom.MultiLineString([1]); + multi = multi; // suppress gjslint warning about unused variable }).to.throwException(); }); diff --git a/test/spec/ol/geom/multipoint.test.js b/test/spec/ol/geom/multipoint.test.js index c1b1f7098f..dae7d1fb21 100644 --- a/test/spec/ol/geom/multipoint.test.js +++ b/test/spec/ol/geom/multipoint.test.js @@ -13,6 +13,7 @@ describe('ol.geom.MultiPoint', function() { it('throws when given with insufficient dimensions', function() { expect(function() { var multi = new ol.geom.MultiPoint([1]); + multi = multi; // suppress gjslint warning about unused variable }).to.throwException(); }); diff --git a/test/spec/ol/geom/multipolygon.test.js b/test/spec/ol/geom/multipolygon.test.js index 66acc83f1a..5c3b76ccf5 100644 --- a/test/spec/ol/geom/multipolygon.test.js +++ b/test/spec/ol/geom/multipolygon.test.js @@ -20,6 +20,7 @@ describe('ol.geom.MultiPolygon', function() { it('throws when given with insufficient dimensions', function() { expect(function() { var multi = new ol.geom.MultiPolygon([1]); + multi = multi; // suppress gjslint warning about unused variable }).to.throwException(); }); diff --git a/test/spec/ol/geom/point.test.js b/test/spec/ol/geom/point.test.js index 1b00029a7e..4320c25499 100644 --- a/test/spec/ol/geom/point.test.js +++ b/test/spec/ol/geom/point.test.js @@ -23,6 +23,7 @@ describe('ol.geom.Point', function() { it('throws when given with insufficient dimensions', function() { expect(function() { var point = new ol.geom.Point([1]); + point = point; // suppress gjslint warning about unused variable }).to.throwException(); }); diff --git a/test/spec/ol/geom/polygon.test.js b/test/spec/ol/geom/polygon.test.js index ea18f84339..9973e15eaa 100644 --- a/test/spec/ol/geom/polygon.test.js +++ b/test/spec/ol/geom/polygon.test.js @@ -17,6 +17,7 @@ describe('ol.geom.Polygon', function() { it('throws when given mismatched dimension', function() { expect(function() { var poly = new ol.geom.Polygon([[[10, 20], [30, 40, 50]]]); + poly = poly; // suppress gjslint warning about unused variable }).to.throwException(); }); diff --git a/test/spec/ol/geom/sharedvertices.test.js b/test/spec/ol/geom/sharedvertices.test.js index 66b7d8c48f..0e9c3fc29d 100644 --- a/test/spec/ol/geom/sharedvertices.test.js +++ b/test/spec/ol/geom/sharedvertices.test.js @@ -117,9 +117,9 @@ describe('ol.geom.SharedVertices', function() { describe('#getCounts()', function() { it('returns the counts array', function() { var vertices = new ol.geom.SharedVertices(); - var first = vertices.add([[2, 3], [3, 4], [4, 5]]); - var second = vertices.add([[5, 6], [6, 6]]); - var third = vertices.add([[7, 8]]); + vertices.add([[2, 3], [3, 4], [4, 5]]); + vertices.add([[5, 6], [6, 6]]); + vertices.add([[7, 8]]); expect(vertices.getCounts()).to.eql([3, 2, 1]); }); @@ -169,9 +169,9 @@ describe('ol.geom.SharedVertices', function() { describe('#getStarts()', function() { it('returns the counts array', function() { var vertices = new ol.geom.SharedVertices(); - var first = vertices.add([[2, 3], [3, 4], [4, 5]]); - var second = vertices.add([[5, 6], [6, 6]]); - var third = vertices.add([[7, 8]]); + vertices.add([[2, 3], [3, 4], [4, 5]]); + vertices.add([[5, 6], [6, 6]]); + vertices.add([[7, 8]]); expect(vertices.getStarts()).to.eql([0, 6, 10]); }); @@ -180,19 +180,19 @@ describe('ol.geom.SharedVertices', function() { describe('#coordinates', function() { it('is a flat array of all coordinate values', function() { var vertices = new ol.geom.SharedVertices(); - var first = vertices.add([[1, 2], [3, 4]]); - var second = vertices.add([[5, 6]]); - var third = vertices.add([[7, 8], [9, 10], [11, 12]]); + vertices.add([[1, 2], [3, 4]]); + vertices.add([[5, 6]]); + vertices.add([[7, 8], [9, 10], [11, 12]]); expect(vertices.coordinates).to.eql( [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]); }); it('is not reassigned', function() { var vertices = new ol.geom.SharedVertices(); - var first = vertices.add([[1, 2], [3, 4]]); + vertices.add([[1, 2], [3, 4]]); var coordinates = vertices.coordinates; - var second = vertices.add([[5, 6]]); + vertices.add([[5, 6]]); expect(vertices.coordinates).to.be(coordinates); }); }); From 42b6ed5d2a667a3e3dbf12272bc6773deb1f93db Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:47:33 +0200 Subject: [PATCH 03/13] Remove unused variables in interactions --- src/ol/interaction/dragrotateinteraction.js | 2 -- src/ol/interaction/touchinteraction.js | 1 - src/ol/interaction/touchrotateinteraction.js | 2 -- 3 files changed, 5 deletions(-) diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index 60dfa35258..1369340c87 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -48,7 +48,6 @@ goog.inherits(ol.interaction.DragRotate, ol.interaction.Drag); * @inheritDoc */ ol.interaction.DragRotate.prototype.handleDrag = function(mapBrowserEvent) { - var browserEvent = mapBrowserEvent.browserEvent; var map = mapBrowserEvent.map; var size = map.getSize(); var offset = mapBrowserEvent.getPixel(); @@ -70,7 +69,6 @@ ol.interaction.DragRotate.prototype.handleDrag = function(mapBrowserEvent) { * @inheritDoc */ ol.interaction.DragRotate.prototype.handleDragEnd = function(mapBrowserEvent) { - var browserEvent = mapBrowserEvent.browserEvent; var map = mapBrowserEvent.map; // FIXME supports View2D only var view = map.getView(); diff --git a/src/ol/interaction/touchinteraction.js b/src/ol/interaction/touchinteraction.js index ec038d0241..322b572dd1 100644 --- a/src/ol/interaction/touchinteraction.js +++ b/src/ol/interaction/touchinteraction.js @@ -106,7 +106,6 @@ ol.interaction.Touch.prototype.handleTouchStart = goog.functions.FALSE; */ ol.interaction.Touch.prototype.handleMapBrowserEvent = function(mapBrowserEvent) { - var browserEvent = mapBrowserEvent.browserEvent.getBrowserEvent(); this.updateTrackedTouches_(mapBrowserEvent); if (this.handled_) { if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.TOUCHMOVE) { diff --git a/src/ol/interaction/touchrotateinteraction.js b/src/ol/interaction/touchrotateinteraction.js index e0e4c9e937..291d8156f0 100644 --- a/src/ol/interaction/touchrotateinteraction.js +++ b/src/ol/interaction/touchrotateinteraction.js @@ -73,8 +73,6 @@ ol.interaction.TouchRotate.prototype.handleTouchMove = var touch0 = this.targetTouches[0]; var touch1 = this.targetTouches[1]; - var dx = touch0.clientX - touch1.clientX; - var dy = touch0.clientY - touch1.clientY; // angle between touches var angle = Math.atan2( From 268c18988b70bb6653780f1f9db6db103541dc19 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:47:45 +0200 Subject: [PATCH 04/13] Remove unused variables in parsers --- src/ol/parser/ogc/gml_v3.js | 2 +- test/spec/ol/parser/kml.test.js | 6 +++--- test/spec/ol/parser/ogc/gml_v2.test.js | 2 +- test/spec/ol/parser/ogc/gml_v3.test.js | 3 +-- test/spec/ol/parser/ogc/versioned.test.js | 3 --- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/ol/parser/ogc/gml_v3.js b/src/ol/parser/ogc/gml_v3.js index 8162979062..744d75afc8 100644 --- a/src/ol/parser/ogc/gml_v3.js +++ b/src/ol/parser/ogc/gml_v3.js @@ -119,7 +119,7 @@ ol.parser.ogc.GML_v3 = function(opt_options) { var dim = obj.srsDimension || parseInt(node.getAttribute('srsDimension') || node.getAttribute('dimension'), 10) || 2; - var j, x, y, z; + var x, y, z; var numPoints = coords.length / dim; var points = new Array(numPoints); for (var i = 0, ii = coords.length; i < ii; i += dim) { diff --git a/test/spec/ol/parser/kml.test.js b/test/spec/ol/parser/kml.test.js index 2b13914fef..f6f45cc94b 100644 --- a/test/spec/ol/parser/kml.test.js +++ b/test/spec/ol/parser/kml.test.js @@ -49,7 +49,7 @@ describe('ol.parser.kml', function() { afterLoadXml(url, function(xml) { var p = new ol.parser.KML({maxDepth: 1}); // we need to supply a callback to get visited NetworkLinks - var obj = p.read(xml, function(features) { + p.read(xml, function(features) { expect(features.length).to.eql(3); done(); }); @@ -60,7 +60,7 @@ describe('ol.parser.kml', function() { afterLoadXml(url, function(xml) { var p = new ol.parser.KML({maxDepth: 2}); // we need to supply a callback to get visited NetworkLinks - var obj = p.read(xml, function(features) { + p.read(xml, function(features) { expect(features.length).to.eql(2); done(); }); @@ -71,7 +71,7 @@ describe('ol.parser.kml', function() { afterLoadXml(url, function(xml) { var p = new ol.parser.KML({maxDepth: 1}); // we need to supply a callback to get visited NetworkLinks - var obj = p.read(xml, function(features) { + p.read(xml, function(features) { // since maxDepth is 1, we will not get to the second feature expect(features.length).to.eql(1); done(); diff --git a/test/spec/ol/parser/ogc/gml_v2.test.js b/test/spec/ol/parser/ogc/gml_v2.test.js index 1364e3d18c..6e707fcf69 100644 --- a/test/spec/ol/parser/ogc/gml_v2.test.js +++ b/test/spec/ol/parser/ogc/gml_v2.test.js @@ -298,7 +298,7 @@ describe('ol.parser.gml_v2', function() { it('Test boundedBy', function() { var url = 'spec/ol/parser/ogc/xml/gml_v2/boundedBy.xml'; afterLoadXml(url, function(xml) { - var obj = parser.read(xml); + parser.read(xml); // TODO test bounds on feature // see https://github.com/openlayers/ol3/issues/566 }); diff --git a/test/spec/ol/parser/ogc/gml_v3.test.js b/test/spec/ol/parser/ogc/gml_v3.test.js index 48ccf1d643..a89de26b70 100644 --- a/test/spec/ol/parser/ogc/gml_v3.test.js +++ b/test/spec/ol/parser/ogc/gml_v3.test.js @@ -308,8 +308,7 @@ describe('ol.parser.gml_v3', function() { it('Read autoConfig', function() { var url = 'spec/ol/parser/ogc/xml/gml_v3/topp-states-wfs.xml'; afterLoadXml(url, function(xml) { - var obj = parser.read(xml); - var features = obj.features; + parser.read(xml); expect(parser.featureType).to.eql('states'); expect(parser.featureNS).to.eql('http://www.openplans.org/topp'); expect(parser.autoConfig === true).to.be.ok(); diff --git a/test/spec/ol/parser/ogc/versioned.test.js b/test/spec/ol/parser/ogc/versioned.test.js index 1d6173cd4a..ff0d08930c 100644 --- a/test/spec/ol/parser/ogc/versioned.test.js +++ b/test/spec/ol/parser/ogc/versioned.test.js @@ -2,9 +2,6 @@ goog.provide('ol.test.parser.ogc.Versioned'); describe('ol.parser.ogc.versioned', function() { - var snippet = ''; - var snippet2 = ''; - describe('test constructor', function() { var parser = new ol.parser.ogc.Versioned({version: '1.0.0'}); it('new OpenLayers.Format.XML.VersionedOGC returns object', function() { From f64e35e8bb9dfcbe70136be9965af4759a4c37ab Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:48:44 +0200 Subject: [PATCH 05/13] Remove unused variables in renderers --- src/ol/renderer/canvas/canvastilelayerrenderer.js | 2 -- src/ol/renderer/dom/domtilelayerrenderer.js | 2 -- src/ol/renderer/maprenderer.js | 6 ------ src/ol/renderer/webgl/webgllayerrenderer.js | 1 - src/ol/renderer/webgl/webglmaprenderer.js | 5 +---- test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js | 1 - 6 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index 7886361653..13fd5dc87b 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -270,7 +270,6 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame = var findLoadedTiles = goog.bind(tileSource.findLoadedTiles, tileSource, tilesToDrawByZ, getTileIfLoaded); - var allTilesLoaded = true; var tmpExtent = ol.extent.createEmpty(); var tmpTileRange = new ol.TileRange(0, 0, 0, 0); var childTileRange, fullyLoaded, tile, tileState, x, y; @@ -286,7 +285,6 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame = continue; } - allTilesLoaded = false; fullyLoaded = tileGrid.forEachTileCoordParentTileRange( tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent); if (!fullyLoaded) { diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index 3c7f8c4d38..bddf5e0e97 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -115,7 +115,6 @@ ol.renderer.dom.TileLayer.prototype.renderFrame = var findLoadedTiles = goog.bind(tileSource.findLoadedTiles, tileSource, tilesToDrawByZ, getTileIfLoaded); - var allTilesLoaded = true; var tmpExtent = ol.extent.createEmpty(); var tmpTileRange = new ol.TileRange(0, 0, 0, 0); var childTileRange, fullyLoaded, tile, tileState, x, y; @@ -132,7 +131,6 @@ ol.renderer.dom.TileLayer.prototype.renderFrame = continue; } - allTilesLoaded = false; fullyLoaded = tileGrid.forEachTileCoordParentTileRange( tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent); if (!fullyLoaded) { diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index badca46ca5..068ba63b06 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -22,12 +22,6 @@ ol.renderer.Map = function(container, map) { goog.base(this); - /** - * @private - * @type {Element} - */ - this.container_ = container; - /** * @private * @type {ol.Map} diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js index ef66c43762..9b9d1e944a 100644 --- a/src/ol/renderer/webgl/webgllayerrenderer.js +++ b/src/ol/renderer/webgl/webgllayerrenderer.js @@ -109,7 +109,6 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer = if (!goog.isDef(this.framebufferDimension) || this.framebufferDimension != framebufferDimension) { - var map = this.getMap(); frameState.postRenderFunctions.push( goog.partial(function(gl, framebuffer, texture) { if (!gl.isContextLost()) { diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 9c471d2e09..099eabd46e 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -165,7 +165,6 @@ ol.renderer.webgl.Map = function(container, map) { * @return {number} Priority. */ goog.bind(function(element) { - var tile = /** @type {ol.Tile} */ (element[0]); var tileCenter = /** @type {ol.Coordinate} */ (element[1]); var tileResolution = /** @type {number} */ (element[2]); var deltaX = tileCenter[0] - this.focus_[0]; @@ -312,7 +311,6 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) { */ ol.renderer.webgl.Map.prototype.deleteBuffer = function(buf) { var gl = this.getGL(); - var arr = buf.getArray(); var bufferKey = goog.getUid(buf); goog.asserts.assert(bufferKey in this.bufferCache_); var bufferCacheEntry = this.bufferCache_[bufferKey]; @@ -359,7 +357,7 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() { */ ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) { var gl = this.getGL(); - var key, textureCacheEntry; + var textureCacheEntry; while (this.textureCache_.getCount() - this.textureCacheFrameMarkerCount_ > ol.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK) { textureCacheEntry = /** @type {?ol.renderer.webgl.TextureCacheEntry} */ @@ -546,7 +544,6 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) { this.textureCache_.set((-frameState.index).toString(), null); ++this.textureCacheFrameMarkerCount_; - var layerStates = frameState.layerStates; var layersArray = frameState.layersArray; var i, ii, layer, layerRenderer, layerState; for (i = 0, ii = layersArray.length; i < ii; ++i) { diff --git a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js index 71894d3c4d..a39f9fb4c3 100644 --- a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js +++ b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js @@ -6,7 +6,6 @@ describe('ol.renderer.webgl.ImageLayer', function() { var renderer; var canvasWidth; var canvasHeight; - var viewExtent; var viewResolution; var viewRotation; var viewCenter; From 20982bba319b92871ac7db9fcd06a927acce034b Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:48:55 +0200 Subject: [PATCH 06/13] Remove unused variables in sources --- src/ol/source/bingmapssource.js | 2 +- src/ol/source/tilejsonsource.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index 1684940a15..36cbc04294 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -64,7 +64,7 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = goog.asserts.assert(response.statusDescription == 'OK'); var brandLogoUri = response.brandLogoUri; - var copyright = response.copyright; + //var copyright = response.copyright; // FIXME do we need to display this? goog.asserts.assert(response.resourceSets.length == 1); var resourceSet = response.resourceSets[0]; goog.asserts.assert(resourceSet.resources.length == 1); diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js index 8e06720741..b31c833ba5 100644 --- a/src/ol/source/tilejsonsource.js +++ b/src/ol/source/tilejsonsource.js @@ -84,7 +84,6 @@ ol.source.TileJSON.prototype.handleTileJSONResponse = function() { this.setExtent(extent); } - var scheme = goog.isDef(tileJSON.scheme) || 'xyz'; if (goog.isDef(tileJSON.scheme)) { goog.asserts.assert(tileJSON.scheme == 'xyz'); } From 8b539cd4cce3b03f7802cebefae07ec66656d26f Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:49:12 +0200 Subject: [PATCH 07/13] Remove unused variables in sphere --- src/ol/sphere/sphere.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ol/sphere/sphere.js b/src/ol/sphere/sphere.js index 0b647d0b9f..825d843263 100644 --- a/src/ol/sphere/sphere.js +++ b/src/ol/sphere/sphere.js @@ -54,7 +54,6 @@ ol.Sphere.prototype.cosineDistance = function(c1, c2) { * @return {number} Cross-track distance. */ ol.Sphere.prototype.crossTrackDistance = function(c1, c2, c3) { - var d12 = this.cosineDistance(c1, c2); var d13 = this.cosineDistance(c1, c2); var theta12 = goog.math.toRadians(this.initialBearing(c1, c2)); var theta13 = goog.math.toRadians(this.initialBearing(c1, c3)); From f4d54ace1d9b24cb94c1ad218406d92b0c7c02bd Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:49:40 +0200 Subject: [PATCH 08/13] Remove unused variables in structs --- src/ol/structs/integerset.js | 1 - test/spec/ol/structs/integerset.test.js | 2 ++ test/spec/ol/structs/priorityqueue.test.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ol/structs/integerset.js b/src/ol/structs/integerset.js index 17967c57bc..17fc2ebc53 100644 --- a/src/ol/structs/integerset.js +++ b/src/ol/structs/integerset.js @@ -80,7 +80,6 @@ ol.structs.IntegerSet.prototype.compactRanges_ = function() { var arr = this.arr_; var n = arr.length; var rangeIndex = 0; - var lastRange = null; var i; for (i = 0; i < n; i += 2) { if (arr[i] == arr[i + 1]) { diff --git a/test/spec/ol/structs/integerset.test.js b/test/spec/ol/structs/integerset.test.js index 8cd1728b64..2fb7af18fa 100644 --- a/test/spec/ol/structs/integerset.test.js +++ b/test/spec/ol/structs/integerset.test.js @@ -26,12 +26,14 @@ describe('ol.structs.IntegerSet', function() { it('throws an exception with an odd number of elements', function() { expect(function() { var is = new ol.structs.IntegerSet([0, 2, 4]); + is = is; // suppress gjslint warning about unused variable }).to.throwException(); }); it('throws an exception with out-of-order elements', function() { expect(function() { var is = new ol.structs.IntegerSet([0, 2, 2, 4]); + is = is; // suppress gjslint warning about unused variable }).to.throwException(); }); diff --git a/test/spec/ol/structs/priorityqueue.test.js b/test/spec/ol/structs/priorityqueue.test.js index b80350294f..60e84e455b 100644 --- a/test/spec/ol/structs/priorityqueue.test.js +++ b/test/spec/ol/structs/priorityqueue.test.js @@ -82,7 +82,7 @@ describe('ol.structs.PriorityQueue', function() { pq = new ol.structs.PriorityQueue(function(element) { return Math.abs(element - target); }, goog.identityFunction); - var element, i; + var i; for (i = 0; i < 32; ++i) { pq.enqueue(Math.random()); } From 7046ebe261cebad5204cef4f6df7fe5cfc68f89d Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:52:30 +0200 Subject: [PATCH 09/13] Remove unused variables in tile range --- test/spec/ol/tilerange.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/spec/ol/tilerange.test.js b/test/spec/ol/tilerange.test.js index 671d867df2..2f6f1f3d71 100644 --- a/test/spec/ol/tilerange.test.js +++ b/test/spec/ol/tilerange.test.js @@ -63,6 +63,7 @@ describe('ol.TileRange', function() { var tileRange = new ol.TileRange.boundingTileRange( new ol.TileCoord(3, 1, 3), new ol.TileCoord(4, 2, 0)); + tileRange = tileRange; // suppress gjslint warning about unused variable }).to.throwException(); }); }); From 975e180b2647266ca5ac0c1ffd4f10cae27b4d1b Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:52:47 +0200 Subject: [PATCH 10/13] Fix typo in ol.style.Icon --- src/ol/style/icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/style/icon.js b/src/ol/style/icon.js index b5fc255d20..2be1658c24 100644 --- a/src/ol/style/icon.js +++ b/src/ol/style/icon.js @@ -138,7 +138,7 @@ ol.style.Icon.prototype.createLiteral = function(feature) { goog.asserts.assertNumber(opacity, 'opacity must be a number'); var rotation = - /** {@type {number} */ (this.opacity_.evaluate(feature, attrs)); + /** {@type {number} */ (this.rotation_.evaluate(feature, attrs)); goog.asserts.assertNumber(rotation, 'rotation must be a number'); return new ol.style.IconLiteral({ From e744a1b6e9308fdcaa125527db5aa2454fba8ea1 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 21 May 2013 12:53:04 +0200 Subject: [PATCH 11/13] Enable all gjslint errors --- build.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.py b/build.py index 7533eb1d38..6320677344 100755 --- a/build.py +++ b/build.py @@ -357,8 +357,11 @@ def build_lint_src_timestamp(t): path for path in ifind('externs', 'build/src/external/externs') if path.endswith('.js')] - t.run('%(GJSLINT)s', '--strict', '--limited_doc_files=%s' % - (','.join(limited_doc_files),), t.newer(t.dependencies)) + t.run('%(GJSLINT)s', + '--jslint_error=all', + '--limited_doc_files=%s' % (','.join(limited_doc_files),), + '--strict', + t.newer(t.dependencies)) t.touch() From c0cfc7872e9da6bc7a747c3722920415bf0d08f9 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 28 May 2013 16:03:32 +0200 Subject: [PATCH 12/13] Add missing semicolons --- test/spec/ol/filter/logicalfilter.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/spec/ol/filter/logicalfilter.test.js b/test/spec/ol/filter/logicalfilter.test.js index 970c0d0c10..847d43af3f 100644 --- a/test/spec/ol/filter/logicalfilter.test.js +++ b/test/spec/ol/filter/logicalfilter.test.js @@ -6,8 +6,8 @@ describe('ol.filter.Logical', function() { var OR = ol.filter.LogicalOperator.OR; var AND = ol.filter.LogicalOperator.AND; var NOT = ol.filter.LogicalOperator.NOT; - var include = new ol.filter.Filter(function() {return true}); - var exclude = new ol.filter.Filter(function() {return false}); + var include = new ol.filter.Filter(function() {return true;}); + var exclude = new ol.filter.Filter(function() {return false;}); var apple = new ol.Feature({}); var orange = new ol.Feature({}); From 11672db967b0336a8ae7504daef91f1f71e110ff Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 28 May 2013 16:07:48 +0200 Subject: [PATCH 13/13] Use === and !== for comparisons with 0 --- src/ol/geom/base.js | 2 +- src/ol/interaction/touchpaninteraction.js | 2 +- src/ol/map.js | 2 +- src/ol/mapbrowserevent.js | 2 +- src/ol/projection/projection.js | 2 +- src/ol/renderer/canvas/canvasmaprenderer.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/geom/base.js b/src/ol/geom/base.js index 24c2ee75fe..c2a9686ccb 100644 --- a/src/ol/geom/base.js +++ b/src/ol/geom/base.js @@ -28,7 +28,7 @@ ol.geom.squaredDistanceToSegment = function(coordinate, segment) { var v = segment[0]; var w = segment[1]; var l2 = ol.coordinate.squaredDistance(v, w); - if (l2 == 0) { + if (l2 === 0) { return ol.coordinate.squaredDistance(coordinate, v); } var t = ((coordinate[0] - v[0]) * (w[0] - v[0]) + diff --git a/src/ol/interaction/touchpaninteraction.js b/src/ol/interaction/touchpaninteraction.js index 08b8740ec4..9467b85a55 100644 --- a/src/ol/interaction/touchpaninteraction.js +++ b/src/ol/interaction/touchpaninteraction.js @@ -82,7 +82,7 @@ ol.interaction.TouchPan.prototype.handleTouchEnd = function(mapBrowserEvent) { var map = mapBrowserEvent.map; var view = map.getView(); - if (this.targetTouches.length == 0) { + if (this.targetTouches.length === 0) { var interacting = view.setHint(ol.ViewHint.INTERACTING, -1); if (!this.noKinetic_ && this.kinetic_ && this.kinetic_.end()) { var distance = this.kinetic_.getDistance(); diff --git a/src/ol/map.js b/src/ol/map.js index 95af4a7fe1..67496cea39 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -792,7 +792,7 @@ ol.Map.prototype.renderFrame_ = function(time) { var i, ii, view2DState; - if (this.freezeRenderingCount_ != 0) { + if (this.freezeRenderingCount_ !== 0) { return; } diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index 035178f538..e3518aea7e 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -209,7 +209,7 @@ ol.MapBrowserEventHandler.prototype.click_ = function(browserEvent) { if (!this.dragged_) { var newEvent; var type = browserEvent.type; - if (this.timestamp_ == 0 || type == goog.events.EventType.DBLCLICK) { + if (this.timestamp_ === 0 || type == goog.events.EventType.DBLCLICK) { newEvent = new ol.MapBrowserEvent( ol.MapBrowserEvent.EventType.DBLCLICK, this.map_, browserEvent); this.dispatchEvent(newEvent); diff --git a/src/ol/projection/projection.js b/src/ol/projection/projection.js index 19816b69c2..ede767e400 100644 --- a/src/ol/projection/projection.js +++ b/src/ol/projection/projection.js @@ -417,7 +417,7 @@ ol.projection.removeTransform = function(source, destination) { var transform = transforms[sourceCode][destinationCode]; delete transforms[sourceCode][destinationCode]; var keys = goog.object.getKeys(transforms[sourceCode]); - if (keys.length == 0) { + if (keys.length === 0) { delete transforms[sourceCode]; } return transform; diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index 4f233dc91a..74214b5557 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -132,7 +132,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) { // for performance reasons, context.setTransform is only used // when the view is rotated. see http://jsperf.com/canvas-transform - if (frameState.view2DState.rotation == 0) { + if (frameState.view2DState.rotation === 0) { var dx = goog.vec.Mat4.getElement(transform, 0, 3); var dy = goog.vec.Mat4.getElement(transform, 1, 3); var dw = image.width * goog.vec.Mat4.getElement(transform, 0, 0);