From 7c660f6ac0e1930b1a543417910d29b2476d0f38 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 17 Jan 2013 22:39:47 +0100 Subject: [PATCH 1/6] Export animation functions, thanks @elemoine --- src/ol/animation.exports | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/ol/animation.exports diff --git a/src/ol/animation.exports b/src/ol/animation.exports new file mode 100644 index 0000000000..7286bf8cc3 --- /dev/null +++ b/src/ol/animation.exports @@ -0,0 +1,4 @@ +@exportSymbol ol.animation +@exportProperty ol.animation.createBounce +@exportProperty ol.animation.createPanFrom +@exportProperty ol.animation.createSpin From 0122c6cc0c1dc8c643f8e62a63a250c660e521d9 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Fri, 18 Jan 2013 00:17:09 +0100 Subject: [PATCH 2/6] Export ol.tilegrid.TileGridOptions --- src/objectliterals.exports | 7 +++++++ src/ol/tilegrid/tilegrid.exports | 1 + src/ol/tilegrid/tilegrid.js | 11 ----------- 3 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 src/ol/tilegrid/tilegrid.exports diff --git a/src/objectliterals.exports b/src/objectliterals.exports index 9ba2c520b3..a7499dc259 100644 --- a/src/objectliterals.exports +++ b/src/objectliterals.exports @@ -63,6 +63,13 @@ @exportObjectLiteralProperty ol.source.TiledWMSOptions.url string|undefined @exportObjectLiteralProperty ol.source.TiledWMSOptions.urls Array.|undefined +@exportObjectLiteral ol.tilegrid.TileGridOptions +@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.extent ol.Extent|undefined +@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.origin ol.Coordinate|undefined +@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.origins Array.|undefined +@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.resolutions !Array. +@exportObjectLiteralProperty ol.tilegrid.TileGridOptions.tileSize ol.Size|undefined + @exportObjectLiteral ol.View2DOptions @exportObjectLiteralProperty ol.View2DOptions.center ol.Coordinate|undefined @exportObjectLiteralProperty ol.View2DOptions.maxResolution number|undefined diff --git a/src/ol/tilegrid/tilegrid.exports b/src/ol/tilegrid/tilegrid.exports new file mode 100644 index 0000000000..f276cab084 --- /dev/null +++ b/src/ol/tilegrid/tilegrid.exports @@ -0,0 +1 @@ +@exportClass ol.tilegrid.TileGrid ol.tilegrid.TileGridOptions diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index 6edd839fa9..188692861c 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -1,7 +1,6 @@ // FIXME cope with tile grids whose minium zoom is not zero goog.provide('ol.tilegrid.TileGrid'); -goog.provide('ol.tilegrid.TileGridOptions'); goog.require('goog.array'); goog.require('goog.asserts'); @@ -20,16 +19,6 @@ goog.require('ol.array'); ol.DEFAULT_TILE_SIZE = 256; -/** - * @typedef {{extent: (ol.Extent|undefined), - * origin: (ol.Coordinate|undefined), - * origins: (Array.|undefined), - * resolutions: !Array., - * tileSize: (ol.Size|undefined)}} - */ -ol.tilegrid.TileGridOptions; - - /** * @constructor From 4f2c657cf2a683066cfd1e3698ab8fb448f2e49c Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Fri, 18 Jan 2013 00:17:35 +0100 Subject: [PATCH 3/6] Export ol.tilegrid.XYZOptions --- src/objectliterals.exports | 3 +++ src/ol/tilegrid/xyztilegrid.exports | 1 + src/ol/tilegrid/xyztilegrid.js | 7 ------- 3 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 src/ol/tilegrid/xyztilegrid.exports diff --git a/src/objectliterals.exports b/src/objectliterals.exports index a7499dc259..4b5c7c6383 100644 --- a/src/objectliterals.exports +++ b/src/objectliterals.exports @@ -70,6 +70,9 @@ @exportObjectLiteralProperty ol.tilegrid.TileGridOptions.resolutions !Array. @exportObjectLiteralProperty ol.tilegrid.TileGridOptions.tileSize ol.Size|undefined +@exportObjectLiteral ol.tilegrid.XYZOptions +@exportObjectLiteralProperty ol.tilegrid.XYZOptions.maxZoom number + @exportObjectLiteral ol.View2DOptions @exportObjectLiteralProperty ol.View2DOptions.center ol.Coordinate|undefined @exportObjectLiteralProperty ol.View2DOptions.maxResolution number|undefined diff --git a/src/ol/tilegrid/xyztilegrid.exports b/src/ol/tilegrid/xyztilegrid.exports new file mode 100644 index 0000000000..dd5b52245c --- /dev/null +++ b/src/ol/tilegrid/xyztilegrid.exports @@ -0,0 +1 @@ +@exportClass ol.tilegrid.XYZ ol.tilegrid.XYZOptions diff --git a/src/ol/tilegrid/xyztilegrid.js b/src/ol/tilegrid/xyztilegrid.js index aa30336997..b7b16faf60 100644 --- a/src/ol/tilegrid/xyztilegrid.js +++ b/src/ol/tilegrid/xyztilegrid.js @@ -1,5 +1,4 @@ goog.provide('ol.tilegrid.XYZ'); -goog.provide('ol.tilegrid.XYZOptions'); goog.require('ol.Coordinate'); goog.require('ol.Projection'); @@ -8,12 +7,6 @@ goog.require('ol.TileRange'); goog.require('ol.tilegrid.TileGrid'); -/** - * @typedef {{maxZoom: number}} - */ -ol.tilegrid.XYZOptions; - - /** * @constructor From 76e600d5f66eccd8b856625c1633e7d7da2501f9 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Fri, 18 Jan 2013 00:18:41 +0100 Subject: [PATCH 4/6] Fix Stamen exports --- src/objectliterals.exports | 4 ++++ src/ol/source/stamen.exports | 19 +++++++++++++++++++ src/ol/source/stamensource.js | 12 +++--------- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/objectliterals.exports b/src/objectliterals.exports index 4b5c7c6383..171672ef67 100644 --- a/src/objectliterals.exports +++ b/src/objectliterals.exports @@ -51,6 +51,10 @@ @exportObjectLiteralProperty ol.source.BingMapsOptions.key string @exportObjectLiteralProperty ol.source.BingMapsOptions.style ol.BingMapsStyle +@exportObjectLiteral ol.source.StamenOptions +@exportObjectLiteralProperty ol.source.StamenOptions.flavor string|undefined +@exportObjectLiteralProperty ol.source.StamenOptions.provider string + @exportObjectLiteral ol.source.TiledWMSOptions @exportObjectLiteralProperty ol.source.TiledWMSOptions.attributions Array.|undefined @exportObjectLiteralProperty ol.source.TiledWMSOptions.params Object diff --git a/src/ol/source/stamen.exports b/src/ol/source/stamen.exports index bc110646c5..40b2c8b0e7 100644 --- a/src/ol/source/stamen.exports +++ b/src/ol/source/stamen.exports @@ -1,2 +1,21 @@ @exportSymbol ol.source.Stamen +@exportSymbol ol.source.StamenFlavor +@exportProperty ol.source.StamenFlavor.TERRAIN_BACKGROUND +@exportProperty ol.source.StamenFlavor.TERRAIN_LABELS +@exportProperty ol.source.StamenFlavor.TERRAIN_LINES +@exportProperty ol.source.StamenFlavor.TONER_2010 +@exportProperty ol.source.StamenFlavor.TONER_2011 +@exportProperty ol.source.StamenFlavor.TONER_2011_LABELS +@exportProperty ol.source.StamenFlavor.TONER_2011_LINES +@exportProperty ol.source.StamenFlavor.TONER_2011_LITE +@exportProperty ol.source.StamenFlavor.TONER_BACKGROUND +@exportProperty ol.source.StamenFlavor.TONER_HYBRID +@exportProperty ol.source.StamenFlavor.TONER_LABELS +@exportProperty ol.source.StamenFlavor.TONER_LINES +@exportProperty ol.source.StamenFlavor.TONER_LITE + +@exportSymbol ol.source.StamenProvider +@exportProperty ol.source.StamenProvider.TERRAIN +@exportProperty ol.source.StamenProvider.TONER +@exportProperty ol.source.StamenProvider.WATERCOLOR diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamensource.js index 089f8ece76..6c68e8e720 100644 --- a/src/ol/source/stamensource.js +++ b/src/ol/source/stamensource.js @@ -1,6 +1,8 @@ // FIXME Configure minZoom when supported by TileGrid goog.provide('ol.source.Stamen'); +goog.provide('ol.source.StamenFlavor'); +goog.provide('ol.source.StamenProvider'); goog.require('ol.source.XYZ'); @@ -25,13 +27,6 @@ ol.source.StamenFlavor = { }; -/** - * @typedef {{flavor: (ol.source.StamenFlavor|undefined), - * provider: ol.source.StamenProvider}} - */ -ol.source.StamenOptions; - - /** * @enum {string} */ @@ -43,8 +38,7 @@ ol.source.StamenProvider = { /** - * @type {Object.} + * @type {Object.} */ ol.source.StamenProviderConfig = {}; ol.source.StamenProviderConfig[ol.source.StamenProvider.TERRAIN] = { From d34a71e453abd57d59b9abb9c811db5b5dc07817 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Fri, 18 Jan 2013 00:19:22 +0100 Subject: [PATCH 5/6] Export ol.RendererHints.createFromQueryData --- src/ol/map.exports | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ol/map.exports b/src/ol/map.exports index 85ac465dfd..b8cb394c18 100644 --- a/src/ol/map.exports +++ b/src/ol/map.exports @@ -7,4 +7,5 @@ @exportProperty ol.RendererHint.DOM @exportProperty ol.RendererHint.WEBGL - +@exportSymbol ol.RendererHints +@exportProperty ol.RendererHints.createFromQueryData From e3c85dec8e6046fd527e2674c3ad9d58c9e51470 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Fri, 18 Jan 2013 00:19:45 +0100 Subject: [PATCH 6/6] Export ol.View2D --- src/ol/view2d.exports | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/ol/view2d.exports diff --git a/src/ol/view2d.exports b/src/ol/view2d.exports new file mode 100644 index 0000000000..aada08d7f3 --- /dev/null +++ b/src/ol/view2d.exports @@ -0,0 +1 @@ +@exportClass ol.View2D ol.View2DOptions