From d5fd2156326f31f25526f166764fa2bb04716dd9 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Sun, 30 Jul 2017 23:18:09 +0200 Subject: [PATCH] Fix ol.interaction.Extent event type and documentation --- externs/oli.js | 11 +++++++++++ src/ol/interaction/extent.js | 21 +++++---------------- src/ol/interaction/extenteventtype.js | 14 ++++++++++++++ 3 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 src/ol/interaction/extenteventtype.js diff --git a/externs/oli.js b/externs/oli.js index c45c80b969..c39b57d96d 100644 --- a/externs/oli.js +++ b/externs/oli.js @@ -91,6 +91,17 @@ oli.DrawEvent = function() {}; oli.DrawEvent.prototype.feature; +/** + * @interface + */ +oli.ExtentEvent = function() {}; + + +/** + * @type {ol.Extent} + */ +oli.ExtentEvent.prototype.extent; + /** * @interface */ diff --git a/src/ol/interaction/extent.js b/src/ol/interaction/extent.js index 5c8faff478..9a905d44b9 100644 --- a/src/ol/interaction/extent.js +++ b/src/ol/interaction/extent.js @@ -10,6 +10,7 @@ goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); +goog.require('ol.interaction.ExtentEventType'); goog.require('ol.interaction.Pointer'); goog.require('ol.layer.Vector'); goog.require('ol.source.Vector'); @@ -445,31 +446,19 @@ ol.interaction.Extent.prototype.setExtent = function(extent) { * this type. * * @constructor + * @implements {oli.ExtentEvent} * @param {ol.Extent} extent the new extent * @extends {ol.events.Event} */ ol.interaction.Extent.Event = function(extent) { - ol.events.Event.call(this, ol.interaction.Extent.EventType_.EXTENTCHANGED); + ol.events.Event.call(this, ol.interaction.ExtentEventType.EXTENTCHANGED); /** * The current extent. * @type {ol.Extent} * @api */ - this.extent_ = extent; + this.extent = extent; + }; ol.inherits(ol.interaction.Extent.Event, ol.events.Event); - - -/** - * @enum {string} - * @private - */ -ol.interaction.Extent.EventType_ = { - /** - * Triggered after the extent is changed - * @event ol.interaction.Extent.Event - * @api - */ - EXTENTCHANGED: 'extentchanged' -}; diff --git a/src/ol/interaction/extenteventtype.js b/src/ol/interaction/extenteventtype.js new file mode 100644 index 0000000000..57a5a13a86 --- /dev/null +++ b/src/ol/interaction/extenteventtype.js @@ -0,0 +1,14 @@ +goog.provide('ol.interaction.ExtentEventType'); + + +/** + * @enum {string} + */ +ol.interaction.ExtentEventType = { + /** + * Triggered after the extent is changed + * @event ol.interaction.Extent.Event#extentchanged + * @api + */ + EXTENTCHANGED: 'extentchanged' +};