From ddc990500a6f16ece7e1cbbcf7d606a859ab7f38 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sun, 2 Mar 2014 12:19:28 +0100 Subject: [PATCH 1/3] Sort exports files alphabetically --- src/ol/featureoverlay.exports | 2 +- src/ol/format/kmlformat.exports | 2 +- src/ol/render/canvas/canvasimmediate.exports | 6 +++--- src/ol/source/vectorsource.exports | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ol/featureoverlay.exports b/src/ol/featureoverlay.exports index 9cfe34b200..b471a281f6 100644 --- a/src/ol/featureoverlay.exports +++ b/src/ol/featureoverlay.exports @@ -3,7 +3,7 @@ @exportProperty ol.FeatureOverlay.prototype.getFeatures @exportProperty ol.FeatureOverlay.prototype.getStyle @exportProperty ol.FeatureOverlay.prototype.getStyleFunction +@exportProperty ol.FeatureOverlay.prototype.removeFeature @exportProperty ol.FeatureOverlay.prototype.setFeatures @exportProperty ol.FeatureOverlay.prototype.setMap @exportProperty ol.FeatureOverlay.prototype.setStyle -@exportProperty ol.FeatureOverlay.prototype.removeFeature diff --git a/src/ol/format/kmlformat.exports b/src/ol/format/kmlformat.exports index ba709cfdd0..72929f6fd4 100644 --- a/src/ol/format/kmlformat.exports +++ b/src/ol/format/kmlformat.exports @@ -1,6 +1,6 @@ @exportSymbol ol.format.KML -@exportProperty ol.format.KML.prototype.readName @exportProperty ol.format.KML.prototype.readFeature @exportProperty ol.format.KML.prototype.readFeatures @exportProperty ol.format.KML.prototype.readGeometry +@exportProperty ol.format.KML.prototype.readName @exportProperty ol.format.KML.prototype.readProjection diff --git a/src/ol/render/canvas/canvasimmediate.exports b/src/ol/render/canvas/canvasimmediate.exports index cd7b6e8e2a..18aa8dbc63 100644 --- a/src/ol/render/canvas/canvasimmediate.exports +++ b/src/ol/render/canvas/canvasimmediate.exports @@ -1,11 +1,11 @@ @exportProperty ol.render.canvas.Immediate.prototype.drawAsync @exportProperty ol.render.canvas.Immediate.prototype.drawCircleGeometry @exportProperty ol.render.canvas.Immediate.prototype.drawFeature -@exportProperty ol.render.canvas.Immediate.prototype.drawPointGeometry @exportProperty ol.render.canvas.Immediate.prototype.drawLineStringGeometry -@exportProperty ol.render.canvas.Immediate.prototype.drawPolygonGeometry -@exportProperty ol.render.canvas.Immediate.prototype.drawMultiPointGeometry @exportProperty ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry @exportProperty ol.render.canvas.Immediate.prototype.drawMultiPointGeometry +@exportProperty ol.render.canvas.Immediate.prototype.drawMultiPointGeometry +@exportProperty ol.render.canvas.Immediate.prototype.drawPointGeometry +@exportProperty ol.render.canvas.Immediate.prototype.drawPolygonGeometry @exportProperty ol.render.canvas.Immediate.prototype.setFillStrokeStyle @exportProperty ol.render.canvas.Immediate.prototype.setImageStyle diff --git a/src/ol/source/vectorsource.exports b/src/ol/source/vectorsource.exports index 6117cb3ec8..fc941919fb 100644 --- a/src/ol/source/vectorsource.exports +++ b/src/ol/source/vectorsource.exports @@ -1,10 +1,10 @@ @exportSymbol ol.source.Vector @exportProperty ol.source.Vector.prototype.addFeature @exportProperty ol.source.Vector.prototype.addFeatures -@exportProperty ol.source.Vector.prototype.getClosestFeatureToCoordinate -@exportProperty ol.source.Vector.prototype.getExtent @exportProperty ol.source.Vector.prototype.forEachFeature @exportProperty ol.source.Vector.prototype.forEachFeatureInExtent @exportProperty ol.source.Vector.prototype.getAllFeatures @exportProperty ol.source.Vector.prototype.getAllFeaturesAtCoordinate +@exportProperty ol.source.Vector.prototype.getClosestFeatureToCoordinate +@exportProperty ol.source.Vector.prototype.getExtent @exportProperty ol.source.Vector.prototype.removeFeature From 95674a5a4ccf48f2fada2d1f14dfdd4530678eee Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sun, 2 Mar 2014 12:20:14 +0100 Subject: [PATCH 2/3] Export ol.render.canvas.Immediate#setTextStyle --- src/ol/render/canvas/canvasimmediate.exports | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ol/render/canvas/canvasimmediate.exports b/src/ol/render/canvas/canvasimmediate.exports index 18aa8dbc63..8654add64a 100644 --- a/src/ol/render/canvas/canvasimmediate.exports +++ b/src/ol/render/canvas/canvasimmediate.exports @@ -9,3 +9,4 @@ @exportProperty ol.render.canvas.Immediate.prototype.drawPolygonGeometry @exportProperty ol.render.canvas.Immediate.prototype.setFillStrokeStyle @exportProperty ol.render.canvas.Immediate.prototype.setImageStyle +@exportProperty ol.render.canvas.Immediate.prototype.setTextStyle From b2aa9bb19fefb32d878443ab6f3194407df7c340 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sun, 2 Mar 2014 12:24:09 +0100 Subject: [PATCH 3/3] Export ol.DragBoxEvent coordinate as a property, not a function --- externs/oli.js | 10 ++++++++++ src/ol/interaction/dragboxinteraction.exports | 2 -- src/ol/interaction/dragboxinteraction.js | 14 +++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/externs/oli.js b/externs/oli.js index 731886a2d8..9e4d5632fe 100644 --- a/externs/oli.js +++ b/externs/oli.js @@ -18,6 +18,16 @@ oli.CollectionEvent = function() {}; oli.CollectionEvent.prototype.element; + +/** @interface */ +oli.DragBoxEvent; + + +/** @type {ol.Coordinate} */ +oli.DragBoxEvent.prototype.coordinate; + + + /** @interface */ oli.DrawEvent; diff --git a/src/ol/interaction/dragboxinteraction.exports b/src/ol/interaction/dragboxinteraction.exports index 7553395958..7b578e067a 100644 --- a/src/ol/interaction/dragboxinteraction.exports +++ b/src/ol/interaction/dragboxinteraction.exports @@ -1,4 +1,2 @@ @exportSymbol ol.interaction.DragBox @exportProperty ol.interaction.DragBox.prototype.getGeometry - -@exportProperty ol.DragBoxEvent.prototype.getCoordinate diff --git a/src/ol/interaction/dragboxinteraction.js b/src/ol/interaction/dragboxinteraction.js index 44cdf04267..f12f1c2f7c 100644 --- a/src/ol/interaction/dragboxinteraction.js +++ b/src/ol/interaction/dragboxinteraction.js @@ -44,30 +44,22 @@ ol.DragBoxEventType = { * @param {ol.Coordinate} coordinate The event coordinate. * @extends {goog.events.Event} * @constructor + * @implements {oli.DragBoxEvent} */ ol.DragBoxEvent = function(type, coordinate) { goog.base(this, type); /** * The coordinate of the drag event. + * @const * @type {ol.Coordinate} - * @private */ - this.coordinate_ = coordinate; + this.coordinate = coordinate; }; goog.inherits(ol.DragBoxEvent, goog.events.Event); -/** - * Get the name of the property associated with this event. - * @return {ol.Coordinate} Event coordinate. - */ -ol.DragBoxEvent.prototype.getCoordinate = function() { - return this.coordinate_; -}; - - /** * @constructor