From 8ec90a204511b7727010c6ef5699f3a2b084041d Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 3 Feb 2015 17:27:24 +0100 Subject: [PATCH 1/4] Remove unnecessary newlines --- src/ol/interaction/dragrotateandzoominteraction.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js index a39d5e0094..1b40065cc1 100644 --- a/src/ol/interaction/dragrotateandzoominteraction.js +++ b/src/ol/interaction/dragrotateandzoominteraction.js @@ -62,8 +62,7 @@ ol.interaction.DragRotateAndZoom = function(opt_options) { this.lastScaleDelta_ = 0; }; -goog.inherits(ol.interaction.DragRotateAndZoom, - ol.interaction.Pointer); +goog.inherits(ol.interaction.DragRotateAndZoom, ol.interaction.Pointer); /** From 65c2f7de5ffec921a9076070581b75a4febe9f6f Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 3 Feb 2015 17:33:06 +0100 Subject: [PATCH 2/4] Remove unused goog.require --- src/ol/control/rotatecontrol.js | 1 - src/ol/format/gml/gml2format.js | 1 - src/ol/format/gml/gml3format.js | 1 - src/ol/format/gml/gmlbaseformat.js | 1 - src/ol/format/wmsgetfeatureinfoformat.js | 1 - src/ol/geom/point.js | 1 - src/ol/interaction/dragrotateandzoominteraction.js | 1 - src/ol/interaction/dragrotateinteraction.js | 1 - src/ol/interaction/interaction.js | 1 - src/ol/interaction/pointerinteraction.js | 1 - src/ol/layer/layer.js | 1 - src/ol/map.js | 1 - src/ol/render/ireplay.js | 1 - src/ol/renderer/dom/domlayerrenderer.js | 1 - src/ol/tilecache.js | 1 - 15 files changed, 15 deletions(-) diff --git a/src/ol/control/rotatecontrol.js b/src/ol/control/rotatecontrol.js index fc84d65828..785380217b 100644 --- a/src/ol/control/rotatecontrol.js +++ b/src/ol/control/rotatecontrol.js @@ -1,6 +1,5 @@ goog.provide('ol.control.Rotate'); -goog.require('goog.asserts'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); goog.require('goog.dom.classlist'); diff --git a/src/ol/format/gml/gml2format.js b/src/ol/format/gml/gml2format.js index 2dd3cfe3e7..9b5774a75e 100644 --- a/src/ol/format/gml/gml2format.js +++ b/src/ol/format/gml/gml2format.js @@ -1,7 +1,6 @@ goog.provide('ol.format.GML2'); goog.require('goog.asserts'); -goog.require('goog.dom'); goog.require('goog.dom.NodeType'); goog.require('ol.extent'); goog.require('ol.format.GML'); diff --git a/src/ol/format/gml/gml3format.js b/src/ol/format/gml/gml3format.js index 8a0176d85c..1595f9ada0 100644 --- a/src/ol/format/gml/gml3format.js +++ b/src/ol/format/gml/gml3format.js @@ -3,7 +3,6 @@ goog.provide('ol.format.GML3'); goog.require('goog.array'); goog.require('goog.asserts'); -goog.require('goog.dom'); goog.require('goog.dom.NodeType'); goog.require('goog.object'); goog.require('ol.Feature'); diff --git a/src/ol/format/gml/gmlbaseformat.js b/src/ol/format/gml/gmlbaseformat.js index 9f4db2c16c..771d526b2f 100644 --- a/src/ol/format/gml/gmlbaseformat.js +++ b/src/ol/format/gml/gmlbaseformat.js @@ -5,7 +5,6 @@ goog.provide('ol.format.GMLBase'); goog.require('goog.array'); goog.require('goog.asserts'); -goog.require('goog.dom'); goog.require('goog.dom.NodeType'); goog.require('goog.object'); goog.require('goog.string'); diff --git a/src/ol/format/wmsgetfeatureinfoformat.js b/src/ol/format/wmsgetfeatureinfoformat.js index cedb4011f6..e0e51fe4ab 100644 --- a/src/ol/format/wmsgetfeatureinfoformat.js +++ b/src/ol/format/wmsgetfeatureinfoformat.js @@ -2,7 +2,6 @@ goog.provide('ol.format.WMSGetFeatureInfo'); goog.require('goog.array'); goog.require('goog.asserts'); -goog.require('goog.dom'); goog.require('goog.dom.NodeType'); goog.require('goog.object'); goog.require('goog.string'); diff --git a/src/ol/geom/point.js b/src/ol/geom/point.js index 60d85d054b..cbd895ab19 100644 --- a/src/ol/geom/point.js +++ b/src/ol/geom/point.js @@ -1,6 +1,5 @@ goog.provide('ol.geom.Point'); -goog.require('goog.asserts'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.SimpleGeometry'); diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js index 1b40065cc1..4c31e8f3a6 100644 --- a/src/ol/interaction/dragrotateandzoominteraction.js +++ b/src/ol/interaction/dragrotateandzoominteraction.js @@ -1,6 +1,5 @@ goog.provide('ol.interaction.DragRotateAndZoom'); -goog.require('goog.asserts'); goog.require('goog.math.Vec2'); goog.require('ol'); goog.require('ol.ViewHint'); diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index 68907fac80..877aa227dc 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -1,6 +1,5 @@ goog.provide('ol.interaction.DragRotate'); -goog.require('goog.asserts'); goog.require('ol'); goog.require('ol.ViewHint'); goog.require('ol.events.ConditionType'); diff --git a/src/ol/interaction/interaction.js b/src/ol/interaction/interaction.js index 3db0a9c405..dae4ef1e4e 100644 --- a/src/ol/interaction/interaction.js +++ b/src/ol/interaction/interaction.js @@ -3,7 +3,6 @@ goog.provide('ol.interaction.Interaction'); goog.provide('ol.interaction.InteractionProperty'); -goog.require('goog.asserts'); goog.require('ol.MapBrowserEvent'); goog.require('ol.Object'); goog.require('ol.animation'); diff --git a/src/ol/interaction/pointerinteraction.js b/src/ol/interaction/pointerinteraction.js index ba730b2807..8df39d5747 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.asserts'); goog.require('goog.functions'); goog.require('goog.object'); goog.require('ol.MapBrowserEvent.EventType'); diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index 6ad78fafc2..b50d21942e 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -1,6 +1,5 @@ goog.provide('ol.layer.Layer'); -goog.require('goog.asserts'); goog.require('goog.events'); goog.require('goog.events.EventType'); goog.require('goog.object'); diff --git a/src/ol/map.js b/src/ol/map.js index 16620afb8b..e85ebf0212 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -5,7 +5,6 @@ goog.provide('ol.Map'); goog.provide('ol.MapProperty'); -goog.require('goog.Uri.QueryData'); goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.async.AnimationDelay'); diff --git a/src/ol/render/ireplay.js b/src/ol/render/ireplay.js index 78e2faf67a..701b391be7 100644 --- a/src/ol/render/ireplay.js +++ b/src/ol/render/ireplay.js @@ -1,6 +1,5 @@ goog.provide('ol.render.IReplayGroup'); -goog.require('goog.functions'); goog.require('ol.render.IVectorContext'); diff --git a/src/ol/renderer/dom/domlayerrenderer.js b/src/ol/renderer/dom/domlayerrenderer.js index 072e32435e..6425ba5091 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('goog.dom'); goog.require('ol.layer.Layer'); goog.require('ol.renderer.Layer'); diff --git a/src/ol/tilecache.js b/src/ol/tilecache.js index 931da1332b..e5af596239 100644 --- a/src/ol/tilecache.js +++ b/src/ol/tilecache.js @@ -1,6 +1,5 @@ goog.provide('ol.TileCache'); -goog.require('goog.asserts'); goog.require('ol'); goog.require('ol.TileRange'); goog.require('ol.structs.LRUCache'); From 078d3fb0074ff8bdd97960f5d5771bdeba5f3d3a Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 4 Feb 2015 09:17:52 +0100 Subject: [PATCH 3/4] Add missing goog.require --- src/ol/interaction/pinchrotateinteraction.js | 1 + src/ol/interaction/pinchzoominteraction.js | 1 + src/ol/map.js | 1 + src/ol/renderer/canvas/canvasimagelayerrenderer.js | 1 + src/ol/renderer/layerrenderer.js | 1 + src/ol/renderer/maprenderer.js | 1 + src/ol/renderer/webgl/webglimagelayerrenderer.js | 1 + src/ol/style/atlasmanager.js | 1 + 8 files changed, 8 insertions(+) diff --git a/src/ol/interaction/pinchrotateinteraction.js b/src/ol/interaction/pinchrotateinteraction.js index b685c66698..08911fceb6 100644 --- a/src/ol/interaction/pinchrotateinteraction.js +++ b/src/ol/interaction/pinchrotateinteraction.js @@ -1,6 +1,7 @@ goog.provide('ol.interaction.PinchRotate'); goog.require('goog.asserts'); +goog.require('goog.functions'); goog.require('goog.style'); goog.require('ol'); goog.require('ol.Coordinate'); diff --git a/src/ol/interaction/pinchzoominteraction.js b/src/ol/interaction/pinchzoominteraction.js index 5150281d86..7d200ba4de 100644 --- a/src/ol/interaction/pinchzoominteraction.js +++ b/src/ol/interaction/pinchzoominteraction.js @@ -1,6 +1,7 @@ goog.provide('ol.interaction.PinchZoom'); goog.require('goog.asserts'); +goog.require('goog.functions'); goog.require('goog.style'); goog.require('ol.Coordinate'); goog.require('ol.ViewHint'); diff --git a/src/ol/map.js b/src/ol/map.js index e85ebf0212..ec1e7e397a 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -21,6 +21,7 @@ goog.require('goog.events.KeyHandler'); goog.require('goog.events.KeyHandler.EventType'); goog.require('goog.events.MouseWheelHandler'); goog.require('goog.events.MouseWheelHandler.EventType'); +goog.require('goog.functions'); goog.require('goog.log'); goog.require('goog.log.Level'); goog.require('goog.object'); diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index 8edd16d709..201806b1ed 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -1,6 +1,7 @@ goog.provide('ol.renderer.canvas.ImageLayer'); goog.require('goog.asserts'); +goog.require('goog.functions'); goog.require('goog.vec.Mat4'); goog.require('ol.ImageBase'); goog.require('ol.ViewHint'); diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js index 1519d679d1..98df08d768 100644 --- a/src/ol/renderer/layerrenderer.js +++ b/src/ol/renderer/layerrenderer.js @@ -4,6 +4,7 @@ goog.require('goog.Disposable'); goog.require('goog.asserts'); goog.require('goog.events'); goog.require('goog.events.EventType'); +goog.require('goog.functions'); goog.require('ol.ImageState'); goog.require('ol.TileRange'); goog.require('ol.TileState'); diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index bc6ba4666c..5397f6a470 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -4,6 +4,7 @@ goog.provide('ol.renderer.Map'); goog.require('goog.Disposable'); goog.require('goog.asserts'); goog.require('goog.dispose'); +goog.require('goog.functions'); goog.require('goog.object'); goog.require('goog.vec.Mat4'); goog.require('ol.layer.Layer'); diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index af74c1e244..e4d001e99d 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -1,6 +1,7 @@ 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'); diff --git a/src/ol/style/atlasmanager.js b/src/ol/style/atlasmanager.js index f6e3d2c870..8daea3b279 100644 --- a/src/ol/style/atlasmanager.js +++ b/src/ol/style/atlasmanager.js @@ -4,6 +4,7 @@ goog.provide('ol.style.AtlasManager'); goog.require('goog.asserts'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); +goog.require('goog.functions'); goog.require('goog.object'); goog.require('ol'); From a0a4369c24f2bba4d3c3a8ab54cd5f925bd948a8 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 4 Feb 2015 09:37:33 +0100 Subject: [PATCH 4/4] Fix ol.format.GPX.TRKSEG_NODE_FACTORY_ type definition --- src/ol/format/gpxformat.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ol/format/gpxformat.js b/src/ol/format/gpxformat.js index 81719ef074..ec234de049 100644 --- a/src/ol/format/gpxformat.js +++ b/src/ol/format/gpxformat.js @@ -738,10 +738,7 @@ ol.format.GPX.TRK_SERIALIZERS_ = ol.xml.makeStructureNS( /** * @const - * @param {*} value Value. - * @param {Array.<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. - * @return {Node|undefined} Node. + * @type {function(*, Array.<*>, string=): (Node|undefined)} * @private */ ol.format.GPX.TRKSEG_NODE_FACTORY_ = ol.xml.makeSimpleNodeFactory('trkpt');