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

Conflicts: src/objectliterals.jsdoc src/ol/attribution.js src/ol/geom/geometry.js src/ol/geom/geometrycollection.js src/ol/geom/linestring.js src/ol/layer/vectorlayer.exports src/ol/layer/vectorlayer.js src/ol/map.js src/ol/proj/proj.js src/ol/renderer/canvas/canvasvectorlayerrenderer.js src/ol/source/imagewmssource.js src/ol/source/tilewmssource.js src/ol/source/vectorsource.exports src/ol/source/vectorsource.js src/ol/source/wmssource.js src/ol/style/style.js src/ol/tilegrid/tilegrid.js src/ol/tilegrid/wmtstilegrid.js src/ol/tilegrid/xyztilegrid.js
2013-12-13 12:46:55 +01:00
parent cbc71686df 93e605b119
commit 35d5158454
167 changed files with 678 additions and 505 deletions
@@ -1,2 +1,2 @@
-@exportClass ol.control.Attribution ol.control.AttributionOptions
+@exportSymbol ol.control.Attribution
@exportProperty ol.control.Attribution.prototype.setMap
@@ -21,7 +21,7 @@ goog.require('ol.css');
 * be changed by using a css selector for `.ol-attribution`.
 * @constructor
 * @extends {ol.control.Control}
- * @param {ol.control.AttributionOptions=} opt_options Attribution options.
+ * @param {olx.control.AttributionOptions=} opt_options Attribution options.
 * @todo stability experimental
 */
 ol.control.Attribution = function(opt_options) {
@@ -1,3 +1,3 @@
-@exportClass ol.control.Control ol.control.ControlOptions
+@exportSymbol ol.control.Control
@exportProperty ol.control.Control.prototype.getMap
@exportProperty ol.control.Control.prototype.setMap
@@ -15,7 +15,7 @@ goog.require('ol.Object');
 * @constructor
 * @extends {ol.Object}
 * @implements {oli.control.Control}
- * @param {ol.control.ControlOptions} options Control options.
+ * @param {olx.control.ControlOptions} options Control options.
 * @todo stability experimental
 */
 ol.control.Control = function(options) {
@@ -1 +1 @@
-@exportFunction ol.control.defaults ol.control.DefaultsOptions ol.Collection
+@exportSymbol ol.control.defaults ol.control.defaults
@@ -7,7 +7,7 @@ goog.require('ol.control.Zoom');


 /**
- * @param {ol.control.DefaultsOptions=} opt_options Defaults options.
+ * @param {olx.control.DefaultsOptions=} opt_options Defaults options.
 * @return {ol.Collection} Controls.
 * @todo stability experimental
 */
@@ -1 +1 @@
-@exportClass ol.control.FullScreen ol.control.FullScreenOptions
+@exportSymbol ol.control.FullScreen
@@ -22,7 +22,7 @@ goog.require('ol.css');
 *
 * @constructor
 * @extends {ol.control.Control}
- * @param {ol.control.FullScreenOptions=} opt_options Options.
+ * @param {olx.control.FullScreenOptions=} opt_options Options.
 * @todo stability experimental
 */
 ol.control.FullScreen = function(opt_options) {
@@ -1,2 +1,2 @@
-@exportClass ol.control.Logo ol.control.LogoOptions
+@exportSymbol ol.control.Logo
@exportProperty ol.control.Logo.prototype.setMap
@@ -17,7 +17,7 @@ goog.require('ol.css');
 * be styled by using a css selector for `.ol-logo`.
 * @constructor
 * @extends {ol.control.Control}
- * @param {ol.control.LogoOptions=} opt_options Logo options.
+ * @param {olx.control.LogoOptions=} opt_options Logo options.
 * @todo stability experimental
 */
 ol.control.Logo = function(opt_options) {
@@ -1,2 +1,2 @@
-@exportClass ol.control.MousePosition ol.control.MousePositionOptions
+@exportSymbol ol.control.MousePosition
@exportProperty ol.control.MousePosition.prototype.setMap
@@ -36,7 +36,8 @@ ol.control.MousePositionProperty = {
 *
 * @constructor
 * @extends {ol.control.Control}
- * @param {ol.control.MousePositionOptions=} opt_options Mouse position options.
+ * @param {olx.control.MousePositionOptions=} opt_options Mouse position
+ *     options.
 * @todo stability experimental
 * @todo observable projection {ol.proj.Projection} the projection to report
 *       mouse position in
@@ -1,4 +1,4 @@
-@exportClass ol.control.ScaleLine ol.control.ScaleLineOptions
+@exportSymbol ol.control.ScaleLine
@exportProperty ol.control.ScaleLine.prototype.setMap

@exportSymbol ol.control.ScaleLineUnits
@@ -49,7 +49,7 @@ ol.control.ScaleLineUnits = {
 *
 * @constructor
 * @extends {ol.control.Control}
- * @param {ol.control.ScaleLineOptions=} opt_options Scale line options.
+ * @param {olx.control.ScaleLineOptions=} opt_options Scale line options.
 * @todo stability experimental
 * @todo observable units {ol.control.ScaleLineUnits} the units to use in the
 *       scale line
@@ -1,2 +1,2 @@
-@exportClass ol.control.Zoom ol.control.ZoomOptions
+@exportSymbol ol.control.Zoom
@exportProperty ol.control.Zoom.prototype.setMap
@@ -19,7 +19,7 @@ goog.require('ol.easing');
 * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
 * @constructor
 * @extends {ol.control.Control}
- * @param {ol.control.ZoomOptions=} opt_options Zoom options.
+ * @param {olx.control.ZoomOptions=} opt_options Zoom options.
 * @todo stability experimental
 */
 ol.control.Zoom = function(opt_options) {
@@ -1 +1 @@
-@exportClass ol.control.ZoomSlider ol.control.ZoomSliderOptions
+@exportSymbol ol.control.ZoomSlider
@@ -37,7 +37,7 @@ ol.control.ZOOMSLIDER_ANIMATION_DURATION = 200;
 *
 * @constructor
 * @extends {ol.control.Control}
- * @param {ol.control.ZoomSliderOptions=} opt_options Zoom slider options.
+ * @param {olx.control.ZoomSliderOptions=} opt_options Zoom slider options.
 * @todo stability experimental
 */
 ol.control.ZoomSlider = function(opt_options) {
@@ -1 +1 @@
-@exportClass ol.control.ZoomToExtent ol.control.ZoomToExtentOptions
+@exportSymbol ol.control.ZoomToExtent
@@ -17,7 +17,7 @@ goog.require('ol.css');
 * css selector `.ol-zoom-extent`.
 * @constructor
 * @extends {ol.control.Control}
- * @param {ol.control.ZoomToExtentOptions=} opt_options Options.
+ * @param {olx.control.ZoomToExtentOptions=} opt_options Options.
 * @todo stability experimental
 */
 ol.control.ZoomToExtent = function(opt_options) {