From 9d276982b538006a6832f5e857af8d822d9f5505 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 12 Aug 2016 07:22:28 -0600 Subject: [PATCH] Assorted missing requires --- src/ol/imagecanvas.js | 1 + src/ol/pointer/touchsource.js | 9 ++++++--- src/ol/proj/epsg3857.js | 1 + src/ol/proj/epsg4326.js | 1 + src/ol/render.js | 1 + src/ol/render/box.js | 1 + src/ol/render/canvas/immediate.js | 3 ++- src/ol/render/event.js | 1 + src/ol/render/feature.js | 2 +- src/ol/render/webgl/imagereplay/index.js | 1 + src/ol/render/webgl/immediate.js | 1 + src/ol/renderer/canvas/imagelayer.js | 1 + src/ol/renderer/canvas/layer.js | 3 ++- src/ol/renderer/canvas/vectorlayer.js | 1 + src/ol/renderer/canvas/vectortilelayer.js | 1 + src/ol/renderer/dom/imagelayer.js | 2 ++ src/ol/renderer/dom/vectorlayer.js | 5 +++-- src/ol/renderer/layer.js | 9 +++++---- src/ol/renderer/map.js | 3 ++- src/ol/renderer/vector.js | 1 + src/ol/renderer/webgl/imagelayer.js | 1 + src/ol/renderer/webgl/layer.js | 3 ++- src/ol/renderer/webgl/tilelayer.js | 5 +++-- src/ol/renderer/webgl/vectorlayer.js | 1 + src/ol/reproj/image.js | 5 +++-- src/ol/reproj/index.js | 15 ++++++++------- src/ol/reproj/tile.js | 4 +++- src/ol/reproj/triangulation.js | 1 + src/ol/source/bingmaps.js | 1 + src/ol/source/cartodb.js | 1 + src/ol/source/cluster.js | 2 ++ src/ol/source/image.js | 3 ++- src/ol/source/imagearcgisrest.js | 1 + src/ol/source/imagecanvas.js | 1 + src/ol/source/imagemapguide.js | 3 ++- src/ol/source/imagestatic.js | 5 +++-- src/ol/source/imagevector.js | 6 ++++-- src/ol/source/imagewms.js | 1 + src/ol/source/osm.js | 1 + src/ol/source/raster.js | 1 + src/ol/source/stamen.js | 1 + src/ol/source/tilearcgisrest.js | 3 ++- src/ol/source/tiledebug.js | 1 + src/ol/source/tilejson.js | 1 + src/ol/source/tileutfgrid.js | 2 ++ src/ol/source/tilewms.js | 1 + src/ol/source/urltile.js | 1 + src/ol/source/vector.js | 2 ++ src/ol/source/vectortile.js | 1 + src/ol/source/xyz.js | 1 + src/ol/source/zoomify.js | 1 + src/ol/structs/priorityqueue.js | 1 + src/ol/style/fill.js | 1 + src/ol/style/iconimage.js | 1 + src/ol/tilecache.js | 1 + src/ol/tilegrid/wmts.js | 1 + test/spec/ol/geom/flat/transform.test.js | 1 - 57 files changed, 96 insertions(+), 34 deletions(-) diff --git a/src/ol/imagecanvas.js b/src/ol/imagecanvas.js index 453c5e6cba..9b05fc87aa 100644 --- a/src/ol/imagecanvas.js +++ b/src/ol/imagecanvas.js @@ -1,5 +1,6 @@ goog.provide('ol.ImageCanvas'); +goog.require('ol'); goog.require('ol.ImageBase'); goog.require('ol.ImageState'); diff --git a/src/ol/pointer/touchsource.js b/src/ol/pointer/touchsource.js index 38e2842df6..e20dd8c072 100644 --- a/src/ol/pointer/touchsource.js +++ b/src/ol/pointer/touchsource.js @@ -148,7 +148,8 @@ ol.pointer.TouchSource.prototype.removePrimaryPointer_ = function(inPointer) { * @private */ ol.pointer.TouchSource.prototype.resetClickCount_ = function() { - this.resetId_ = ol.global.setTimeout( + var global = ol.global; + this.resetId_ = global.setTimeout( this.resetClickCountHandler_.bind(this), ol.pointer.TouchSource.CLICK_COUNT_TIMEOUT); }; @@ -167,8 +168,9 @@ ol.pointer.TouchSource.prototype.resetClickCountHandler_ = function() { * @private */ ol.pointer.TouchSource.prototype.cancelResetClickCount_ = function() { + var global = ol.global; if (this.resetId_ !== undefined) { - ol.global.clearTimeout(this.resetId_); + global.clearTimeout(this.resetId_); } }; @@ -440,7 +442,8 @@ ol.pointer.TouchSource.prototype.dedupSynthMouse_ = function(inEvent) { var lt = [t.clientX, t.clientY]; lts.push(lt); - ol.global.setTimeout(function() { + var global = ol.global; + global.setTimeout(function() { // remove touch after timeout ol.array.remove(lts, lt); }, ol.pointer.TouchSource.DEDUP_TIMEOUT); diff --git a/src/ol/proj/epsg3857.js b/src/ol/proj/epsg3857.js index 1c714aac9d..bd04762ad8 100644 --- a/src/ol/proj/epsg3857.js +++ b/src/ol/proj/epsg3857.js @@ -1,5 +1,6 @@ goog.provide('ol.proj.EPSG3857'); +goog.require('ol'); goog.require('ol.math'); goog.require('ol.proj'); goog.require('ol.proj.Projection'); diff --git a/src/ol/proj/epsg4326.js b/src/ol/proj/epsg4326.js index b30fd11d54..d1fff14687 100644 --- a/src/ol/proj/epsg4326.js +++ b/src/ol/proj/epsg4326.js @@ -1,5 +1,6 @@ goog.provide('ol.proj.EPSG4326'); +goog.require('ol'); goog.require('ol.proj'); goog.require('ol.proj.Projection'); goog.require('ol.proj.Units'); diff --git a/src/ol/render.js b/src/ol/render.js index d8c66a7b2d..12fd27216d 100644 --- a/src/ol/render.js +++ b/src/ol/render.js @@ -1,5 +1,6 @@ goog.provide('ol.render'); +goog.require('ol.has'); goog.require('ol.transform'); goog.require('ol.render.canvas.Immediate'); diff --git a/src/ol/render/box.js b/src/ol/render/box.js index 592e9621d7..6e44032ec2 100644 --- a/src/ol/render/box.js +++ b/src/ol/render/box.js @@ -2,6 +2,7 @@ goog.provide('ol.render.Box'); +goog.require('ol'); goog.require('ol.Disposable'); goog.require('ol.geom.Polygon'); diff --git a/src/ol/render/canvas/immediate.js b/src/ol/render/canvas/immediate.js index 22b7bc4f2c..e576e2cb0a 100644 --- a/src/ol/render/canvas/immediate.js +++ b/src/ol/render/canvas/immediate.js @@ -4,7 +4,7 @@ goog.provide('ol.render.canvas.Immediate'); -goog.require('ol.transform'); +goog.require('ol'); goog.require('ol.array'); goog.require('ol.color'); goog.require('ol.colorlike'); @@ -14,6 +14,7 @@ goog.require('ol.geom.flat.transform'); goog.require('ol.has'); goog.require('ol.render.VectorContext'); goog.require('ol.render.canvas'); +goog.require('ol.transform'); /** diff --git a/src/ol/render/event.js b/src/ol/render/event.js index d454b99f93..64560e32c4 100644 --- a/src/ol/render/event.js +++ b/src/ol/render/event.js @@ -1,6 +1,7 @@ goog.provide('ol.render.Event'); goog.provide('ol.render.EventType'); +goog.require('ol'); goog.require('ol.events.Event'); diff --git a/src/ol/render/feature.js b/src/ol/render/feature.js index 2e09b5885c..0412800169 100644 --- a/src/ol/render/feature.js +++ b/src/ol/render/feature.js @@ -1,6 +1,6 @@ goog.provide('ol.render.Feature'); - +goog.require('ol'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); diff --git a/src/ol/render/webgl/imagereplay/index.js b/src/ol/render/webgl/imagereplay/index.js index 4fd0aff35d..c377dd3695 100644 --- a/src/ol/render/webgl/imagereplay/index.js +++ b/src/ol/render/webgl/imagereplay/index.js @@ -1,6 +1,7 @@ goog.provide('ol.render.webgl.ImageReplay'); goog.provide('ol.render.webgl.ReplayGroup'); +goog.require('ol'); goog.require('ol.extent'); goog.require('ol.obj'); goog.require('ol.render.ReplayGroup'); diff --git a/src/ol/render/webgl/immediate.js b/src/ol/render/webgl/immediate.js index 726e52698b..2b6d6b333b 100644 --- a/src/ol/render/webgl/immediate.js +++ b/src/ol/render/webgl/immediate.js @@ -1,5 +1,6 @@ goog.provide('ol.render.webgl.Immediate'); +goog.require('ol'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.render.ReplayType'); diff --git a/src/ol/renderer/canvas/imagelayer.js b/src/ol/renderer/canvas/imagelayer.js index fe9f3b5338..575847ed46 100644 --- a/src/ol/renderer/canvas/imagelayer.js +++ b/src/ol/renderer/canvas/imagelayer.js @@ -1,5 +1,6 @@ goog.provide('ol.renderer.canvas.ImageLayer'); +goog.require('ol'); goog.require('ol.View'); goog.require('ol.dom'); goog.require('ol.extent'); diff --git a/src/ol/renderer/canvas/layer.js b/src/ol/renderer/canvas/layer.js index 3de53c83bb..1bcf37b4cd 100644 --- a/src/ol/renderer/canvas/layer.js +++ b/src/ol/renderer/canvas/layer.js @@ -1,12 +1,13 @@ goog.provide('ol.renderer.canvas.Layer'); -goog.require('ol.transform'); +goog.require('ol'); goog.require('ol.extent'); goog.require('ol.render.Event'); goog.require('ol.render.EventType'); goog.require('ol.render.canvas'); goog.require('ol.render.canvas.Immediate'); goog.require('ol.renderer.Layer'); +goog.require('ol.transform'); /** diff --git a/src/ol/renderer/canvas/vectorlayer.js b/src/ol/renderer/canvas/vectorlayer.js index dd62d2a9e5..05fd02e433 100644 --- a/src/ol/renderer/canvas/vectorlayer.js +++ b/src/ol/renderer/canvas/vectorlayer.js @@ -1,5 +1,6 @@ goog.provide('ol.renderer.canvas.VectorLayer'); +goog.require('ol'); goog.require('ol.View'); goog.require('ol.dom'); goog.require('ol.extent'); diff --git a/src/ol/renderer/canvas/vectortilelayer.js b/src/ol/renderer/canvas/vectortilelayer.js index 9683b105b0..3f41dc906c 100644 --- a/src/ol/renderer/canvas/vectortilelayer.js +++ b/src/ol/renderer/canvas/vectortilelayer.js @@ -1,5 +1,6 @@ goog.provide('ol.renderer.canvas.VectorTileLayer'); +goog.require('ol'); goog.require('ol.array'); goog.require('ol.extent'); goog.require('ol.proj'); diff --git a/src/ol/renderer/dom/imagelayer.js b/src/ol/renderer/dom/imagelayer.js index 63f8dcdc9c..40e6e2913e 100644 --- a/src/ol/renderer/dom/imagelayer.js +++ b/src/ol/renderer/dom/imagelayer.js @@ -1,6 +1,8 @@ goog.provide('ol.renderer.dom.ImageLayer'); +goog.require('ol'); goog.require('ol.View'); +goog.require('ol.array'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.proj'); diff --git a/src/ol/renderer/dom/vectorlayer.js b/src/ol/renderer/dom/vectorlayer.js index 7f2b4f5102..47ddc19eb0 100644 --- a/src/ol/renderer/dom/vectorlayer.js +++ b/src/ol/renderer/dom/vectorlayer.js @@ -1,7 +1,7 @@ goog.provide('ol.renderer.dom.VectorLayer'); -goog.require('ol.transform'); -goog.require('ol.View.Hint'); +goog.require('ol'); +goog.require('ol.View'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.render.Event'); @@ -10,6 +10,7 @@ goog.require('ol.render.canvas.Immediate'); goog.require('ol.render.canvas.ReplayGroup'); goog.require('ol.renderer.dom.Layer'); goog.require('ol.renderer.vector'); +goog.require('ol.transform'); /** diff --git a/src/ol/renderer/layer.js b/src/ol/renderer/layer.js index 29855af6cf..96ccda0059 100644 --- a/src/ol/renderer/layer.js +++ b/src/ol/renderer/layer.js @@ -1,14 +1,15 @@ goog.provide('ol.renderer.Layer'); -goog.require('ol.events'); -goog.require('ol.events.EventType'); goog.require('ol'); -goog.require('ol.functions'); goog.require('ol.ImageState'); goog.require('ol.Observable'); goog.require('ol.Tile'); -goog.require('ol.transform'); +goog.require('ol.asserts'); +goog.require('ol.events'); +goog.require('ol.events.EventType'); +goog.require('ol.functions'); goog.require('ol.source.State'); +goog.require('ol.transform'); /** diff --git a/src/ol/renderer/map.js b/src/ol/renderer/map.js index e9291e5584..8eb4749527 100644 --- a/src/ol/renderer/map.js +++ b/src/ol/renderer/map.js @@ -104,7 +104,8 @@ ol.renderer.Map.prototype.disposeInternal = function() { * @private */ ol.renderer.Map.expireIconCache_ = function(map, frameState) { - ol.style.iconImageCache.expire(); + var cache = ol.style.iconImageCache; + cache.expire(); }; diff --git a/src/ol/renderer/vector.js b/src/ol/renderer/vector.js index 8c98748c89..ebbf38cfe5 100644 --- a/src/ol/renderer/vector.js +++ b/src/ol/renderer/vector.js @@ -1,5 +1,6 @@ goog.provide('ol.renderer.vector'); +goog.require('ol'); goog.require('ol.render.ReplayType'); goog.require('ol.style.ImageState'); diff --git a/src/ol/renderer/webgl/imagelayer.js b/src/ol/renderer/webgl/imagelayer.js index 3c55792ad2..5587f75aca 100644 --- a/src/ol/renderer/webgl/imagelayer.js +++ b/src/ol/renderer/webgl/imagelayer.js @@ -1,5 +1,6 @@ goog.provide('ol.renderer.webgl.ImageLayer'); +goog.require('ol'); goog.require('ol.View'); goog.require('ol.dom'); goog.require('ol.extent'); diff --git a/src/ol/renderer/webgl/layer.js b/src/ol/renderer/webgl/layer.js index b8e3e4b979..5ce02c846d 100644 --- a/src/ol/renderer/webgl/layer.js +++ b/src/ol/renderer/webgl/layer.js @@ -1,11 +1,12 @@ goog.provide('ol.renderer.webgl.Layer'); -goog.require('ol.transform'); +goog.require('ol'); goog.require('ol.render.Event'); goog.require('ol.render.EventType'); goog.require('ol.render.webgl.Immediate'); goog.require('ol.renderer.Layer'); goog.require('ol.renderer.webgl.defaultmapshader'); +goog.require('ol.transform'); goog.require('ol.vec.Mat4'); goog.require('ol.webgl'); goog.require('ol.webgl.Buffer'); diff --git a/src/ol/renderer/webgl/tilelayer.js b/src/ol/renderer/webgl/tilelayer.js index eba5a20aec..d872926aa0 100644 --- a/src/ol/renderer/webgl/tilelayer.js +++ b/src/ol/renderer/webgl/tilelayer.js @@ -3,15 +3,16 @@ goog.provide('ol.renderer.webgl.TileLayer'); -goog.require('ol.transform'); -goog.require('ol.TileRange'); +goog.require('ol'); goog.require('ol.Tile'); +goog.require('ol.TileRange'); goog.require('ol.array'); goog.require('ol.extent'); goog.require('ol.math'); goog.require('ol.renderer.webgl.Layer'); goog.require('ol.renderer.webgl.tilelayershader'); goog.require('ol.size'); +goog.require('ol.transform'); goog.require('ol.webgl'); goog.require('ol.webgl.Buffer'); diff --git a/src/ol/renderer/webgl/vectorlayer.js b/src/ol/renderer/webgl/vectorlayer.js index 0af0460772..c0422ba5be 100644 --- a/src/ol/renderer/webgl/vectorlayer.js +++ b/src/ol/renderer/webgl/vectorlayer.js @@ -1,5 +1,6 @@ goog.provide('ol.renderer.webgl.VectorLayer'); +goog.require('ol'); goog.require('ol.View'); goog.require('ol.extent'); goog.require('ol.render.webgl.ReplayGroup'); diff --git a/src/ol/reproj/image.js b/src/ol/reproj/image.js index 3774e303a4..af3c73f682 100644 --- a/src/ol/reproj/image.js +++ b/src/ol/reproj/image.js @@ -1,9 +1,10 @@ goog.provide('ol.reproj.Image'); -goog.require('ol.events'); -goog.require('ol.events.EventType'); +goog.require('ol'); goog.require('ol.ImageBase'); goog.require('ol.ImageState'); +goog.require('ol.events'); +goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.reproj'); goog.require('ol.reproj.Triangulation'); diff --git a/src/ol/reproj/index.js b/src/ol/reproj/index.js index b033ed3ce0..1adae44257 100644 --- a/src/ol/reproj/index.js +++ b/src/ol/reproj/index.js @@ -1,5 +1,6 @@ goog.provide('ol.reproj'); +goog.require('ol'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.math'); @@ -16,18 +17,18 @@ goog.require('ol.proj'); * @type {boolean} * @private */ -ol.reproj.browserAntialiasesClip_ = (function(winNav, winChrome) { +ol.reproj.browserAntialiasesClip_ = (function(global) { // Adapted from http://stackoverflow.com/questions/4565112/javascript-how-to-find-out-if-the-user-browser-is-chrome - var isOpera = winNav.userAgent.indexOf('OPR') > -1; - var isIEedge = winNav.userAgent.indexOf('Edge') > -1; + var isOpera = global.navigator.userAgent.indexOf('OPR') > -1; + var isIEedge = global.navigator.userAgent.indexOf('Edge') > -1; return !( - !winNav.userAgent.match('CriOS') && // Not Chrome on iOS - winChrome !== null && winChrome !== undefined && // Has chrome in window - winNav.vendor === 'Google Inc.' && // Vendor is Google. + !global.navigator.userAgent.match('CriOS') && // Not Chrome on iOS + global.chrome !== null && global.chrome !== undefined && // Has chrome in window + global.navigator.vendor === 'Google Inc.' && // Vendor is Google. isOpera == false && // Not Opera isIEedge == false // Not Edge ); -})(ol.global.navigator, ol.global.chrome); +})(ol.global); /** diff --git a/src/ol/reproj/tile.js b/src/ol/reproj/tile.js index 60844e840f..91f0b28a81 100644 --- a/src/ol/reproj/tile.js +++ b/src/ol/reproj/tile.js @@ -1,5 +1,6 @@ goog.provide('ol.reproj.Tile'); +goog.require('ol'); goog.require('ol.Tile'); goog.require('ol.events'); goog.require('ol.events.EventType'); @@ -320,7 +321,8 @@ ol.reproj.Tile.prototype.load = function() { }); if (leftToLoad === 0) { - ol.global.setTimeout(this.reproject_.bind(this), 0); + var global = ol.global; + global.setTimeout(this.reproject_.bind(this), 0); } } }; diff --git a/src/ol/reproj/triangulation.js b/src/ol/reproj/triangulation.js index 8a1aa2c149..059c861a77 100644 --- a/src/ol/reproj/triangulation.js +++ b/src/ol/reproj/triangulation.js @@ -1,5 +1,6 @@ goog.provide('ol.reproj.Triangulation'); +goog.require('ol'); goog.require('ol.extent'); goog.require('ol.math'); goog.require('ol.proj'); diff --git a/src/ol/source/bingmaps.js b/src/ol/source/bingmaps.js index 74b0628024..ef327cc3e7 100644 --- a/src/ol/source/bingmaps.js +++ b/src/ol/source/bingmaps.js @@ -1,5 +1,6 @@ goog.provide('ol.source.BingMaps'); +goog.require('ol'); goog.require('ol.Attribution'); goog.require('ol.TileUrlFunction'); goog.require('ol.extent'); diff --git a/src/ol/source/cartodb.js b/src/ol/source/cartodb.js index 9d3f5f1b81..2006865a97 100644 --- a/src/ol/source/cartodb.js +++ b/src/ol/source/cartodb.js @@ -1,5 +1,6 @@ goog.provide('ol.source.CartoDB'); +goog.require('ol'); goog.require('ol.obj'); goog.require('ol.source.State'); goog.require('ol.source.XYZ'); diff --git a/src/ol/source/cluster.js b/src/ol/source/cluster.js index b49a5978cf..29057ce812 100644 --- a/src/ol/source/cluster.js +++ b/src/ol/source/cluster.js @@ -3,6 +3,8 @@ goog.provide('ol.source.Cluster'); +goog.require('ol'); +goog.require('ol.asserts'); goog.require('ol.Feature'); goog.require('ol.coordinate'); goog.require('ol.events.EventType'); diff --git a/src/ol/source/image.js b/src/ol/source/image.js index 3336ef0593..a190f2cd0c 100644 --- a/src/ol/source/image.js +++ b/src/ol/source/image.js @@ -1,9 +1,10 @@ goog.provide('ol.source.Image'); goog.provide('ol.source.ImageEvent'); -goog.require('ol.events.Event'); +goog.require('ol'); goog.require('ol.ImageState'); goog.require('ol.array'); +goog.require('ol.events.Event'); goog.require('ol.extent'); goog.require('ol.proj'); goog.require('ol.reproj.Image'); diff --git a/src/ol/source/imagearcgisrest.js b/src/ol/source/imagearcgisrest.js index 9a5ea2b299..729392658c 100644 --- a/src/ol/source/imagearcgisrest.js +++ b/src/ol/source/imagearcgisrest.js @@ -2,6 +2,7 @@ goog.provide('ol.source.ImageArcGISRest'); goog.require('ol'); goog.require('ol.Image'); +goog.require('ol.asserts'); goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); diff --git a/src/ol/source/imagecanvas.js b/src/ol/source/imagecanvas.js index 83d66a3fd4..218d667e15 100644 --- a/src/ol/source/imagecanvas.js +++ b/src/ol/source/imagecanvas.js @@ -1,5 +1,6 @@ goog.provide('ol.source.ImageCanvas'); +goog.require('ol'); goog.require('ol.ImageCanvas'); goog.require('ol.extent'); goog.require('ol.source.Image'); diff --git a/src/ol/source/imagemapguide.js b/src/ol/source/imagemapguide.js index b018504e4d..486de8b62a 100644 --- a/src/ol/source/imagemapguide.js +++ b/src/ol/source/imagemapguide.js @@ -1,8 +1,9 @@ goog.provide('ol.source.ImageMapGuide'); +goog.require('ol'); +goog.require('ol.Image'); goog.require('ol.events'); goog.require('ol.events.EventType'); -goog.require('ol.Image'); goog.require('ol.extent'); goog.require('ol.obj'); goog.require('ol.source.Image'); diff --git a/src/ol/source/imagestatic.js b/src/ol/source/imagestatic.js index bfe00b5bff..15eb7df329 100644 --- a/src/ol/source/imagestatic.js +++ b/src/ol/source/imagestatic.js @@ -1,10 +1,11 @@ goog.provide('ol.source.ImageStatic'); -goog.require('ol.events'); -goog.require('ol.events.EventType'); +goog.require('ol'); goog.require('ol.Image'); goog.require('ol.ImageState'); goog.require('ol.dom'); +goog.require('ol.events'); +goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.proj'); goog.require('ol.source.Image'); diff --git a/src/ol/source/imagevector.js b/src/ol/source/imagevector.js index a813c4da52..ae5a5f8937 100644 --- a/src/ol/source/imagevector.js +++ b/src/ol/source/imagevector.js @@ -1,13 +1,15 @@ goog.provide('ol.source.ImageVector'); +goog.require('ol'); +goog.require('ol.dom'); goog.require('ol.events'); goog.require('ol.events.EventType'); -goog.require('ol.transform'); -goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.render.canvas.ReplayGroup'); goog.require('ol.renderer.vector'); goog.require('ol.source.ImageCanvas'); +goog.require('ol.style.Style'); +goog.require('ol.transform'); /** diff --git a/src/ol/source/imagewms.js b/src/ol/source/imagewms.js index f28dce2897..757f14b8d4 100644 --- a/src/ol/source/imagewms.js +++ b/src/ol/source/imagewms.js @@ -4,6 +4,7 @@ goog.provide('ol.source.ImageWMS'); goog.require('ol'); goog.require('ol.Image'); +goog.require('ol.asserts'); goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); diff --git a/src/ol/source/osm.js b/src/ol/source/osm.js index c1693c79d4..a100a7e656 100644 --- a/src/ol/source/osm.js +++ b/src/ol/source/osm.js @@ -1,5 +1,6 @@ goog.provide('ol.source.OSM'); +goog.require('ol'); goog.require('ol.Attribution'); goog.require('ol.source.XYZ'); diff --git a/src/ol/source/raster.js b/src/ol/source/raster.js index b27ad04750..b604684960 100644 --- a/src/ol/source/raster.js +++ b/src/ol/source/raster.js @@ -3,6 +3,7 @@ goog.provide('ol.RasterOperationType'); goog.provide('ol.source.RasterEvent'); goog.provide('ol.source.RasterEventType'); +goog.require('ol'); goog.require('ol.transform'); goog.require('ol.ImageCanvas'); goog.require('ol.TileQueue'); diff --git a/src/ol/source/stamen.js b/src/ol/source/stamen.js index ee5becf812..d17d0a0363 100644 --- a/src/ol/source/stamen.js +++ b/src/ol/source/stamen.js @@ -1,5 +1,6 @@ goog.provide('ol.source.Stamen'); +goog.require('ol'); goog.require('ol.Attribution'); goog.require('ol.source.OSM'); goog.require('ol.source.XYZ'); diff --git a/src/ol/source/tilearcgisrest.js b/src/ol/source/tilearcgisrest.js index f8d68389f4..4e9e75f365 100644 --- a/src/ol/source/tilearcgisrest.js +++ b/src/ol/source/tilearcgisrest.js @@ -1,9 +1,10 @@ goog.provide('ol.source.TileArcGISRest'); goog.require('ol'); +goog.require('ol.asserts'); goog.require('ol.extent'); -goog.require('ol.obj'); goog.require('ol.math'); +goog.require('ol.obj'); goog.require('ol.size'); goog.require('ol.source.TileImage'); goog.require('ol.tilecoord'); diff --git a/src/ol/source/tiledebug.js b/src/ol/source/tiledebug.js index 072ae2d4b8..4d40bb02ff 100644 --- a/src/ol/source/tiledebug.js +++ b/src/ol/source/tiledebug.js @@ -1,5 +1,6 @@ goog.provide('ol.source.TileDebug'); +goog.require('ol'); goog.require('ol.Tile'); goog.require('ol.dom'); goog.require('ol.size'); diff --git a/src/ol/source/tilejson.js b/src/ol/source/tilejson.js index 18f6fbdbca..d3716a2f0c 100644 --- a/src/ol/source/tilejson.js +++ b/src/ol/source/tilejson.js @@ -7,6 +7,7 @@ goog.provide('ol.source.TileJSON'); goog.provide('ol.tilejson'); +goog.require('ol'); goog.require('ol.Attribution'); goog.require('ol.TileUrlFunction'); goog.require('ol.extent'); diff --git a/src/ol/source/tileutfgrid.js b/src/ol/source/tileutfgrid.js index 72b2f9431d..26f90d53af 100644 --- a/src/ol/source/tileutfgrid.js +++ b/src/ol/source/tileutfgrid.js @@ -1,9 +1,11 @@ goog.provide('ol.source.TileUTFGrid'); goog.require('goog.async.nextTick'); +goog.require('ol'); goog.require('ol.Attribution'); goog.require('ol.Tile'); goog.require('ol.TileUrlFunction'); +goog.require('ol.asserts'); goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); diff --git a/src/ol/source/tilewms.js b/src/ol/source/tilewms.js index f4d111f4c4..f3f143f8e5 100644 --- a/src/ol/source/tilewms.js +++ b/src/ol/source/tilewms.js @@ -5,6 +5,7 @@ goog.provide('ol.source.TileWMS'); goog.require('ol'); +goog.require('ol.asserts'); goog.require('ol.extent'); goog.require('ol.obj'); goog.require('ol.math'); diff --git a/src/ol/source/urltile.js b/src/ol/source/urltile.js index c2962b1eaf..1cbc28bc19 100644 --- a/src/ol/source/urltile.js +++ b/src/ol/source/urltile.js @@ -1,5 +1,6 @@ goog.provide('ol.source.UrlTile'); +goog.require('ol'); goog.require('ol.Tile'); goog.require('ol.TileUrlFunction'); goog.require('ol.source.Tile'); diff --git a/src/ol/source/vector.js b/src/ol/source/vector.js index 7cec3a8edc..a12c7bb089 100644 --- a/src/ol/source/vector.js +++ b/src/ol/source/vector.js @@ -9,11 +9,13 @@ goog.require('ol'); goog.require('ol.Collection'); goog.require('ol.ObjectEventType'); goog.require('ol.array'); +goog.require('ol.asserts'); goog.require('ol.events'); goog.require('ol.events.Event'); goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.featureloader'); +goog.require('ol.functions'); goog.require('ol.loadingstrategy'); goog.require('ol.obj'); goog.require('ol.source.Source'); diff --git a/src/ol/source/vectortile.js b/src/ol/source/vectortile.js index 2ce0a19c53..49a34b6ca4 100644 --- a/src/ol/source/vectortile.js +++ b/src/ol/source/vectortile.js @@ -1,5 +1,6 @@ goog.provide('ol.source.VectorTile'); +goog.require('ol'); goog.require('ol.Tile'); goog.require('ol.VectorTile'); goog.require('ol.events'); diff --git a/src/ol/source/xyz.js b/src/ol/source/xyz.js index a0f31bddda..17db092215 100644 --- a/src/ol/source/xyz.js +++ b/src/ol/source/xyz.js @@ -1,5 +1,6 @@ goog.provide('ol.source.XYZ'); +goog.require('ol'); goog.require('ol.source.TileImage'); goog.require('ol.tilegrid'); diff --git a/src/ol/source/zoomify.js b/src/ol/source/zoomify.js index b4474029d4..173647a9f4 100644 --- a/src/ol/source/zoomify.js +++ b/src/ol/source/zoomify.js @@ -3,6 +3,7 @@ goog.provide('ol.source.Zoomify'); goog.require('ol'); goog.require('ol.ImageTile'); goog.require('ol.Tile'); +goog.require('ol.asserts'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.source.TileImage'); diff --git a/src/ol/structs/priorityqueue.js b/src/ol/structs/priorityqueue.js index 2a597ef210..c8bc69e5ea 100644 --- a/src/ol/structs/priorityqueue.js +++ b/src/ol/structs/priorityqueue.js @@ -1,5 +1,6 @@ goog.provide('ol.structs.PriorityQueue'); +goog.require('ol.asserts'); goog.require('ol.obj'); diff --git a/src/ol/style/fill.js b/src/ol/style/fill.js index e78403faf3..5b503bc023 100644 --- a/src/ol/style/fill.js +++ b/src/ol/style/fill.js @@ -1,5 +1,6 @@ goog.provide('ol.style.Fill'); +goog.require('ol'); goog.require('ol.color'); diff --git a/src/ol/style/iconimage.js b/src/ol/style/iconimage.js index 838aa198e5..fc73960301 100644 --- a/src/ol/style/iconimage.js +++ b/src/ol/style/iconimage.js @@ -5,6 +5,7 @@ goog.require('ol.dom'); goog.require('ol.events'); goog.require('ol.events.EventTarget'); goog.require('ol.events.EventType'); +goog.require('ol.style'); goog.require('ol.style.ImageState'); diff --git a/src/ol/tilecache.js b/src/ol/tilecache.js index 8ca6d4b478..f72c4ed1cf 100644 --- a/src/ol/tilecache.js +++ b/src/ol/tilecache.js @@ -1,5 +1,6 @@ goog.provide('ol.TileCache'); +goog.require('ol'); goog.require('ol.structs.LRUCache'); goog.require('ol.tilecoord'); diff --git a/src/ol/tilegrid/wmts.js b/src/ol/tilegrid/wmts.js index 61277d7729..4666e7544d 100644 --- a/src/ol/tilegrid/wmts.js +++ b/src/ol/tilegrid/wmts.js @@ -1,5 +1,6 @@ goog.provide('ol.tilegrid.WMTS'); +goog.require('ol'); goog.require('ol.proj'); goog.require('ol.tilegrid.TileGrid'); diff --git a/test/spec/ol/geom/flat/transform.test.js b/test/spec/ol/geom/flat/transform.test.js index 489c05eaae..b6397d32d3 100644 --- a/test/spec/ol/geom/flat/transform.test.js +++ b/test/spec/ol/geom/flat/transform.test.js @@ -1,6 +1,5 @@ goog.provide('ol.test.geom.flat.transform'); -goog.require('ol.geom'); goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.flat.transform');