ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'openlayers/master' into vector-api

Browse Source
This commit is contained in:
Tom Payne
2014-01-02 18:28:30 +01:00
parent 8fb44e024b 94c22055be
commit 2342f83a48
12 changed files with 389 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/objectliterals.jsdoc
View File

@@ -758,6 +758,17 @@
* @todo stability experimental
*/
/**
* @typedef {Object} olx.source.ZoomifyOptions
* @property {Array.<ol.Attribution>|undefined} attributions Attributions.
* @property {null|string|undefined} crossOrigin Cross origin setting for image
* requests.
* @property {string|undefined} logo Logo.
* @property {!string} url Prefix of URL template.
* @property {ol.Size} size Size of the image.
* @todo stability experimental
*/
/**
* @typedef {Object} olx.style.CircleOptions
* @property {ol.style.Fill|undefined} fill Fill style.
@@ -841,3 +852,9 @@
* @property {number} maxZoom Maximum zoom.
* @todo stability experimental
*/
/**
* @typedef {Object} olx.tilegrid.ZoomifyOptions
* @property {!Array.<number>} resolutions Resolutions.
* @todo stability experimental
*/