Merge pull request #364 from bbinet/fix-check-requires

Fix check for unused goog.require directives

build.py

@@ -298,7 +298,10 @@ def build_check_requires_timestamp(t):
             if m:
                 require_linenos[m.group(1)] = lineno
                 continue
-        for lineno, line in _strip_comments(lines):
+        ignore_linenos = require_linenos.values()
+        for lineno, line in enumerate(lines):
+            if lineno in ignore_linenos:
+                continue
             for require in require_linenos.iterkeys():
                 if require in line:
                     uses.add(require)

examples/epsg-4326.js

@@ -6,7 +6,6 @@ goog.require('ol.control.ScaleLine');
 goog.require('ol.control.ScaleLineUnits');
 goog.require('ol.control.defaults');
 goog.require('ol.layer.TileLayer');
-goog.require('ol.projection');
 goog.require('ol.source.TiledWMS');
 
 

examples/full-screen.js

@@ -2,7 +2,6 @@ goog.require('ol.Coordinate');
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.control.defaults');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.source.MapQuestOpenAerial');
 

examples/mouse-position.js

@@ -5,7 +5,6 @@ goog.require('ol.View2D');
 goog.require('ol.control.MousePosition');
 goog.require('ol.control.defaults');
 goog.require('ol.layer.TileLayer');
-goog.require('ol.projection');
 goog.require('ol.source.OpenStreetMap');
 
 

examples/side-by-side.js

@@ -3,8 +3,6 @@ goog.require('ol.Coordinate');
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.animation');
-goog.require('ol.easing');
 goog.require('ol.interaction.Keyboard');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.projection');

examples/style-rules.js

@@ -1,13 +1,11 @@
 goog.require('ol.Collection');
 goog.require('ol.Coordinate');
 goog.require('ol.Expression');
-goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.control.defaults');
 goog.require('ol.filter.Filter');
-goog.require('ol.geom.LineString');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GeoJSON');
 goog.require('ol.projection');

examples/vector-layer.js

@@ -1,11 +1,8 @@
 goog.require('ol.Collection');
 goog.require('ol.Coordinate');
-goog.require('ol.Feature');
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.geom.LineString');
-goog.require('ol.geom.Point');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GeoJSON');

src/ol/renderer/canvas/canvasvectorrenderer.js

@@ -2,11 +2,9 @@ goog.provide('ol.renderer.canvas.VectorRenderer');
 
 
 goog.require('goog.asserts');
-goog.require('goog.net.ImageLoader');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Feature');
 goog.require('ol.Pixel');
-goog.require('ol.canvas');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.LineString');

src/ol/source/vectorsource.js

@@ -1,15 +1,5 @@
 goog.provide('ol.source.Vector');
 
-goog.require('ol.Attribution');
-goog.require('ol.Extent');
-goog.require('ol.Feature');
-goog.require('ol.Projection');
-goog.require('ol.filter.Extent');
-goog.require('ol.filter.Filter');
-goog.require('ol.filter.Geometry');
-goog.require('ol.filter.Logical');
-goog.require('ol.filter.LogicalOperator');
-goog.require('ol.geom.GeometryType');
 goog.require('ol.source.Source');
 
 

src/ol/source/wmtssource.js

@@ -2,8 +2,6 @@ goog.provide('ol.source.WMTS');
 goog.provide('ol.source.WMTSRequestEncoding');
 
 goog.require('ol.Attribution');
-goog.require('ol.Extent');
-goog.require('ol.Projection');
 goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.TileUrlFunctionType');

test/spec/ol/layer/vectorlayer.test.js

@@ -179,7 +179,6 @@ describe('ol.layer.Vector', function() {
 goog.require('ol.Expression');
 goog.require('ol.Extent');
 goog.require('ol.Feature');
-goog.require('ol.Projection');
 goog.require('ol.filter.Extent');
 goog.require('ol.filter.Geometry');
 goog.require('ol.filter.Logical');

test/spec/ol/renderer/webgl/imagelayer.test.js

@@ -80,9 +80,7 @@ goog.require('goog.vec.Mat4');
 goog.require('goog.vec.Vec4');
 goog.require('ol.Coordinate');
 goog.require('ol.Extent');
-goog.require('ol.Image');
 goog.require('ol.Map');
 goog.require('ol.layer.ImageLayer');
 goog.require('ol.source.ImageSource');
-goog.require('ol.renderer.Map');
 goog.require('ol.renderer.webgl.ImageLayer');

test/spec/ol/source/xyz.test.js

@@ -129,6 +129,5 @@ describe('ol.source.XYZ', function() {
 
 goog.require('ol.Coordinate');
 goog.require('ol.TileCoord');
-goog.require('ol.TileUrlFunction');
 goog.require('ol.tilegrid.XYZ');
 goog.require('ol.source.XYZ');