From 098bddb72fa636598f6c4c8c79fad3ceee2358d5 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 8 Apr 2013 19:03:49 +0200 Subject: [PATCH 1/2] Use goog.asserts.assertInstanceof --- src/ol/interaction/dblclickzoominteraction.js | 2 +- src/ol/interaction/draginteraction.js | 8 ++++---- src/ol/interaction/dragpaninteraction.js | 4 ++-- src/ol/interaction/dragrotateandzoominteraction.js | 2 +- src/ol/interaction/dragrotateinteraction.js | 6 +++--- src/ol/interaction/dragzoominteraction.js | 2 +- src/ol/interaction/keyboardpaninteraction.js | 2 +- src/ol/interaction/keyboardzoominteraction.js | 2 +- src/ol/interaction/mousewheelzoominteraction.js | 4 ++-- src/ol/map.js | 2 +- src/ol/projection/projection.js | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ol/interaction/dblclickzoominteraction.js b/src/ol/interaction/dblclickzoominteraction.js index 5a4946fa77..0b08c0ef58 100644 --- a/src/ol/interaction/dblclickzoominteraction.js +++ b/src/ol/interaction/dblclickzoominteraction.js @@ -47,7 +47,7 @@ ol.interaction.DblClickZoom.prototype.handleMapBrowserEvent = -this.delta_ : this.delta_; // FIXME works for View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); view.zoomByDelta(map, delta, anchor, ol.interaction.DBLCLICKZOOM_ANIMATION_DURATION); mapBrowserEvent.preventDefault(); diff --git a/src/ol/interaction/draginteraction.js b/src/ol/interaction/draginteraction.js index 9ffd72b8eb..9179a84a04 100644 --- a/src/ol/interaction/draginteraction.js +++ b/src/ol/interaction/draginteraction.js @@ -99,24 +99,24 @@ ol.interaction.Drag.prototype.handleMapBrowserEvent = var view = map.getView(); var browserEvent = mapBrowserEvent.browserEvent; if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DOWN) { - goog.asserts.assert(browserEvent instanceof goog.events.BrowserEvent); + goog.asserts.assertInstanceof(browserEvent, goog.events.BrowserEvent); this.handleDown(mapBrowserEvent); } if (this.dragging_) { if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DRAG) { - goog.asserts.assert(browserEvent instanceof goog.events.BrowserEvent); + goog.asserts.assertInstanceof(browserEvent, goog.events.BrowserEvent); this.deltaX = browserEvent.clientX - this.startX; this.deltaY = browserEvent.clientY - this.startY; this.handleDrag(mapBrowserEvent); } else if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DRAGEND) { - goog.asserts.assert(browserEvent instanceof goog.events.BrowserEvent); + goog.asserts.assertInstanceof(browserEvent, goog.events.BrowserEvent); this.deltaX = browserEvent.clientX - this.startX; this.deltaY = browserEvent.clientY - this.startY; this.handleDragEnd(mapBrowserEvent); this.dragging_ = false; } } else if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DRAGSTART) { - goog.asserts.assert(browserEvent instanceof goog.events.BrowserEvent); + goog.asserts.assertInstanceof(browserEvent, goog.events.BrowserEvent); this.startX = browserEvent.clientX; this.startY = browserEvent.clientY; this.deltaX = 0; diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js index ea0b07b81d..02561e4960 100644 --- a/src/ol/interaction/dragpaninteraction.js +++ b/src/ol/interaction/dragpaninteraction.js @@ -58,7 +58,7 @@ ol.interaction.DragPan.prototype.handleDrag = function(mapBrowserEvent) { var map = mapBrowserEvent.map; // FIXME works for View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); var resolution = view.getResolution(); var rotation = view.getRotation(); var newCenter = [-resolution * this.deltaX, resolution * this.deltaY]; @@ -124,7 +124,7 @@ ol.interaction.DragPan.prototype.handleDown = function(mapBrowserEvent) { var map = mapBrowserEvent.map; // FIXME works for View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); goog.asserts.assert(!goog.isNull(mapBrowserEvent.frameState)); if (!goog.isNull(this.kineticPreRenderFn_) && map.removePreRenderFunction(this.kineticPreRenderFn_)) { diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js index 4f2ffbab8c..1dc1bd79ca 100644 --- a/src/ol/interaction/dragrotateandzoominteraction.js +++ b/src/ol/interaction/dragrotateandzoominteraction.js @@ -56,7 +56,7 @@ ol.interaction.DragRotateAndZoom.prototype.handleDrag = var magnitude = delta.magnitude(); // FIXME works for View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); map.requestRenderFrame(); // FIXME the calls to map.rotate and map.zoomToResolution should use // map.withFrozenRendering but an assertion fails :-( diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index cfc243d826..aa928d8beb 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -52,7 +52,7 @@ ol.interaction.DragRotate.prototype.handleDrag = function(mapBrowserEvent) { var delta = theta - this.lastAngle_; var view = map.getView(); // FIXME supports View2D only - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); map.requestRenderFrame(); view.rotateWithoutConstraints(map, view.getRotation() - delta); } @@ -68,7 +68,7 @@ ol.interaction.DragRotate.prototype.handleDragEnd = function(mapBrowserEvent) { var map = mapBrowserEvent.map; // FIXME supports View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); view.rotate(map, view.getRotation(), undefined, ol.interaction.DRAGROTATE_ANIMATION_DURATION); view.setHint(ol.ViewHint.INTERACTING, -1); @@ -85,7 +85,7 @@ ol.interaction.DragRotate.prototype.handleDragStart = var map = mapBrowserEvent.map; // FIXME supports View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); map.requestRenderFrame(); this.lastAngle_ = undefined; view.setHint(ol.ViewHint.INTERACTING, 1); diff --git a/src/ol/interaction/dragzoominteraction.js b/src/ol/interaction/dragzoominteraction.js index c6ef59473f..5f5218dbfe 100644 --- a/src/ol/interaction/dragzoominteraction.js +++ b/src/ol/interaction/dragzoominteraction.js @@ -69,7 +69,7 @@ ol.interaction.DragZoom.prototype.handleDragEnd = map.withFrozenRendering(function() { // FIXME works for View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); var mapSize = /** @type {ol.Size} */ (map.getSize()); view.fitExtent(extent, mapSize); // FIXME we should preserve rotation diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js index 87c15347bb..24d86808b9 100644 --- a/src/ol/interaction/keyboardpaninteraction.js +++ b/src/ol/interaction/keyboardpaninteraction.js @@ -54,7 +54,7 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent = var map = mapBrowserEvent.map; // FIXME works for View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); var resolution = view.getResolution(); var rotation = view.getRotation(); var mapUnitsDelta = resolution * this.delta_; diff --git a/src/ol/interaction/keyboardzoominteraction.js b/src/ol/interaction/keyboardzoominteraction.js index a132841d97..dc4c6d3578 100644 --- a/src/ol/interaction/keyboardzoominteraction.js +++ b/src/ol/interaction/keyboardzoominteraction.js @@ -51,7 +51,7 @@ ol.interaction.KeyboardZoom.prototype.handleMapBrowserEvent = map.requestRenderFrame(); // FIXME works for View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); view.zoomByDelta(map, delta, undefined, ol.interaction.KEYBOARD_ZOOM_DURATION); keyEvent.preventDefault(); diff --git a/src/ol/interaction/mousewheelzoominteraction.js b/src/ol/interaction/mousewheelzoominteraction.js index 2ed15f70c3..c403944eb1 100644 --- a/src/ol/interaction/mousewheelzoominteraction.js +++ b/src/ol/interaction/mousewheelzoominteraction.js @@ -77,7 +77,7 @@ ol.interaction.MouseWheelZoom.prototype.handleMapBrowserEvent = var map = mapBrowserEvent.map; var mouseWheelEvent = /** @type {goog.events.MouseWheelEvent} */ (mapBrowserEvent.browserEvent); - goog.asserts.assert(mouseWheelEvent instanceof goog.events.MouseWheelEvent); + goog.asserts.assertInstanceof(mouseWheelEvent, goog.events.MouseWheelEvent); this.lastAnchor_ = mapBrowserEvent.getCoordinate(); this.delta_ += mouseWheelEvent.deltaY / 3; @@ -109,7 +109,7 @@ ol.interaction.MouseWheelZoom.prototype.doZoom_ = function(map) { // FIXME works for View2D only var view = map.getView(); - goog.asserts.assert(view instanceof ol.View2D); + goog.asserts.assertInstanceof(view, ol.View2D); map.requestRenderFrame(); view.zoomByDelta(map, -delta, this.lastAnchor_, diff --git a/src/ol/map.js b/src/ol/map.js index f78e50f861..c6026a7e7f 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -913,7 +913,7 @@ ol.Map.createOptionsInternal = function(options) { if (goog.isArray(options.layers)) { layers = new ol.Collection(goog.array.clone(options.layers)); } else { - goog.asserts.assert(options.layers instanceof ol.Collection); + goog.asserts.assertInstanceof(options.layers, ol.Collection); layers = options.layers; } } else { diff --git a/src/ol/projection/projection.js b/src/ol/projection/projection.js index ede75e0442..67068c383a 100644 --- a/src/ol/projection/projection.js +++ b/src/ol/projection/projection.js @@ -374,7 +374,7 @@ ol.projection.createProjection = function(projection, defaultCode) { } else if (goog.isString(projection)) { return ol.projection.get(projection); } else { - goog.asserts.assert(projection instanceof ol.Projection); + goog.asserts.assertInstanceof(projection, ol.Projection); return projection; } }; From e132943eeff23e5bc42cac28a045cb5bee56bb1a Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 8 Apr 2013 19:10:04 +0200 Subject: [PATCH 2/2] Use goog.asserts.fail --- src/ol/array.js | 2 +- src/ol/control/scalelinecontrol.js | 2 +- src/ol/dom/dom.js | 2 +- src/ol/projection/projection.js | 2 +- src/ol/renderer/canvas/canvasmaprenderer.js | 2 +- src/ol/renderer/webgl/webglmaprenderer.js | 2 +- src/ol/source/wmtssource.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ol/array.js b/src/ol/array.js index 8f0e38d062..402528fbee 100644 --- a/src/ol/array.js +++ b/src/ol/array.js @@ -74,7 +74,7 @@ ol.array.linearFindNearest = function(arr, target, direction) { } // We should never get here, but the compiler complains // if it finds a path for which no number is returned. - goog.asserts.assert(false); + goog.asserts.fail(); return n - 1; } }; diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js index 9ef8e16de6..4f43d8ce3d 100644 --- a/src/ol/control/scalelinecontrol.js +++ b/src/ol/control/scalelinecontrol.js @@ -226,7 +226,7 @@ ol.control.ScaleLine.prototype.updateElement_ = function(frameState) { pointResolution /= 1609.3472; } } else { - goog.asserts.assert(false); + goog.asserts.fail(); } var i = 3 * Math.floor( diff --git a/src/ol/dom/dom.js b/src/ol/dom/dom.js index 24f9d1cddd..ee536dc4e1 100644 --- a/src/ol/dom/dom.js +++ b/src/ol/dom/dom.js @@ -77,7 +77,7 @@ ol.dom.transformElement2D = function(element, transform, opt_precision) { ol.dom.setTransform(element, 'matrix(' + value2D + ')'); } else if (ol.dom.BrowserFeature.CAN_USE_MATRIX_FILTER) { // http://msdn.microsoft.com/en-us/library/ms533014%28VS.85,loband%29.aspx - goog.asserts.assert(false); // FIXME + goog.asserts.fail(); // FIXME } else { // FIXME check this code! var style = element.style; diff --git a/src/ol/projection/projection.js b/src/ol/projection/projection.js index 67068c383a..22d3cd9dfd 100644 --- a/src/ol/projection/projection.js +++ b/src/ol/projection/projection.js @@ -610,7 +610,7 @@ ol.projection.getTransformFromProjections = ol.projection.identityTransform = function(input, opt_output, opt_dimension) { if (goog.isDef(opt_output) && input !== opt_output) { // TODO: consider making this a warning instead - goog.asserts.assert(false, 'This should not be used internally.'); + goog.asserts.fail('This should not be used internally.'); for (var i = 0, ii = input.length; i < ii; ++i) { opt_output[i] = input[i]; } diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index 88478df7b2..69191c5bae 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -73,7 +73,7 @@ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) { } else if (layer instanceof ol.layer.Vector) { return new ol.renderer.canvas.VectorLayer(this, layer); } else { - goog.asserts.assert(false); + goog.asserts.fail(); return null; } }; diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 9bbc4888ef..d8e8050db2 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -313,7 +313,7 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) { } else if (layer instanceof ol.layer.ImageLayer) { layerRenderer = new ol.renderer.webgl.ImageLayer(this, layer); } else { - goog.asserts.assert(false); + goog.asserts.fail(); } return layerRenderer; }; diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index c9b1c15876..51cdbd037d 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -235,7 +235,7 @@ ol.source.WMTS.optionsFromCapabilities = function(wmtsCap, layer) { goog.asserts.assert(urls.length > 0); break; default: - goog.asserts.assert(false); + goog.asserts.fail(); } return {