From 5c6b5cb4955b4ec6580e68fecad01fce9a176aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Tue, 16 Oct 2012 21:45:52 +0200 Subject: [PATCH 1/2] Add BingMaps exports --- src/ol/exports.txt | 10 ++++++++++ src/ol/source/bingmaps.js | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/ol/exports.txt b/src/ol/exports.txt index 6b6d09418c..f59f548c69 100644 --- a/src/ol/exports.txt +++ b/src/ol/exports.txt @@ -124,6 +124,16 @@ @exportProperty ol.overlay.Overlay.prototype.setMap @exportSymbol ol.source.BingMaps +@exportSymbol ol.BingMapsStyle +@exportProperty ol.BingMapsStyle.AERIAL +@exportProperty ol.BingMapsStyle.AERIAL_WITH_LABELS +@exportProperty ol.BingMapsStyle.ROAD +@exportProperty ol.BingMapsStyle.ORDNANCE_SURVEY +@exportProperty ol.BingMapsStyle.COLLINS_BART +@exportObjectLiteral ol.source.BingMapsOptions +@exportObjectLiteralProperty ol.source.BingMapsOptions.culture string|undefined +@exportObjectLiteralProperty ol.source.BingMapsOptions.key string +@exportObjectLiteralProperty ol.source.BingMapsOptions.style ol.BingMapsStyle @exportSymbol ol.source.MapQuestOSM diff --git a/src/ol/source/bingmaps.js b/src/ol/source/bingmaps.js index 339abd5811..d1b6bfd729 100644 --- a/src/ol/source/bingmaps.js +++ b/src/ol/source/bingmaps.js @@ -1,4 +1,5 @@ goog.provide('ol.source.BingMaps'); +goog.provide('ol.BingMapsStyle'); goog.require('goog.Uri'); goog.require('goog.events'); @@ -21,15 +22,6 @@ ol.BingMapsStyle = { }; -/** - * @typedef {{culture: (string|undefined), - * key: string, - * style: ol.BingMapsStyle}} - */ -ol.source.BingMapsOptions; - - - /** * @constructor * @extends {ol.source.TileSource} From 1f7ecd2529da3a43b4d4f43f5d751e9604d466a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Tue, 16 Oct 2012 21:50:20 +0200 Subject: [PATCH 2/2] Make linter happy --- src/ol/source/bingmaps.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ol/source/bingmaps.js b/src/ol/source/bingmaps.js index d1b6bfd729..1b805faf93 100644 --- a/src/ol/source/bingmaps.js +++ b/src/ol/source/bingmaps.js @@ -1,5 +1,5 @@ -goog.provide('ol.source.BingMaps'); goog.provide('ol.BingMapsStyle'); +goog.provide('ol.source.BingMaps'); goog.require('goog.Uri'); goog.require('goog.events'); @@ -22,6 +22,7 @@ ol.BingMapsStyle = { }; + /** * @constructor * @extends {ol.source.TileSource}