From 7d5cc3955578d53a8c0aaaa754ea59f73563ac5d Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 29 Jan 2013 13:05:56 +0100 Subject: [PATCH 1/7] Detect unused goog.requires --- .gitignore | 1 + build.py | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 26c170bec9..4ba6e46ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.pyc /bin/plovr*.jar /build/gh-pages +/build/check-requires-timestamp /build/jsdoc-*-timestamp /build/lint-spec-timestamp /build/lint-src-timestamp diff --git a/build.py b/build.py index 5dca545c20..afe527441b 100755 --- a/build.py +++ b/build.py @@ -187,7 +187,7 @@ def serve_precommit(t): t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'build/ol-all.json') -virtual('lint', 'build/lint-src-timestamp', 'build/lint-spec-timestamp') +virtual('lint', 'build/lint-src-timestamp', 'build/lint-spec-timestamp', 'build/check-requires-timestamp') @target('build/lint-src-timestamp', SRC, INTERNAL_SRC, EXTERNAL_SRC, EXAMPLES_SRC) @@ -199,6 +199,32 @@ def build_lint_src_timestamp(t): t.touch() +@target('build/check-requires-timestamp', SRC, INTERNAL_SRC, EXTERNAL_SRC, EXAMPLES_SRC) +def build_check_requires_timestamp(t): + count = 0 + for filename in sorted(t.dependencies): + if filename == 'build/src/internal/src/requireall.js': + continue + require_linenos = {} + uses = set() + lineno = 0 + for line in open(filename): + lineno += 1 + m = re.match(r'goog.require\(\'(.*)\'\);', line) + if m: + require_linenos[m.group(1)] = lineno + continue + for require in require_linenos.iterkeys(): + if require in line: + uses.add(require) + for require in sorted(set(require_linenos.keys()) - uses): + t.info('%s:%d: unused goog.require %r' % (filename, require_linenos[require], require)) + count += 1 + if count: + t.error('%d unused goog.requires' % (count,)) + t.touch() + + @target('build/lint-spec-timestamp', SPEC) def build_lint_spec_timestamp(t): t.run('%(GJSLINT)s', t.newer(SPEC)) From b6f856f962b596e8460bd11ee48a3a8ab62446b2 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 29 Jan 2013 13:06:36 +0100 Subject: [PATCH 2/7] Remove unused goog.requires --- src/ol/collection.js | 1 - src/ol/control/mousepositioncontrol.js | 1 - src/ol/control/zoomcontrol.js | 1 - src/ol/framestate.js | 1 - src/ol/imagetile.js | 1 - src/ol/interaction/draginteraction.js | 2 -- src/ol/interaction/dragpaninteraction.js | 1 - src/ol/interaction/dragrotateandzoominteraction.js | 1 - src/ol/interaction/dragrotateinteraction.js | 1 - src/ol/interaction/dragzoominteraction.js | 1 - src/ol/interaction/keyboardzoominteraction.js | 1 - src/ol/interaction/mousewheelzoominteraction.js | 1 - src/ol/iview2d.js | 1 - src/ol/map.js | 8 -------- src/ol/renderer/canvas/canvastilelayerrenderer.js | 2 -- src/ol/renderer/dom/domlayerrenderer.js | 1 - src/ol/renderer/dom/dommaprenderer.js | 4 ---- src/ol/renderer/dom/domtilelayerrenderer.js | 3 --- src/ol/renderer/maprenderer.js | 2 -- src/ol/renderer/webgl/webglmaprenderer.js | 3 --- src/ol/renderer/webgl/webgltilelayerrenderer.js | 3 --- src/ol/source/bingmapssource.js | 2 -- src/ol/source/source.js | 1 - src/ol/source/tiledwmssource.js | 3 --- src/ol/source/tilejsonsource.js | 2 -- src/ol/source/tilesource.js | 2 -- src/ol/source/xyzsource.js | 2 -- src/ol/tile.js | 1 - src/ol/tilecache.js | 1 - src/ol/view.js | 2 -- 30 files changed, 56 deletions(-) diff --git a/src/ol/collection.js b/src/ol/collection.js index cce5dc87cd..f1de3a535e 100644 --- a/src/ol/collection.js +++ b/src/ol/collection.js @@ -9,7 +9,6 @@ goog.provide('ol.CollectionEvent'); goog.provide('ol.CollectionEventType'); goog.require('goog.array'); -goog.require('goog.asserts'); goog.require('goog.events.Event'); goog.require('ol.Object'); diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js index a20c25a1cd..15b4fdc083 100644 --- a/src/ol/control/mousepositioncontrol.js +++ b/src/ol/control/mousepositioncontrol.js @@ -8,7 +8,6 @@ goog.require('goog.dom'); goog.require('goog.events'); goog.require('goog.events.EventType'); goog.require('goog.style'); -goog.require('ol.Object'); goog.require('ol.Pixel'); goog.require('ol.Projection'); goog.require('ol.TransformFunction'); diff --git a/src/ol/control/zoomcontrol.js b/src/ol/control/zoomcontrol.js index 96c83d703d..6d99bbd80f 100644 --- a/src/ol/control/zoomcontrol.js +++ b/src/ol/control/zoomcontrol.js @@ -7,7 +7,6 @@ goog.require('goog.dom.TagName'); goog.require('goog.events'); goog.require('goog.events.EventType'); goog.require('ol.BrowserFeature'); -goog.require('ol.Projection'); goog.require('ol.control.Control'); diff --git a/src/ol/framestate.js b/src/ol/framestate.js index 6f06b5fff6..d46b2707d8 100644 --- a/src/ol/framestate.js +++ b/src/ol/framestate.js @@ -7,7 +7,6 @@ goog.provide('ol.PreRenderFunction'); goog.require('goog.vec.Mat4'); goog.require('ol.Color'); -goog.require('ol.Coordinate'); goog.require('ol.Extent'); goog.require('ol.Size'); goog.require('ol.TileQueue'); diff --git a/src/ol/imagetile.js b/src/ol/imagetile.js index 12255034e3..3d3a972385 100644 --- a/src/ol/imagetile.js +++ b/src/ol/imagetile.js @@ -2,7 +2,6 @@ goog.provide('ol.ImageTile'); goog.require('goog.array'); goog.require('goog.events'); -goog.require('goog.events.EventTarget'); goog.require('goog.events.EventType'); goog.require('ol.Tile'); goog.require('ol.TileCoord'); diff --git a/src/ol/interaction/draginteraction.js b/src/ol/interaction/draginteraction.js index 1d525bae7d..efbb23214e 100644 --- a/src/ol/interaction/draginteraction.js +++ b/src/ol/interaction/draginteraction.js @@ -1,8 +1,6 @@ - goog.provide('ol.interaction.Drag'); goog.require('goog.asserts'); -goog.require('goog.events.EventType'); goog.require('goog.functions'); goog.require('ol.Coordinate'); goog.require('ol.MapBrowserEvent'); diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js index 5c516d62ff..5bfbbf3bcb 100644 --- a/src/ol/interaction/dragpaninteraction.js +++ b/src/ol/interaction/dragpaninteraction.js @@ -4,7 +4,6 @@ goog.provide('ol.interaction.DragPan'); goog.require('goog.asserts'); goog.require('ol.Coordinate'); -goog.require('ol.MapBrowserEvent'); goog.require('ol.View2D'); goog.require('ol.ViewHint'); goog.require('ol.interaction.ConditionType'); diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js index 314ee9227f..95df6f5320 100644 --- a/src/ol/interaction/dragrotateandzoominteraction.js +++ b/src/ol/interaction/dragrotateandzoominteraction.js @@ -3,7 +3,6 @@ goog.provide('ol.interaction.DragRotateAndZoom'); goog.require('goog.math.Vec2'); -goog.require('ol.MapBrowserEvent'); goog.require('ol.View2D'); goog.require('ol.interaction.ConditionType'); goog.require('ol.interaction.Drag'); diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index 2b6e12bbbb..f951f6fd2c 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -1,6 +1,5 @@ goog.provide('ol.interaction.DragRotate'); -goog.require('ol.MapBrowserEvent'); goog.require('ol.View2D'); goog.require('ol.interaction.ConditionType'); goog.require('ol.interaction.Drag'); diff --git a/src/ol/interaction/dragzoominteraction.js b/src/ol/interaction/dragzoominteraction.js index a64437acda..b83f762f7f 100644 --- a/src/ol/interaction/dragzoominteraction.js +++ b/src/ol/interaction/dragzoominteraction.js @@ -4,7 +4,6 @@ goog.provide('ol.interaction.DragZoom'); goog.require('ol.Extent'); -goog.require('ol.MapBrowserEvent'); goog.require('ol.control.DragBox'); goog.require('ol.interaction.ConditionType'); goog.require('ol.interaction.Drag'); diff --git a/src/ol/interaction/keyboardzoominteraction.js b/src/ol/interaction/keyboardzoominteraction.js index 9252cc652c..563827ab45 100644 --- a/src/ol/interaction/keyboardzoominteraction.js +++ b/src/ol/interaction/keyboardzoominteraction.js @@ -2,7 +2,6 @@ goog.provide('ol.interaction.KeyboardZoom'); -goog.require('goog.events.KeyCodes'); goog.require('goog.events.KeyHandler.EventType'); goog.require('ol.View2D'); goog.require('ol.interaction.Interaction'); diff --git a/src/ol/interaction/mousewheelzoominteraction.js b/src/ol/interaction/mousewheelzoominteraction.js index 7e3c1769ac..e04862d203 100644 --- a/src/ol/interaction/mousewheelzoominteraction.js +++ b/src/ol/interaction/mousewheelzoominteraction.js @@ -4,7 +4,6 @@ goog.provide('ol.interaction.MouseWheelZoom'); goog.require('goog.events.MouseWheelEvent'); goog.require('goog.events.MouseWheelHandler.EventType'); -goog.require('ol.MapBrowserEvent'); goog.require('ol.View2D'); diff --git a/src/ol/iview2d.js b/src/ol/iview2d.js index e8dcb0c4db..ad1d28f564 100644 --- a/src/ol/iview2d.js +++ b/src/ol/iview2d.js @@ -2,7 +2,6 @@ goog.provide('ol.IView2D'); goog.provide('ol.View2DState'); goog.require('ol.Coordinate'); -goog.require('ol.Extent'); goog.require('ol.Projection'); diff --git a/src/ol/map.js b/src/ol/map.js index 22609eb4a6..fa503b41c4 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -10,7 +10,6 @@ goog.provide('ol.RendererHints'); goog.require('goog.Uri.QueryData'); goog.require('goog.async.AnimationDelay'); goog.require('goog.debug.Logger'); -goog.require('goog.dispose'); goog.require('goog.dom'); goog.require('goog.dom.ViewportSizeMonitor'); goog.require('goog.events'); @@ -19,10 +18,8 @@ goog.require('goog.events.Event'); goog.require('goog.events.EventType'); goog.require('goog.events.KeyHandler'); goog.require('goog.events.KeyHandler.EventType'); -goog.require('goog.events.MouseWheelEvent'); goog.require('goog.events.MouseWheelHandler'); goog.require('goog.events.MouseWheelHandler.EventType'); -goog.require('goog.object'); goog.require('ol.BrowserFeature'); goog.require('ol.Collection'); goog.require('ol.Color'); @@ -33,14 +30,10 @@ goog.require('ol.Kinetic'); goog.require('ol.MapBrowserEvent'); goog.require('ol.Object'); goog.require('ol.Pixel'); -goog.require('ol.ResolutionConstraint'); -goog.require('ol.RotationConstraint'); goog.require('ol.Size'); goog.require('ol.TileQueue'); -goog.require('ol.TransformFunction'); goog.require('ol.View'); goog.require('ol.View2D'); -goog.require('ol.View2DState'); goog.require('ol.control.Attribution'); goog.require('ol.control.Zoom'); goog.require('ol.interaction.DblClickZoom'); @@ -52,7 +45,6 @@ goog.require('ol.interaction.KeyboardPan'); goog.require('ol.interaction.KeyboardZoom'); goog.require('ol.interaction.MouseWheelZoom'); goog.require('ol.interaction.condition'); -goog.require('ol.renderer.Layer'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.canvas'); goog.require('ol.renderer.canvas.Map'); diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index de1008c364..eed606076a 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -6,10 +6,8 @@ goog.provide('ol.renderer.canvas.TileLayer'); goog.require('goog.array'); goog.require('goog.dom'); -goog.require('goog.style'); goog.require('goog.vec.Mat4'); goog.require('ol.Size'); -goog.require('ol.TileRange'); goog.require('ol.layer.TileLayer'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.canvas.Layer'); diff --git a/src/ol/renderer/dom/domlayerrenderer.js b/src/ol/renderer/dom/domlayerrenderer.js index 5a39813363..7b59b1e7be 100644 --- a/src/ol/renderer/dom/domlayerrenderer.js +++ b/src/ol/renderer/dom/domlayerrenderer.js @@ -1,6 +1,5 @@ goog.provide('ol.renderer.dom.Layer'); -goog.require('ol.Coordinate'); goog.require('ol.layer.Layer'); goog.require('ol.renderer.Layer'); diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/dommaprenderer.js index fd6bfc75b8..18700d9b25 100644 --- a/src/ol/renderer/dom/dommaprenderer.js +++ b/src/ol/renderer/dom/dommaprenderer.js @@ -4,11 +4,7 @@ goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); -goog.require('goog.events'); -goog.require('goog.events.Event'); goog.require('goog.style'); -goog.require('ol.Coordinate'); -goog.require('ol.FrameState'); goog.require('ol.layer.TileLayer'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.dom.TileLayer'); diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index 5a87a865c6..8630803ef3 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -5,14 +5,11 @@ goog.provide('ol.renderer.dom.TileLayer'); goog.require('goog.asserts'); goog.require('goog.dom'); -goog.require('goog.math.Vec2'); goog.require('goog.style'); goog.require('goog.vec.Mat4'); goog.require('ol.Coordinate'); goog.require('ol.Extent'); -goog.require('ol.Size'); goog.require('ol.TileCoord'); -goog.require('ol.TileRange'); goog.require('ol.TileState'); goog.require('ol.ViewHint'); goog.require('ol.dom'); diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index fbd45224bf..f44f0c90d3 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -7,8 +7,6 @@ goog.require('goog.events'); goog.require('goog.functions'); goog.require('goog.vec.Mat4'); goog.require('ol.FrameState'); -goog.require('ol.View2D'); -goog.require('ol.View2DProperty'); diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 6c657fb0f5..f1b70b910e 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -5,16 +5,13 @@ goog.provide('ol.renderer.webgl.map.shader'); goog.require('goog.array'); goog.require('goog.debug.Logger'); -goog.require('goog.dispose'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); goog.require('goog.events'); goog.require('goog.events.Event'); -goog.require('goog.events.EventType'); goog.require('goog.style'); goog.require('goog.webgl'); goog.require('ol.Tile'); -goog.require('ol.layer.Layer'); goog.require('ol.layer.TileLayer'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.webgl.FragmentShader'); diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index fd4e0842e2..a2324dcfea 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -7,14 +7,11 @@ goog.provide('ol.renderer.webgl.tilelayerrenderer.shader.Fragment'); goog.provide('ol.renderer.webgl.tilelayerrenderer.shader.Vertex'); goog.require('goog.array'); -goog.require('goog.asserts'); -goog.require('goog.events.EventType'); goog.require('goog.object'); goog.require('goog.structs.PriorityQueue'); goog.require('goog.vec.Mat4'); goog.require('goog.vec.Vec4'); goog.require('goog.webgl'); -goog.require('ol.Coordinate'); goog.require('ol.FrameState'); goog.require('ol.Size'); goog.require('ol.TileState'); diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index ed89f2363c..bd4bca3ea3 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -3,8 +3,6 @@ goog.provide('ol.source.BingMaps'); goog.require('goog.Uri'); goog.require('goog.array'); -goog.require('goog.events'); -goog.require('goog.events.EventType'); goog.require('goog.net.Jsonp'); goog.require('ol.TileRange'); goog.require('ol.source.ImageTileSource'); diff --git a/src/ol/source/source.js b/src/ol/source/source.js index 727c732789..c56ec4d257 100644 --- a/src/ol/source/source.js +++ b/src/ol/source/source.js @@ -6,7 +6,6 @@ goog.require('goog.functions'); goog.require('ol.Attribution'); goog.require('ol.Extent'); goog.require('ol.Projection'); -goog.require('ol.TileUrlFunction'); /** diff --git a/src/ol/source/tiledwmssource.js b/src/ol/source/tiledwmssource.js index 41c5024327..75e420529e 100644 --- a/src/ol/source/tiledwmssource.js +++ b/src/ol/source/tiledwmssource.js @@ -4,15 +4,12 @@ goog.provide('ol.source.TiledWMS'); goog.require('goog.array'); -goog.require('goog.asserts'); goog.require('goog.object'); goog.require('goog.uri.utils'); -goog.require('ol.Attribution'); goog.require('ol.Projection'); goog.require('ol.TileCoord'); goog.require('ol.TileUrlFunction'); goog.require('ol.source.ImageTileSource'); -goog.require('ol.tilegrid.TileGrid'); diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js index af306b0d26..71435aac3d 100644 --- a/src/ol/source/tilejsonsource.js +++ b/src/ol/source/tilejsonsource.js @@ -10,9 +10,7 @@ goog.provide('ol.source.TileJSON'); goog.provide('ol.tilejson'); goog.require('goog.asserts'); -goog.require('goog.events.EventType'); goog.require('goog.net.jsloader'); -goog.require('goog.string'); goog.require('ol.Projection'); goog.require('ol.TileUrlFunction'); goog.require('ol.source.ImageTileSource'); diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js index cff0556921..b3653e6c67 100644 --- a/src/ol/source/tilesource.js +++ b/src/ol/source/tilesource.js @@ -7,8 +7,6 @@ goog.require('ol.Extent'); goog.require('ol.Projection'); goog.require('ol.Tile'); goog.require('ol.TileCoord'); -goog.require('ol.TileUrlFunction'); -goog.require('ol.TileUrlFunctionType'); goog.require('ol.source.Source'); goog.require('ol.tilegrid.TileGrid'); diff --git a/src/ol/source/xyzsource.js b/src/ol/source/xyzsource.js index 0758d99f89..106eed9334 100644 --- a/src/ol/source/xyzsource.js +++ b/src/ol/source/xyzsource.js @@ -5,9 +5,7 @@ goog.provide('ol.source.XYZOptions'); goog.require('goog.math'); goog.require('ol.Attribution'); -goog.require('ol.Coordinate'); goog.require('ol.Projection'); -goog.require('ol.Size'); goog.require('ol.TileCoord'); goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunctionType'); diff --git a/src/ol/tile.js b/src/ol/tile.js index 180a712065..c9cf6bed73 100644 --- a/src/ol/tile.js +++ b/src/ol/tile.js @@ -1,7 +1,6 @@ goog.provide('ol.Tile'); goog.provide('ol.TileState'); -goog.require('goog.array'); goog.require('goog.events'); goog.require('goog.events.EventTarget'); goog.require('goog.events.EventType'); diff --git a/src/ol/tilecache.js b/src/ol/tilecache.js index 9645fb9513..2972766682 100644 --- a/src/ol/tilecache.js +++ b/src/ol/tilecache.js @@ -1,6 +1,5 @@ goog.provide('ol.TileCache'); -goog.require('goog.dispose'); goog.require('ol.Tile'); goog.require('ol.TileRange'); goog.require('ol.structs.LinkedMap'); diff --git a/src/ol/view.js b/src/ol/view.js index f69302fc98..871928073e 100644 --- a/src/ol/view.js +++ b/src/ol/view.js @@ -3,8 +3,6 @@ goog.provide('ol.ViewHint'); goog.require('goog.array'); goog.require('ol.IView'); -goog.require('ol.IView2D'); -goog.require('ol.IView3D'); goog.require('ol.Object'); From 6e247d9331156d0b88457d276782e486f5bbcad2 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 29 Jan 2013 15:42:23 +0100 Subject: [PATCH 3/7] Rename modules for support detection --- src/ol/map.js | 6 +++--- src/ol/renderer/canvas/canvasrenderer.js | 2 +- src/ol/renderer/dom/domrenderer.js | 2 +- src/ol/renderer/webgl/webglrenderer.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/map.js b/src/ol/map.js index fa503b41c4..05585dc90a 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -46,12 +46,12 @@ goog.require('ol.interaction.KeyboardZoom'); goog.require('ol.interaction.MouseWheelZoom'); goog.require('ol.interaction.condition'); goog.require('ol.renderer.Map'); -goog.require('ol.renderer.canvas'); goog.require('ol.renderer.canvas.Map'); -goog.require('ol.renderer.dom'); +goog.require('ol.renderer.canvas.isSupported'); goog.require('ol.renderer.dom.Map'); -goog.require('ol.renderer.webgl'); +goog.require('ol.renderer.dom.isSupported'); goog.require('ol.renderer.webgl.Map'); +goog.require('ol.renderer.webgl.isSupported'); /** diff --git a/src/ol/renderer/canvas/canvasrenderer.js b/src/ol/renderer/canvas/canvasrenderer.js index f28861dcdc..85dc1d77a1 100644 --- a/src/ol/renderer/canvas/canvasrenderer.js +++ b/src/ol/renderer/canvas/canvasrenderer.js @@ -1,4 +1,4 @@ -goog.provide('ol.renderer.canvas'); +goog.provide('ol.renderer.canvas.isSupported'); goog.require('ol.canvas'); diff --git a/src/ol/renderer/dom/domrenderer.js b/src/ol/renderer/dom/domrenderer.js index 9577660298..1d32334bfa 100644 --- a/src/ol/renderer/dom/domrenderer.js +++ b/src/ol/renderer/dom/domrenderer.js @@ -1,4 +1,4 @@ -goog.provide('ol.renderer.dom'); +goog.provide('ol.renderer.dom.isSupported'); goog.require('goog.functions'); diff --git a/src/ol/renderer/webgl/webglrenderer.js b/src/ol/renderer/webgl/webglrenderer.js index d7ba243f8f..cf12c2ed7d 100644 --- a/src/ol/renderer/webgl/webglrenderer.js +++ b/src/ol/renderer/webgl/webglrenderer.js @@ -1,4 +1,4 @@ -goog.provide('ol.renderer.webgl'); +goog.provide('ol.renderer.webgl.isSupported'); goog.require('ol.webgl'); From c9e8a92265a3667a8ae312604e9bce9eda43fb08 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 29 Jan 2013 15:38:42 +0100 Subject: [PATCH 4/7] Detect missing goog.requires --- build.py | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/build.py b/build.py index afe527441b..d0252c07b8 100755 --- a/build.py +++ b/build.py @@ -201,7 +201,8 @@ def build_lint_src_timestamp(t): @target('build/check-requires-timestamp', SRC, INTERNAL_SRC, EXTERNAL_SRC, EXAMPLES_SRC) def build_check_requires_timestamp(t): - count = 0 + unused_count = 0 + all_provides = set() for filename in sorted(t.dependencies): if filename == 'build/src/internal/src/requireall.js': continue @@ -210,6 +211,10 @@ def build_check_requires_timestamp(t): lineno = 0 for line in open(filename): lineno += 1 + m = re.match(r'goog.provide\(\'(.*)\'\);', line) + if m: + all_provides.add(m.group(1)) + continue m = re.match(r'goog.require\(\'(.*)\'\);', line) if m: require_linenos[m.group(1)] = lineno @@ -218,10 +223,45 @@ def build_check_requires_timestamp(t): if require in line: uses.add(require) for require in sorted(set(require_linenos.keys()) - uses): - t.info('%s:%d: unused goog.require %r' % (filename, require_linenos[require], require)) - count += 1 - if count: - t.error('%d unused goog.requires' % (count,)) + t.info('%s:%d: unused goog.require: %r' % (filename, require_linenos[require], require)) + unused_count += 1 + all_provides.discard('ol') + all_provides.discard('ol.Map') + all_provides.discard('ol.MapProperty') + provide_res = dict((provide, re.compile(r'\b%s\b' % (re.escape(provide)),)) for provide in all_provides) + missing_count = 0 + for filename in sorted(t.dependencies): + if filename in INTERNAL_SRC or filename in EXTERNAL_SRC: + continue + provides = set() + requires = set() + uses = set() + lineno = 0 + for line in open(filename): + lineno += 1 + m = re.match(r'goog.provide\(\'(.*)\'\);', line) + if m: + provides.add(m.group(1)) + continue + m = re.match(r'goog.require\(\'(.*)\'\);', line) + if m: + requires.add(m.group(1)) + continue + for provide, provide_re in provide_res.iteritems(): + if provide_re.search(line): + uses.add(provide) + if filename == 'src/ol/renderer/layerrenderer.js': + uses.discard('ol.renderer.Map') + m = re.match(r'src/ol/renderer/(\w+)/\1(\w*)layerrenderer\.js\Z', filename) + if m: + uses.discard('ol.renderer.Map') + uses.discard('ol.renderer.%s.Map' % (m.group(1),)) + missing_requires = uses - requires - provides + if missing_requires: + t.info('%s: missing goog.requires: %s', filename, ', '.join(sorted(missing_requires))) + missing_count += len(missing_requires) + if unused_count or missing_count: + t.error('%d unused goog.requires, %d missing goog.requires' % (unused_count, missing_count)) t.touch() From e6eb401e360ea95851a9f27514f0e39a1efeba39 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 29 Jan 2013 15:42:52 +0100 Subject: [PATCH 5/7] Add missing goog.requires --- src/ol/animation.js | 2 +- src/ol/attribution.js | 2 ++ src/ol/control/attributioncontrol.js | 4 ++++ src/ol/control/dragboxcontrol.js | 4 ++++ src/ol/control/mousepositioncontrol.js | 3 +++ src/ol/framestate.js | 1 + src/ol/interaction/draginteraction.js | 1 + src/ol/interaction/dragzoominteraction.js | 2 ++ src/ol/interaction/keyboardpaninteraction.js | 1 + src/ol/interaction/mousewheelzoominteraction.js | 1 + src/ol/map.js | 13 +++++++++++++ src/ol/renderer/canvas/canvaslayerrenderer.js | 1 + src/ol/renderer/canvas/canvastilelayerrenderer.js | 3 +++ src/ol/renderer/dom/domtilelayerrenderer.js | 2 ++ src/ol/renderer/layerrenderer.js | 1 + src/ol/renderer/maprenderer.js | 5 +++++ src/ol/renderer/webgl/webglmaprenderer.js | 2 ++ src/ol/renderer/webgl/webgltilelayerrenderer.js | 4 ++++ src/ol/source/bingmapssource.js | 6 ++++++ src/ol/source/debugtilesource.js | 1 + src/ol/source/imagetilesource.js | 1 + src/ol/source/openstreetmapsource.js | 1 + src/ol/source/stamensource.js | 1 + src/ol/source/tiledwmssource.js | 1 + src/ol/source/tilejsonsource.js | 6 +++++- src/ol/source/tilesource.js | 1 + src/ol/source/xyzsource.js | 1 + src/ol/tilegrid/tilegrid.js | 1 + src/ol/view2d.js | 2 ++ 29 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/ol/animation.js b/src/ol/animation.js index 958817aa2e..feccd87f06 100644 --- a/src/ol/animation.js +++ b/src/ol/animation.js @@ -1,10 +1,10 @@ // FIXME works for View2D only -// FIXME dependency on ol.View2D suppressed to prevent dependency loop goog.provide('ol.animation'); goog.require('goog.fx.easing'); goog.require('ol.PreRenderFunction'); +goog.require('ol.ViewHint'); goog.require('ol.easing'); diff --git a/src/ol/attribution.js b/src/ol/attribution.js index 4b4c8886e2..cc353c36df 100644 --- a/src/ol/attribution.js +++ b/src/ol/attribution.js @@ -1,5 +1,7 @@ goog.provide('ol.Attribution'); +goog.require('ol.TileRange'); + /** diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attributioncontrol.js index e8da8080b8..d6f707ea56 100644 --- a/src/ol/control/attributioncontrol.js +++ b/src/ol/control/attributioncontrol.js @@ -8,8 +8,12 @@ goog.require('goog.dom.TagName'); goog.require('goog.events'); goog.require('goog.object'); goog.require('goog.style'); +goog.require('ol.Attribution'); +goog.require('ol.MapEvent'); goog.require('ol.MapEventType'); +goog.require('ol.TileRange'); goog.require('ol.control.Control'); +goog.require('ol.source.TileSource'); diff --git a/src/ol/control/dragboxcontrol.js b/src/ol/control/dragboxcontrol.js index abe92d5e4d..5fcbc51596 100644 --- a/src/ol/control/dragboxcontrol.js +++ b/src/ol/control/dragboxcontrol.js @@ -5,6 +5,10 @@ goog.require('goog.dom'); goog.require('goog.dom.TagName'); goog.require('goog.events'); goog.require('goog.style'); +goog.require('ol.Coordinate'); +goog.require('ol.MapBrowserEvent'); +goog.require('ol.MapBrowserEvent.EventType'); +goog.require('ol.Pixel'); goog.require('ol.Size'); goog.require('ol.control.Control'); diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js index 15b4fdc083..a34d470c7c 100644 --- a/src/ol/control/mousepositioncontrol.js +++ b/src/ol/control/mousepositioncontrol.js @@ -8,6 +8,9 @@ goog.require('goog.dom'); goog.require('goog.events'); goog.require('goog.events.EventType'); goog.require('goog.style'); +goog.require('ol.CoordinateFormatType'); +goog.require('ol.MapEvent'); +goog.require('ol.MapEventType'); goog.require('ol.Pixel'); goog.require('ol.Projection'); goog.require('ol.TransformFunction'); diff --git a/src/ol/framestate.js b/src/ol/framestate.js index d46b2707d8..bbe89d10a0 100644 --- a/src/ol/framestate.js +++ b/src/ol/framestate.js @@ -12,6 +12,7 @@ goog.require('ol.Size'); goog.require('ol.TileQueue'); goog.require('ol.TileRange'); goog.require('ol.View2DState'); +goog.require('ol.layer.Layer'); goog.require('ol.layer.LayerState'); diff --git a/src/ol/interaction/draginteraction.js b/src/ol/interaction/draginteraction.js index efbb23214e..ce39c4f9d3 100644 --- a/src/ol/interaction/draginteraction.js +++ b/src/ol/interaction/draginteraction.js @@ -4,6 +4,7 @@ goog.require('goog.asserts'); goog.require('goog.functions'); goog.require('ol.Coordinate'); goog.require('ol.MapBrowserEvent'); +goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.interaction.Interaction'); diff --git a/src/ol/interaction/dragzoominteraction.js b/src/ol/interaction/dragzoominteraction.js index b83f762f7f..74541b4bab 100644 --- a/src/ol/interaction/dragzoominteraction.js +++ b/src/ol/interaction/dragzoominteraction.js @@ -4,6 +4,8 @@ goog.provide('ol.interaction.DragZoom'); goog.require('ol.Extent'); +goog.require('ol.Size'); +goog.require('ol.View2D'); goog.require('ol.control.DragBox'); goog.require('ol.interaction.ConditionType'); goog.require('ol.interaction.Drag'); diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js index 384b7d9d4c..f45a139e4e 100644 --- a/src/ol/interaction/keyboardpaninteraction.js +++ b/src/ol/interaction/keyboardpaninteraction.js @@ -4,6 +4,7 @@ goog.provide('ol.interaction.KeyboardPan'); goog.require('goog.events.KeyCodes'); goog.require('goog.events.KeyHandler.EventType'); +goog.require('ol.Coordinate'); goog.require('ol.View2D'); goog.require('ol.interaction.Interaction'); diff --git a/src/ol/interaction/mousewheelzoominteraction.js b/src/ol/interaction/mousewheelzoominteraction.js index e04862d203..a0e8f52cc9 100644 --- a/src/ol/interaction/mousewheelzoominteraction.js +++ b/src/ol/interaction/mousewheelzoominteraction.js @@ -5,6 +5,7 @@ goog.provide('ol.interaction.MouseWheelZoom'); goog.require('goog.events.MouseWheelEvent'); goog.require('goog.events.MouseWheelHandler.EventType'); goog.require('ol.View2D'); +goog.require('ol.interaction.Interaction'); diff --git a/src/ol/map.js b/src/ol/map.js index 05585dc90a..58925d8443 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -22,19 +22,31 @@ goog.require('goog.events.MouseWheelHandler'); goog.require('goog.events.MouseWheelHandler.EventType'); goog.require('ol.BrowserFeature'); goog.require('ol.Collection'); +goog.require('ol.CollectionEvent'); +goog.require('ol.CollectionEventType'); goog.require('ol.Color'); goog.require('ol.Coordinate'); goog.require('ol.Extent'); goog.require('ol.FrameState'); +goog.require('ol.IView'); goog.require('ol.Kinetic'); goog.require('ol.MapBrowserEvent'); +goog.require('ol.MapBrowserEvent.EventType'); +goog.require('ol.MapBrowserEventHandler'); +goog.require('ol.MapEvent'); +goog.require('ol.MapEventType'); goog.require('ol.Object'); +goog.require('ol.ObjectEventType'); goog.require('ol.Pixel'); +goog.require('ol.PostRenderFunction'); +goog.require('ol.PreRenderFunction'); goog.require('ol.Size'); +goog.require('ol.Tile'); goog.require('ol.TileQueue'); goog.require('ol.View'); goog.require('ol.View2D'); goog.require('ol.control.Attribution'); +goog.require('ol.control.Control'); goog.require('ol.control.Zoom'); goog.require('ol.interaction.DblClickZoom'); goog.require('ol.interaction.DragPan'); @@ -45,6 +57,7 @@ goog.require('ol.interaction.KeyboardPan'); goog.require('ol.interaction.KeyboardZoom'); goog.require('ol.interaction.MouseWheelZoom'); goog.require('ol.interaction.condition'); +goog.require('ol.layer.Layer'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.canvas.Map'); goog.require('ol.renderer.canvas.isSupported'); diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/canvaslayerrenderer.js index f63048d8e3..074e1b87a1 100644 --- a/src/ol/renderer/canvas/canvaslayerrenderer.js +++ b/src/ol/renderer/canvas/canvaslayerrenderer.js @@ -1,5 +1,6 @@ goog.provide('ol.renderer.canvas.Layer'); +goog.require('ol.layer.Layer'); goog.require('ol.renderer.Layer'); diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index eed606076a..59b0c6051c 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -8,6 +8,9 @@ goog.require('goog.array'); goog.require('goog.dom'); goog.require('goog.vec.Mat4'); goog.require('ol.Size'); +goog.require('ol.Tile'); +goog.require('ol.TileCoord'); +goog.require('ol.TileState'); goog.require('ol.layer.TileLayer'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.canvas.Layer'); diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index 8630803ef3..a92d34a0d2 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -9,10 +9,12 @@ goog.require('goog.style'); goog.require('goog.vec.Mat4'); goog.require('ol.Coordinate'); goog.require('ol.Extent'); +goog.require('ol.Tile'); goog.require('ol.TileCoord'); goog.require('ol.TileState'); goog.require('ol.ViewHint'); goog.require('ol.dom'); +goog.require('ol.layer.TileLayer'); goog.require('ol.renderer.dom.Layer'); goog.require('ol.tilegrid.TileGrid'); diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js index e3f2b01635..4ff6f66cab 100644 --- a/src/ol/renderer/layerrenderer.js +++ b/src/ol/renderer/layerrenderer.js @@ -8,6 +8,7 @@ goog.require('ol.TileRange'); goog.require('ol.layer.Layer'); goog.require('ol.layer.LayerProperty'); goog.require('ol.layer.LayerState'); +goog.require('ol.source.Source'); goog.require('ol.source.TileSource'); diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index f44f0c90d3..d3cceb36d1 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -6,7 +6,12 @@ goog.require('goog.asserts'); goog.require('goog.events'); goog.require('goog.functions'); goog.require('goog.vec.Mat4'); +goog.require('ol.CollectionEvent'); +goog.require('ol.CollectionEventType'); goog.require('ol.FrameState'); +goog.require('ol.Object'); +goog.require('ol.layer.Layer'); +goog.require('ol.renderer.Layer'); diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index f1b70b910e..6f754ba7c0 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -11,6 +11,8 @@ goog.require('goog.events'); goog.require('goog.events.Event'); goog.require('goog.style'); goog.require('goog.webgl'); +goog.require('ol.FrameState'); +goog.require('ol.Size'); goog.require('ol.Tile'); goog.require('ol.layer.TileLayer'); goog.require('ol.renderer.Map'); diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index a2324dcfea..3663948de8 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -12,8 +12,12 @@ goog.require('goog.structs.PriorityQueue'); goog.require('goog.vec.Mat4'); goog.require('goog.vec.Vec4'); goog.require('goog.webgl'); +goog.require('ol.Extent'); goog.require('ol.FrameState'); goog.require('ol.Size'); +goog.require('ol.Tile'); +goog.require('ol.TileCoord'); +goog.require('ol.TileRange'); goog.require('ol.TileState'); goog.require('ol.layer.TileLayer'); goog.require('ol.renderer.webgl.FragmentShader'); diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index bd4bca3ea3..c2d6e7146f 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -4,7 +4,13 @@ goog.provide('ol.source.BingMaps'); goog.require('goog.Uri'); goog.require('goog.array'); goog.require('goog.net.Jsonp'); +goog.require('ol.Attribution'); +goog.require('ol.Extent'); +goog.require('ol.Projection'); +goog.require('ol.Size'); +goog.require('ol.TileCoord'); goog.require('ol.TileRange'); +goog.require('ol.TileUrlFunction'); goog.require('ol.source.ImageTileSource'); goog.require('ol.tilegrid.XYZ'); diff --git a/src/ol/source/debugtilesource.js b/src/ol/source/debugtilesource.js index 1cb3e059e7..8cd712d584 100644 --- a/src/ol/source/debugtilesource.js +++ b/src/ol/source/debugtilesource.js @@ -4,6 +4,7 @@ goog.require('ol.Size'); goog.require('ol.Tile'); goog.require('ol.TileCache'); goog.require('ol.TileCoord'); +goog.require('ol.TileState'); goog.require('ol.source.TileSource'); goog.require('ol.tilegrid.TileGrid'); diff --git a/src/ol/source/imagetilesource.js b/src/ol/source/imagetilesource.js index b025985f00..4a59b1bcff 100644 --- a/src/ol/source/imagetilesource.js +++ b/src/ol/source/imagetilesource.js @@ -5,6 +5,7 @@ goog.require('ol.Attribution'); goog.require('ol.Extent'); goog.require('ol.ImageTile'); goog.require('ol.Projection'); +goog.require('ol.Tile'); goog.require('ol.TileCache'); goog.require('ol.TileCoord'); goog.require('ol.TileUrlFunction'); diff --git a/src/ol/source/openstreetmapsource.js b/src/ol/source/openstreetmapsource.js index 7245827837..8bbfaf5742 100644 --- a/src/ol/source/openstreetmapsource.js +++ b/src/ol/source/openstreetmapsource.js @@ -1,5 +1,6 @@ goog.provide('ol.source.OpenStreetMap'); +goog.require('ol.Attribution'); goog.require('ol.source.XYZ'); diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamensource.js index 6c68e8e720..46f87d83df 100644 --- a/src/ol/source/stamensource.js +++ b/src/ol/source/stamensource.js @@ -4,6 +4,7 @@ goog.provide('ol.source.Stamen'); goog.provide('ol.source.StamenFlavor'); goog.provide('ol.source.StamenProvider'); +goog.require('ol.Attribution'); goog.require('ol.source.XYZ'); diff --git a/src/ol/source/tiledwmssource.js b/src/ol/source/tiledwmssource.js index 75e420529e..b09147cf2c 100644 --- a/src/ol/source/tiledwmssource.js +++ b/src/ol/source/tiledwmssource.js @@ -6,6 +6,7 @@ goog.provide('ol.source.TiledWMS'); goog.require('goog.array'); goog.require('goog.object'); goog.require('goog.uri.utils'); +goog.require('ol.Extent'); goog.require('ol.Projection'); goog.require('ol.TileCoord'); goog.require('ol.TileUrlFunction'); diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js index 71435aac3d..9721d32035 100644 --- a/src/ol/source/tilejsonsource.js +++ b/src/ol/source/tilejsonsource.js @@ -1,6 +1,6 @@ // FIXME add some error checking // FIXME check order of async callbacks -// FIXME use minzoom when supported by ol.tilegrid.TileGrid +// FIXME use minzoom when supported /** * @see http://mapbox.com/developers/api/ @@ -11,7 +11,11 @@ goog.provide('ol.tilejson'); goog.require('goog.asserts'); goog.require('goog.net.jsloader'); +goog.require('ol.Attribution'); +goog.require('ol.Extent'); goog.require('ol.Projection'); +goog.require('ol.TileCoord'); +goog.require('ol.TileRange'); goog.require('ol.TileUrlFunction'); goog.require('ol.source.ImageTileSource'); goog.require('ol.tilegrid.XYZ'); diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js index b3653e6c67..93e083eef8 100644 --- a/src/ol/source/tilesource.js +++ b/src/ol/source/tilesource.js @@ -7,6 +7,7 @@ goog.require('ol.Extent'); goog.require('ol.Projection'); goog.require('ol.Tile'); goog.require('ol.TileCoord'); +goog.require('ol.TileRange'); goog.require('ol.source.Source'); goog.require('ol.tilegrid.TileGrid'); diff --git a/src/ol/source/xyzsource.js b/src/ol/source/xyzsource.js index 106eed9334..ad7842769b 100644 --- a/src/ol/source/xyzsource.js +++ b/src/ol/source/xyzsource.js @@ -5,6 +5,7 @@ goog.provide('ol.source.XYZOptions'); goog.require('goog.math'); goog.require('ol.Attribution'); +goog.require('ol.Extent'); goog.require('ol.Projection'); goog.require('ol.TileCoord'); goog.require('ol.TileUrlFunction'); diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index 188692861c..58dfaacfda 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -7,6 +7,7 @@ goog.require('goog.asserts'); goog.require('ol.Coordinate'); goog.require('ol.Extent'); goog.require('ol.PixelBounds'); +goog.require('ol.Projection'); goog.require('ol.Size'); goog.require('ol.TileCoord'); goog.require('ol.TileRange'); diff --git a/src/ol/view2d.js b/src/ol/view2d.js index ad4af94932..c1da3c23bc 100644 --- a/src/ol/view2d.js +++ b/src/ol/view2d.js @@ -5,12 +5,14 @@ goog.provide('ol.View2D'); goog.provide('ol.View2DProperty'); goog.require('ol.Constraints'); +goog.require('ol.Coordinate'); goog.require('ol.Extent'); goog.require('ol.IView2D'); goog.require('ol.IView3D'); goog.require('ol.Projection'); goog.require('ol.ResolutionConstraint'); goog.require('ol.RotationConstraint'); +goog.require('ol.Size'); goog.require('ol.View'); goog.require('ol.animation'); From f9eb7dc477ad0b0693864cbaede71e09a0d5f36b Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 29 Jan 2013 15:40:05 +0100 Subject: [PATCH 6/7] Add missing requires to examples --- examples/anchored-elements.js | 2 ++ examples/canvas-tiles.js | 2 ++ examples/full-screen.js | 1 + examples/side-by-side.js | 3 +++ examples/two-layers.js | 1 + examples/wms-custom-proj.js | 4 ++++ examples/wms.js | 3 +++ 7 files changed, 16 insertions(+) diff --git a/examples/anchored-elements.js b/examples/anchored-elements.js index 80fac6d6bf..40ee7e71c3 100644 --- a/examples/anchored-elements.js +++ b/examples/anchored-elements.js @@ -5,8 +5,10 @@ goog.require('ol.AnchoredElement'); goog.require('ol.Collection'); goog.require('ol.Coordinate'); goog.require('ol.Map'); +goog.require('ol.Projection'); goog.require('ol.RendererHints'); goog.require('ol.View2D'); +goog.require('ol.layer.TileLayer'); goog.require('ol.source.MapQuestOpenAerial'); diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js index d8a0951754..76b35d0bd9 100644 --- a/examples/canvas-tiles.js +++ b/examples/canvas-tiles.js @@ -3,9 +3,11 @@ goog.require('ol.Coordinate'); goog.require('ol.Map'); goog.require('ol.Projection'); goog.require('ol.RendererHint'); +goog.require('ol.View2D'); goog.require('ol.layer.TileLayer'); goog.require('ol.source.DebugTileSource'); goog.require('ol.source.OpenStreetMap'); +goog.require('ol.tilegrid.XYZ'); var layers = new ol.Collection([ diff --git a/examples/full-screen.js b/examples/full-screen.js index 0228a84c5c..3e9cce6f89 100644 --- a/examples/full-screen.js +++ b/examples/full-screen.js @@ -6,6 +6,7 @@ goog.require('ol.Coordinate'); goog.require('ol.Map'); goog.require('ol.RendererHints'); goog.require('ol.View2D'); +goog.require('ol.layer.TileLayer'); goog.require('ol.source.MapQuestOpenAerial'); diff --git a/examples/side-by-side.js b/examples/side-by-side.js index 017b072750..4c5bb354b7 100644 --- a/examples/side-by-side.js +++ b/examples/side-by-side.js @@ -1,12 +1,15 @@ goog.require('goog.debug.Console'); goog.require('goog.debug.Logger'); goog.require('goog.debug.Logger.Level'); +goog.require('ol.Collection'); goog.require('ol.Coordinate'); goog.require('ol.Map'); +goog.require('ol.Projection'); goog.require('ol.RendererHint'); goog.require('ol.View2D'); goog.require('ol.animation'); goog.require('ol.control.MousePosition'); +goog.require('ol.easing'); goog.require('ol.interaction.Keyboard'); goog.require('ol.layer.TileLayer'); goog.require('ol.source.MapQuestOpenAerial'); diff --git a/examples/two-layers.js b/examples/two-layers.js index 884f8db98f..2791d2e201 100644 --- a/examples/two-layers.js +++ b/examples/two-layers.js @@ -1,3 +1,4 @@ +goog.require('ol.BingMapsStyle'); goog.require('ol.Collection'); goog.require('ol.Coordinate'); goog.require('ol.Map'); diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index ae6dea5cc9..d389451935 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -1,12 +1,16 @@ goog.require('goog.debug.Console'); goog.require('goog.debug.Logger'); goog.require('goog.debug.Logger.Level'); +goog.require('ol.Attribution'); goog.require('ol.Collection'); goog.require('ol.Coordinate'); +goog.require('ol.Extent'); goog.require('ol.Map'); goog.require('ol.Projection'); +goog.require('ol.ProjectionUnits'); goog.require('ol.RendererHints'); goog.require('ol.View2D'); +goog.require('ol.layer.TileLayer'); goog.require('ol.source.TiledWMS'); diff --git a/examples/wms.js b/examples/wms.js index 18788dd342..e6fdc597d6 100644 --- a/examples/wms.js +++ b/examples/wms.js @@ -3,8 +3,11 @@ goog.require('goog.debug.Logger'); goog.require('goog.debug.Logger.Level'); goog.require('ol.Collection'); goog.require('ol.Coordinate'); +goog.require('ol.Extent'); goog.require('ol.Map'); +goog.require('ol.RendererHint'); goog.require('ol.View2D'); +goog.require('ol.layer.TileLayer'); goog.require('ol.source.MapQuestOpenAerial'); goog.require('ol.source.TiledWMS'); From 93976a5d9f5029cea2c1b299ce2fe3f2bfe05923 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Wed, 30 Jan 2013 23:18:42 +0100 Subject: [PATCH 7/7] Fix requires relating to recent commits --- src/ol/interaction/dragpaninteraction.js | 3 +++ src/ol/kinetic.js | 4 ++-- src/ol/mapbrowserevent.js | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js index 5bfbbf3bcb..6cca9a096d 100644 --- a/src/ol/interaction/dragpaninteraction.js +++ b/src/ol/interaction/dragpaninteraction.js @@ -4,6 +4,9 @@ goog.provide('ol.interaction.DragPan'); goog.require('goog.asserts'); goog.require('ol.Coordinate'); +goog.require('ol.Kinetic'); +goog.require('ol.Pixel'); +goog.require('ol.PreRenderFunction'); goog.require('ol.View2D'); goog.require('ol.ViewHint'); goog.require('ol.interaction.ConditionType'); diff --git a/src/ol/kinetic.js b/src/ol/kinetic.js index 44aabe850b..5be0754ead 100644 --- a/src/ol/kinetic.js +++ b/src/ol/kinetic.js @@ -1,8 +1,8 @@ goog.provide('ol.Kinetic'); -goog.require('goog.array'); -goog.require('ol.Pixel'); +goog.require('ol.Coordinate'); +goog.require('ol.PreRenderFunction'); goog.require('ol.animation'); diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index a6b0f20be7..079f43b47b 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -10,6 +10,7 @@ goog.require('goog.events.EventType'); goog.require('goog.style'); goog.require('ol.BrowserFeature'); goog.require('ol.Coordinate'); +goog.require('ol.FrameState'); goog.require('ol.MapEvent'); goog.require('ol.Pixel');