From 44e04be67fa0d54ed3a09f1057c3fa5c7c0ae0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Harrtell?= Date: Sun, 20 Mar 2016 19:39:00 +0100 Subject: [PATCH] Get rid of goog.functions --- src/ol/events/condition.js | 6 +++--- src/ol/functions.js | 17 +++++++++++++++++ src/ol/geom/geometry.js | 4 ++-- src/ol/geom/simplegeometry.js | 4 ++-- src/ol/interaction/draganddropinteraction.js | 4 ++-- src/ol/interaction/dragpaninteraction.js | 3 ++- src/ol/interaction/dragrotateinteraction.js | 3 ++- src/ol/interaction/drawinteraction.js | 3 ++- src/ol/interaction/keyboardpaninteraction.js | 16 +++++++++++----- src/ol/interaction/pinchrotateinteraction.js | 4 ++-- src/ol/interaction/pinchzoominteraction.js | 4 ++-- src/ol/interaction/pointerinteraction.js | 9 +++++---- src/ol/interaction/selectinteraction.js | 6 +++--- src/ol/interaction/snapinteraction.js | 5 +++-- src/ol/map.js | 8 ++++---- src/ol/render/webgl/webglreplay.js | 10 ++++++++-- .../renderer/canvas/canvasimagelayerrenderer.js | 4 ++-- src/ol/renderer/layerrenderer.js | 6 +++--- src/ol/renderer/maprenderer.js | 4 ++-- .../renderer/webgl/webglimagelayerrenderer.js | 6 +++--- src/ol/style/atlasmanager.js | 4 +--- src/ol/webgl/shader.js | 4 ++-- test/spec/ol/structs/priorityqueue.test.js | 13 ++++++++----- 23 files changed, 91 insertions(+), 56 deletions(-) create mode 100644 src/ol/functions.js diff --git a/src/ol/events/condition.js b/src/ol/events/condition.js index d6fba5543d..4e623c536d 100644 --- a/src/ol/events/condition.js +++ b/src/ol/events/condition.js @@ -2,7 +2,7 @@ goog.provide('ol.events.ConditionType'); goog.provide('ol.events.condition'); goog.require('goog.asserts'); -goog.require('goog.functions'); +goog.require('ol.functions'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.MapBrowserPointerEvent'); @@ -59,7 +59,7 @@ ol.events.condition.altShiftKeysOnly = function(mapBrowserEvent) { * @function * @api stable */ -ol.events.condition.always = goog.functions.TRUE; +ol.events.condition.always = ol.functions.TRUE; /** @@ -98,7 +98,7 @@ ol.events.condition.mouseActionButton = function(mapBrowserEvent) { * @function * @api stable */ -ol.events.condition.never = goog.functions.FALSE; +ol.events.condition.never = ol.functions.FALSE; /** diff --git a/src/ol/functions.js b/src/ol/functions.js new file mode 100644 index 0000000000..4541a4f555 --- /dev/null +++ b/src/ol/functions.js @@ -0,0 +1,17 @@ +goog.provide('ol.functions'); + +/** + * Always returns true. + * @returns {boolean} true. + */ +ol.functions.TRUE = function() { + return true; +}; + +/** + * Always returns false. + * @returns {boolean} false. + */ +ol.functions.FALSE = function() { + return false; +}; diff --git a/src/ol/geom/geometry.js b/src/ol/geom/geometry.js index 5d60a0a1dd..fe5b1c47d3 100644 --- a/src/ol/geom/geometry.js +++ b/src/ol/geom/geometry.js @@ -3,7 +3,7 @@ goog.provide('ol.geom.GeometryLayout'); goog.provide('ol.geom.GeometryType'); goog.require('goog.asserts'); -goog.require('goog.functions'); +goog.require('ol.functions'); goog.require('ol.Object'); goog.require('ol.extent'); goog.require('ol.proj'); @@ -151,7 +151,7 @@ ol.geom.Geometry.prototype.computeExtent = goog.abstractMethod; * @param {number} y Y. * @return {boolean} Contains (x, y). */ -ol.geom.Geometry.prototype.containsXY = goog.functions.FALSE; +ol.geom.Geometry.prototype.containsXY = ol.functions.FALSE; /** diff --git a/src/ol/geom/simplegeometry.js b/src/ol/geom/simplegeometry.js index 50281175bd..668a6004e1 100644 --- a/src/ol/geom/simplegeometry.js +++ b/src/ol/geom/simplegeometry.js @@ -1,7 +1,7 @@ goog.provide('ol.geom.SimpleGeometry'); goog.require('goog.asserts'); -goog.require('goog.functions'); +goog.require('ol.functions'); goog.require('ol.extent'); goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryLayout'); @@ -84,7 +84,7 @@ ol.geom.SimpleGeometry.getStrideForLayout = function(layout) { /** * @inheritDoc */ -ol.geom.SimpleGeometry.prototype.containsXY = goog.functions.FALSE; +ol.geom.SimpleGeometry.prototype.containsXY = ol.functions.FALSE; /** diff --git a/src/ol/interaction/draganddropinteraction.js b/src/ol/interaction/draganddropinteraction.js index 0ae6c663d5..62f6cbc377 100644 --- a/src/ol/interaction/draganddropinteraction.js +++ b/src/ol/interaction/draganddropinteraction.js @@ -4,7 +4,7 @@ goog.provide('ol.interaction.DragAndDrop'); goog.provide('ol.interaction.DragAndDropEvent'); goog.require('goog.asserts'); -goog.require('goog.functions'); +goog.require('ol.functions'); goog.require('ol.events'); goog.require('ol.events.Event'); goog.require('ol.events.EventType'); @@ -134,7 +134,7 @@ ol.interaction.DragAndDrop.prototype.handleResult_ = function(file, event) { * @this {ol.interaction.DragAndDrop} * @api */ -ol.interaction.DragAndDrop.handleEvent = goog.functions.TRUE; +ol.interaction.DragAndDrop.handleEvent = ol.functions.TRUE; /** diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js index 77e434354a..2ec593a466 100644 --- a/src/ol/interaction/dragpaninteraction.js +++ b/src/ol/interaction/dragpaninteraction.js @@ -6,6 +6,7 @@ goog.require('ol.Pixel'); goog.require('ol.PreRenderFunction'); goog.require('ol.ViewHint'); goog.require('ol.coordinate'); +goog.require('ol.functions'); goog.require('ol.events.condition'); goog.require('ol.interaction.Pointer'); @@ -165,4 +166,4 @@ ol.interaction.DragPan.handleDownEvent_ = function(mapBrowserEvent) { /** * @inheritDoc */ -ol.interaction.DragPan.prototype.shouldStopEvent = goog.functions.FALSE; +ol.interaction.DragPan.prototype.shouldStopEvent = ol.functions.FALSE; diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index bdf59c903f..4fe2745de6 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -2,6 +2,7 @@ goog.provide('ol.interaction.DragRotate'); goog.require('ol'); goog.require('ol.ViewHint'); +goog.require('ol.functions'); goog.require('ol.events.ConditionType'); goog.require('ol.events.condition'); goog.require('ol.interaction.Interaction'); @@ -128,4 +129,4 @@ ol.interaction.DragRotate.handleDownEvent_ = function(mapBrowserEvent) { /** * @inheritDoc */ -ol.interaction.DragRotate.prototype.shouldStopEvent = goog.functions.FALSE; +ol.interaction.DragRotate.prototype.shouldStopEvent = ol.functions.FALSE; diff --git a/src/ol/interaction/drawinteraction.js b/src/ol/interaction/drawinteraction.js index 43e71eecb3..0b38d43c77 100644 --- a/src/ol/interaction/drawinteraction.js +++ b/src/ol/interaction/drawinteraction.js @@ -14,6 +14,7 @@ goog.require('ol.MapBrowserEvent'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.Object'); goog.require('ol.coordinate'); +goog.require('ol.functions'); goog.require('ol.events.condition'); goog.require('ol.geom.Circle'); goog.require('ol.geom.GeometryType'); @@ -741,7 +742,7 @@ ol.interaction.Draw.prototype.extend = function(feature) { /** * @inheritDoc */ -ol.interaction.Draw.prototype.shouldStopEvent = goog.functions.FALSE; +ol.interaction.Draw.prototype.shouldStopEvent = ol.functions.FALSE; /** diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js index 44eaf415a1..b833f4c9e3 100644 --- a/src/ol/interaction/keyboardpaninteraction.js +++ b/src/ol/interaction/keyboardpaninteraction.js @@ -1,7 +1,6 @@ goog.provide('ol.interaction.KeyboardPan'); goog.require('goog.asserts'); -goog.require('goog.functions'); goog.require('ol'); goog.require('ol.coordinate'); goog.require('ol.events.ConditionType'); @@ -36,14 +35,22 @@ ol.interaction.KeyboardPan = function(opt_options) { var options = opt_options || {}; + /** + * @private + * @param {ol.MapBrowserEvent} mapBrowserEvent Browser event. + * @return {boolean} Combined condition result. + */ + this.defaultCondition_ = function(mapBrowserEvent) { + return ol.events.condition.noModifierKeys.call(this, mapBrowserEvent) && + ol.events.condition.targetNotEditable.call(this, mapBrowserEvent) + } + /** * @private * @type {ol.events.ConditionType} */ this.condition_ = options.condition !== undefined ? - options.condition : - goog.functions.and(ol.events.condition.noModifierKeys, - ol.events.condition.targetNotEditable); + options.condition : this.defaultCondition_ /** * @private @@ -61,7 +68,6 @@ ol.interaction.KeyboardPan = function(opt_options) { }; goog.inherits(ol.interaction.KeyboardPan, ol.interaction.Interaction); - /** * Handles the {@link ol.MapBrowserEvent map browser event} if it was a * `KeyEvent`, and decides the direction to pan to (if an arrow key was diff --git a/src/ol/interaction/pinchrotateinteraction.js b/src/ol/interaction/pinchrotateinteraction.js index e751c00847..c19ea64e1c 100644 --- a/src/ol/interaction/pinchrotateinteraction.js +++ b/src/ol/interaction/pinchrotateinteraction.js @@ -1,9 +1,9 @@ goog.provide('ol.interaction.PinchRotate'); goog.require('goog.asserts'); -goog.require('goog.functions'); goog.require('ol'); goog.require('ol.Coordinate'); +goog.require('ol.functions'); goog.require('ol.ViewHint'); goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Pointer'); @@ -170,4 +170,4 @@ ol.interaction.PinchRotate.handleDownEvent_ = function(mapBrowserEvent) { /** * @inheritDoc */ -ol.interaction.PinchRotate.prototype.shouldStopEvent = goog.functions.FALSE; +ol.interaction.PinchRotate.prototype.shouldStopEvent = ol.functions.FALSE; diff --git a/src/ol/interaction/pinchzoominteraction.js b/src/ol/interaction/pinchzoominteraction.js index e3378ddbc0..199ade3035 100644 --- a/src/ol/interaction/pinchzoominteraction.js +++ b/src/ol/interaction/pinchzoominteraction.js @@ -1,9 +1,9 @@ goog.provide('ol.interaction.PinchZoom'); goog.require('goog.asserts'); -goog.require('goog.functions'); goog.require('ol'); goog.require('ol.Coordinate'); +goog.require('ol.functions'); goog.require('ol.ViewHint'); goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Pointer'); @@ -153,4 +153,4 @@ ol.interaction.PinchZoom.handleDownEvent_ = function(mapBrowserEvent) { /** * @inheritDoc */ -ol.interaction.PinchZoom.prototype.shouldStopEvent = goog.functions.FALSE; +ol.interaction.PinchZoom.prototype.shouldStopEvent = ol.functions.FALSE; diff --git a/src/ol/interaction/pointerinteraction.js b/src/ol/interaction/pointerinteraction.js index 9595649d19..f5fb0a00a2 100644 --- a/src/ol/interaction/pointerinteraction.js +++ b/src/ol/interaction/pointerinteraction.js @@ -1,6 +1,5 @@ goog.provide('ol.interaction.Pointer'); -goog.require('goog.functions'); goog.require('ol'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.MapBrowserPointerEvent'); @@ -150,7 +149,7 @@ ol.interaction.Pointer.handleDragEvent = ol.nullFunction; * @return {boolean} Capture dragging. * @this {ol.interaction.Pointer} */ -ol.interaction.Pointer.handleUpEvent = goog.functions.FALSE; +ol.interaction.Pointer.handleUpEvent = ol.functions.FALSE; /** @@ -158,7 +157,7 @@ ol.interaction.Pointer.handleUpEvent = goog.functions.FALSE; * @return {boolean} Capture dragging. * @this {ol.interaction.Pointer} */ -ol.interaction.Pointer.handleDownEvent = goog.functions.FALSE; +ol.interaction.Pointer.handleDownEvent = ol.functions.FALSE; /** @@ -215,4 +214,6 @@ ol.interaction.Pointer.handleEvent = function(mapBrowserEvent) { * @return {boolean} Should the event be stopped? * @protected */ -ol.interaction.Pointer.prototype.shouldStopEvent = goog.functions.identity; +ol.interaction.Pointer.prototype.shouldStopEvent = function(handled) { + return handled; +}; diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js index e12eb95ae0..4de492e1f7 100644 --- a/src/ol/interaction/selectinteraction.js +++ b/src/ol/interaction/selectinteraction.js @@ -4,7 +4,7 @@ goog.provide('ol.interaction.SelectEventType'); goog.provide('ol.interaction.SelectFilterFunction'); goog.require('goog.asserts'); -goog.require('goog.functions'); +goog.require('ol.functions'); goog.require('ol.CollectionEventType'); goog.require('ol.Feature'); goog.require('ol.array'); @@ -148,7 +148,7 @@ ol.interaction.Select = function(opt_options) { * @type {ol.interaction.SelectFilterFunction} */ this.filter_ = options.filter ? options.filter : - goog.functions.TRUE; + ol.functions.TRUE; var featureOverlay = new ol.layer.Vector({ source: new ol.source.Vector({ @@ -190,7 +190,7 @@ ol.interaction.Select = function(opt_options) { }; } } else { - layerFilter = goog.functions.TRUE; + layerFilter = ol.functions.TRUE; } /** diff --git a/src/ol/interaction/snapinteraction.js b/src/ol/interaction/snapinteraction.js index 826a13b4f3..3a95011202 100644 --- a/src/ol/interaction/snapinteraction.js +++ b/src/ol/interaction/snapinteraction.js @@ -16,6 +16,7 @@ goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.geom.Geometry'); goog.require('ol.interaction.Pointer'); +goog.require('ol.functions'); goog.require('ol.object'); goog.require('ol.source.Vector'); goog.require('ol.source.VectorEvent'); @@ -49,7 +50,7 @@ ol.interaction.Snap = function(opt_options) { goog.base(this, { handleEvent: ol.interaction.Snap.handleEvent_, - handleDownEvent: goog.functions.TRUE, + handleDownEvent: ol.functions.TRUE, handleUpEvent: ol.interaction.Snap.handleUpEvent_ }); @@ -364,7 +365,7 @@ ol.interaction.Snap.prototype.setMap = function(map) { /** * @inheritDoc */ -ol.interaction.Snap.prototype.shouldStopEvent = goog.functions.FALSE; +ol.interaction.Snap.prototype.shouldStopEvent = ol.functions.FALSE; /** diff --git a/src/ol/map.js b/src/ol/map.js index 7166974bcb..eb1bd4ca3c 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -8,7 +8,6 @@ goog.provide('ol.MapProperty'); goog.require('goog.asserts'); goog.require('goog.async.nextTick'); goog.require('goog.dom'); -goog.require('goog.functions'); goog.require('goog.style'); goog.require('goog.vec.Mat4'); goog.require('ol.Collection'); @@ -35,6 +34,7 @@ goog.require('ol.events'); goog.require('ol.events.Event'); goog.require('ol.events.EventType'); goog.require('ol.extent'); +goog.require('ol.functions'); goog.require('ol.has'); goog.require('ol.interaction'); goog.require('ol.layer.Base'); @@ -624,7 +624,7 @@ ol.Map.prototype.forEachFeatureAtPixel = function(pixel, callback, opt_this, opt var coordinate = this.getCoordinateFromPixel(pixel); var thisArg = opt_this !== undefined ? opt_this : null; var layerFilter = opt_layerFilter !== undefined ? - opt_layerFilter : goog.functions.TRUE; + opt_layerFilter : ol.functions.TRUE; var thisArg2 = opt_this2 !== undefined ? opt_this2 : null; return this.renderer_.forEachFeatureAtCoordinate( coordinate, this.frameState_, callback, thisArg, @@ -660,7 +660,7 @@ ol.Map.prototype.forEachLayerAtPixel = function(pixel, callback, opt_this, opt_l } var thisArg = opt_this !== undefined ? opt_this : null; var layerFilter = opt_layerFilter !== undefined ? - opt_layerFilter : goog.functions.TRUE; + opt_layerFilter : ol.functions.TRUE; var thisArg2 = opt_this2 !== undefined ? opt_this2 : null; return this.renderer_.forEachLayerAtPixel( pixel, this.frameState_, callback, thisArg, @@ -689,7 +689,7 @@ ol.Map.prototype.hasFeatureAtPixel = function(pixel, opt_layerFilter, opt_this) } var coordinate = this.getCoordinateFromPixel(pixel); var layerFilter = opt_layerFilter !== undefined ? - opt_layerFilter : goog.functions.TRUE; + opt_layerFilter : ol.functions.TRUE; var thisArg = opt_this !== undefined ? opt_this : null; return this.renderer_.hasFeatureAtCoordinate( coordinate, this.frameState_, layerFilter, thisArg); diff --git a/src/ol/render/webgl/webglreplay.js b/src/ol/render/webgl/webglreplay.js index 10d3e1d68c..a25b21de8c 100644 --- a/src/ol/render/webgl/webglreplay.js +++ b/src/ol/render/webgl/webglreplay.js @@ -2,7 +2,6 @@ goog.provide('ol.render.webgl.ImageReplay'); goog.provide('ol.render.webgl.ReplayGroup'); goog.require('goog.asserts'); -goog.require('goog.functions'); goog.require('goog.vec.Mat4'); goog.require('ol.extent'); goog.require('ol.object'); @@ -954,7 +953,14 @@ ol.render.webgl.ReplayGroup.prototype.getDeleteResourcesFunction = function(cont functions.push( this.replays_[replayKey].getDeleteResourcesFunction(context)); } - return goog.functions.sequence.apply(null, functions); + return function() { + var length = functions.length; + var result; + for (var i = 0; i < length; i++) { + result = functions[i].apply(this, arguments); + } + return result; + }; }; diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index 94cb00d390..0526f7f3f9 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -1,8 +1,8 @@ goog.provide('ol.renderer.canvas.ImageLayer'); goog.require('goog.asserts'); -goog.require('goog.functions'); goog.require('goog.vec.Mat4'); +goog.require('ol.functions'); goog.require('ol.ImageBase'); goog.require('ol.ViewHint'); goog.require('ol.dom'); @@ -87,7 +87,7 @@ ol.renderer.canvas.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, fr ol.vec.Mat4.multVec2( frameState.pixelToCoordinateMatrix, coordinate, coordinate); var hasFeature = this.forEachFeatureAtCoordinate( - coordinate, frameState, goog.functions.TRUE, this); + coordinate, frameState, ol.functions.TRUE, this); if (hasFeature) { return callback.call(thisArg, this.getLayer()); diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js index 61a7f42711..4111ff1f64 100644 --- a/src/ol/renderer/layerrenderer.js +++ b/src/ol/renderer/layerrenderer.js @@ -3,8 +3,8 @@ goog.provide('ol.renderer.Layer'); goog.require('goog.asserts'); goog.require('ol.events'); goog.require('ol.events.EventType'); -goog.require('goog.functions'); goog.require('ol'); +goog.require('ol.functions'); goog.require('ol.ImageState'); goog.require('ol.Observable'); goog.require('ol.TileRange'); @@ -63,7 +63,7 @@ ol.renderer.Layer.prototype.forEachLayerAtPixel = function(pixel, frameState, ca frameState.pixelToCoordinateMatrix, coordinate, coordinate); var hasFeature = this.forEachFeatureAtCoordinate( - coordinate, frameState, goog.functions.TRUE, this); + coordinate, frameState, ol.functions.TRUE, this); if (hasFeature) { return callback.call(thisArg, this.layer_); @@ -78,7 +78,7 @@ ol.renderer.Layer.prototype.forEachLayerAtPixel = function(pixel, frameState, ca * @param {olx.FrameState} frameState Frame state. * @return {boolean} Is there a feature at the given coordinate? */ -ol.renderer.Layer.prototype.hasFeatureAtCoordinate = goog.functions.FALSE; +ol.renderer.Layer.prototype.hasFeatureAtCoordinate = ol.functions.FALSE; /** diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index eab340e91b..dd8ce1f251 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -2,13 +2,13 @@ goog.provide('ol.RendererType'); goog.provide('ol.renderer.Map'); goog.require('goog.asserts'); -goog.require('goog.functions'); goog.require('goog.vec.Mat4'); goog.require('ol'); goog.require('ol.Disposable'); goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); +goog.require('ol.functions'); goog.require('ol.layer.Layer'); goog.require('ol.renderer.Layer'); goog.require('ol.style.IconImageCache'); @@ -232,7 +232,7 @@ ol.renderer.Map.prototype.forEachLayerAtPixel = function(pixel, frameState, call */ ol.renderer.Map.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, layerFilter, thisArg) { var hasFeature = this.forEachFeatureAtCoordinate( - coordinate, frameState, goog.functions.TRUE, this, layerFilter, thisArg); + coordinate, frameState, ol.functions.TRUE, this, layerFilter, thisArg); return hasFeature !== undefined; }; diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 43a6061a96..b804599d1a 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -1,7 +1,6 @@ goog.provide('ol.renderer.webgl.ImageLayer'); goog.require('goog.asserts'); -goog.require('goog.functions'); goog.require('goog.vec.Mat4'); goog.require('goog.webgl'); goog.require('ol.Coordinate'); @@ -10,6 +9,7 @@ goog.require('ol.ImageBase'); goog.require('ol.ViewHint'); goog.require('ol.dom'); goog.require('ol.extent'); +goog.require('ol.functions'); goog.require('ol.layer.Image'); goog.require('ol.proj'); goog.require('ol.renderer.webgl.Layer'); @@ -221,7 +221,7 @@ ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = function(canvas */ ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) { var hasFeature = this.forEachFeatureAtCoordinate( - coordinate, frameState, goog.functions.TRUE, this); + coordinate, frameState, ol.functions.TRUE, this); return hasFeature !== undefined; }; @@ -241,7 +241,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, fra ol.vec.Mat4.multVec2( frameState.pixelToCoordinateMatrix, coordinate, coordinate); var hasFeature = this.forEachFeatureAtCoordinate( - coordinate, frameState, goog.functions.TRUE, this); + coordinate, frameState, ol.functions.TRUE, this); if (hasFeature) { return callback.call(thisArg, this.getLayer()); diff --git a/src/ol/style/atlasmanager.js b/src/ol/style/atlasmanager.js index ef1759fc8e..e1c2021630 100644 --- a/src/ol/style/atlasmanager.js +++ b/src/ol/style/atlasmanager.js @@ -2,10 +2,8 @@ goog.provide('ol.style.Atlas'); goog.provide('ol.style.AtlasManager'); goog.require('goog.asserts'); -goog.require('goog.functions'); goog.require('ol'); - /** * Provides information for an image inside an atlas manager. * `offsetX` and `offsetY` is the position of the image inside @@ -186,7 +184,7 @@ ol.style.AtlasManager.prototype.add = function(id, width, height, // the hit-detection atlas, to make sure that the offset is the same for // the original image and the hit-detection image. var renderHitCallback = opt_renderHitCallback !== undefined ? - opt_renderHitCallback : goog.functions.NULL; + opt_renderHitCallback : ol.nullFunction /** @type {?ol.style.AtlasInfo} */ var hitInfo = this.add_(true, diff --git a/src/ol/webgl/shader.js b/src/ol/webgl/shader.js index 5c2909ec7a..16398a5787 100644 --- a/src/ol/webgl/shader.js +++ b/src/ol/webgl/shader.js @@ -3,8 +3,8 @@ goog.provide('ol.webgl.Shader'); goog.provide('ol.webgl.Vertex'); goog.provide('ol.webgl.shader'); -goog.require('goog.functions'); goog.require('goog.webgl'); +goog.require('ol.functions'); goog.require('ol.webgl'); @@ -41,7 +41,7 @@ ol.webgl.Shader.prototype.getSource = function() { /** * @return {boolean} Is animated? */ -ol.webgl.Shader.prototype.isAnimated = goog.functions.FALSE; +ol.webgl.Shader.prototype.isAnimated = ol.functions.FALSE; /** diff --git a/test/spec/ol/structs/priorityqueue.test.js b/test/spec/ol/structs/priorityqueue.test.js index 1c9aded427..aa2264dca0 100644 --- a/test/spec/ol/structs/priorityqueue.test.js +++ b/test/spec/ol/structs/priorityqueue.test.js @@ -3,12 +3,16 @@ goog.provide('ol.test.structs.PriorityQueue'); describe('ol.structs.PriorityQueue', function() { + var identity = function(a) { + return a; + } + describe('when empty', function() { var pq; beforeEach(function() { pq = new ol.structs.PriorityQueue( - goog.functions.identity, goog.functions.identity); + identity, identity); }); it('is valid', function() { @@ -65,7 +69,7 @@ describe('ol.structs.PriorityQueue', function() { beforeEach(function() { elements = []; pq = new ol.structs.PriorityQueue( - goog.functions.identity, goog.functions.identity); + identity, identity); var element, i; for (i = 0; i < 32; ++i) { element = Math.random(); @@ -92,7 +96,7 @@ describe('ol.structs.PriorityQueue', function() { target = 0.5; pq = new ol.structs.PriorityQueue(function(element) { return Math.abs(element - target); - }, goog.functions.identity); + }, identity); var i; for (i = 0; i < 32; ++i) { pq.enqueue(Math.random()); @@ -149,7 +153,7 @@ describe('ol.structs.PriorityQueue', function() { var pq; beforeEach(function() { pq = new ol.structs.PriorityQueue( - goog.functions.identity, goog.functions.identity); + identity, identity); pq.enqueue('a'); pq.enqueue('b'); pq.enqueue('c'); @@ -194,5 +198,4 @@ describe('ol.structs.PriorityQueue', function() { }); -goog.require('goog.functions'); goog.require('ol.structs.PriorityQueue');