From 2caa1139a1adc5e91f7d490ec5d33421287a5d5a Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Thu, 22 May 2014 15:33:09 +0200 Subject: [PATCH] Move object literals defined in ol3 to a separate section --- externs/olx.js | 126 ++++++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 60 deletions(-) diff --git a/externs/olx.js b/externs/olx.js index b74602a707..2302efb277 100644 --- a/externs/olx.js +++ b/externs/olx.js @@ -4,6 +4,9 @@ var olx; +/* typedefs for object literals provided by applications */ + + /** * @typedef {{html: string, * tileRanges: (Object.>|undefined)}} @@ -64,44 +67,6 @@ olx.DeviceOrientationOptions; olx.DeviceOrientationOptions.prototype.tracking; -/** - * @typedef {{animate: boolean, - * attributions: Object., - * coordinateToPixelMatrix: goog.vec.Mat4.Number, - * extent: (null|ol.Extent), - * focus: ol.Coordinate, - * index: number, - * layerStates: Object., - * layerStatesArray: Array., - * logos: Object., - * pixelRatio: number, - * pixelToCoordinateMatrix: goog.vec.Mat4.Number, - * postRenderFunctions: Array., - * size: ol.Size, - * skippedFeatureUids_: Object., - * tileQueue: ol.TileQueue, - * time: number, - * usedTiles: Object.>, - * view2DState: olx.View2DState, - * viewHints: Array., - * wantedTiles: Object.>}} - * @todo api - */ -olx.FrameState; - - -/** @type {number} */ -olx.FrameState.prototype.pixelRatio; - - -/** @type {number} */ -olx.FrameState.prototype.time; - - -/** @type {olx.View2DState} */ -olx.FrameState.prototype.view2DState; - - /** * @typedef {{tracking: (boolean|undefined), * trackingOptions: (GeolocationPositionOptions|undefined), @@ -532,28 +497,6 @@ olx.View2DOptions.prototype.zoom; olx.View2DOptions.prototype.zoomFactor; -/** - * @typedef {{center: ol.Coordinate, - * projection: ol.proj.Projection, - * resolution: number, - * rotation: number}} - * @todo api - */ -olx.View2DState; - - -/** @type {ol.Coordinate} */ -olx.View2DState.prototype.center; - - -/** @type {number} */ -olx.View2DState.prototype.resolution; - - -/** @type {number} */ -olx.View2DState.prototype.rotation; - - /** * @typedef {{resolution: number, * start: (number|undefined), @@ -5022,3 +4965,66 @@ olx.View2D.fitGeometryOptions.prototype.nearest; * @type {number|undefined} */ olx.View2D.fitGeometryOptions.prototype.minResolution; + + +/* typedefs for object literals exposed by the library */ + + +/** + * @typedef {{animate: boolean, + * attributions: Object., + * coordinateToPixelMatrix: goog.vec.Mat4.Number, + * extent: (null|ol.Extent), + * focus: ol.Coordinate, + * index: number, + * layerStates: Object., + * layerStatesArray: Array., + * logos: Object., + * pixelRatio: number, + * pixelToCoordinateMatrix: goog.vec.Mat4.Number, + * postRenderFunctions: Array., + * size: ol.Size, + * skippedFeatureUids_: Object., + * tileQueue: ol.TileQueue, + * time: number, + * usedTiles: Object.>, + * view2DState: olx.View2DState, + * viewHints: Array., + * wantedTiles: Object.>}} + * @todo api + */ +olx.FrameState; + + +/** @type {number} */ +olx.FrameState.prototype.pixelRatio; + + +/** @type {number} */ +olx.FrameState.prototype.time; + + +/** @type {olx.View2DState} */ +olx.FrameState.prototype.view2DState; + + +/** + * @typedef {{center: ol.Coordinate, + * projection: ol.proj.Projection, + * resolution: number, + * rotation: number}} + * @todo api + */ +olx.View2DState; + + +/** @type {ol.Coordinate} */ +olx.View2DState.prototype.center; + + +/** @type {number} */ +olx.View2DState.prototype.resolution; + + +/** @type {number} */ +olx.View2DState.prototype.rotation;