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

src/ol/source/bingmapssource.exports

@@ -1,2 +1,2 @@
-@exportClass ol.source.BingMaps ol.source.BingMapsOptions
+@exportSymbol ol.source.BingMaps
 @exportProperty ol.source.BingMaps.TOS_ATTRIBUTION

src/ol/source/bingmapssource.js

@@ -18,7 +18,7 @@ goog.require('ol.tilegrid.XYZ');
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @param {ol.source.BingMapsOptions} options Bing Maps options.
+ * @param {olx.source.BingMapsOptions} options Bing Maps options.
  * @todo stability experimental
  */
 ol.source.BingMaps = function(options) {

src/ol/source/debugtilesource.exports

@@ -1 +1 @@
-@exportClass ol.source.TileDebug ol.source.TileDebugOptions
+@exportSymbol ol.source.TileDebug

src/ol/source/debugtilesource.js

@@ -85,7 +85,7 @@ ol.DebugTile_.prototype.getImage = function(opt_context) {
 /**
  * @constructor
  * @extends {ol.source.Tile}
- * @param {ol.source.TileDebugOptions} options Debug tile options.
+ * @param {olx.source.TileDebugOptions} options Debug tile options.
  * @todo stability experimental
  */
 ol.source.TileDebug = function(options) {

src/ol/source/geojsonsource.exports

@@ -1 +1 @@
-@exportClass ol.source.GeoJSON ol.source.GeoJSONOptions
+@exportSymbol ol.source.GeoJSON

src/ol/source/geojsonsource.js

@@ -8,7 +8,7 @@ goog.require('ol.source.VectorFile');
 /**
  * @constructor
  * @extends {ol.source.VectorFile}
- * @param {ol.source.GeoJSONOptions=} opt_options Options.
+ * @param {olx.source.GeoJSONOptions=} opt_options Options.
  */
 ol.source.GeoJSON = function(opt_options) {
 

src/ol/source/imagestaticsource.exports

@@ -1 +1 @@
-@exportClass ol.source.ImageStatic ol.source.ImageStaticOptions
+@exportSymbol ol.source.ImageStatic

src/ol/source/imagestaticsource.js

@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
 /**
  * @constructor
  * @extends {ol.source.Image}
- * @param {ol.source.ImageStaticOptions} options Options.
+ * @param {olx.source.ImageStaticOptions} options Options.
  * @todo stability experimental
  */
 ol.source.ImageStatic = function(options) {

src/ol/source/imagewmssource.exports

@@ -1,3 +1,3 @@
-@exportClass ol.source.ImageWMS ol.source.ImageWMSOptions
+@exportSymbol ol.source.ImageWMS
 @exportProperty ol.source.ImageWMS.prototype.getParams
 @exportProperty ol.source.ImageWMS.prototype.updateParams

src/ol/source/imagewmssource.js

@@ -13,7 +13,7 @@ goog.require('ol.source.wms');
 /**
  * @constructor
  * @extends {ol.source.Image}
- * @param {ol.source.ImageWMSOptions} options Options.
+ * @param {olx.source.ImageWMSOptions} options Options.
  * @todo stability experimental
  */
 ol.source.ImageWMS = function(options) {

src/ol/source/mapguidesource.js

@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
 /**
  * @constructor
  * @extends {ol.source.Image}
- * @param {ol.source.MapGuideOptions} options Options.
+ * @param {olx.source.MapGuideOptions} options Options.
  */
 ol.source.MapGuide = function(options) {
 

src/ol/source/mapquestsource.js

@@ -10,7 +10,7 @@ goog.require('ol.source.XYZ');
 /**
  * @constructor
  * @extends {ol.source.XYZ}
- * @param {ol.source.MapQuestOptions=} opt_options MapQuest options.
+ * @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
  * @todo stability experimental
  */
 ol.source.MapQuestOSM = function(opt_options) {
@@ -43,7 +43,7 @@ goog.inherits(ol.source.MapQuestOSM, ol.source.XYZ);
 /**
  * @constructor
  * @extends {ol.source.XYZ}
- * @param {ol.source.MapQuestOptions=} opt_options MapQuest options.
+ * @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
  * @todo stability experimental
  */
 ol.source.MapQuestOpenAerial = function(opt_options) {

src/ol/source/osmsource.js

@@ -8,7 +8,7 @@ goog.require('ol.source.XYZ');
 /**
  * @constructor
  * @extends {ol.source.XYZ}
- * @param {ol.source.OSMOptions=} opt_options Open Street Map options.
+ * @param {olx.source.OSMOptions=} opt_options Open Street Map options.
  * @todo stability experimental
  */
 ol.source.OSM = function(opt_options) {

src/ol/source/stamensource.exports

@@ -1 +1 @@
-@exportClass ol.source.Stamen ol.source.StamenOptions
+@exportSymbol ol.source.Stamen

src/ol/source/stamensource.js

@@ -80,7 +80,7 @@ ol.source.StamenProviderConfig = {
 /**
  * @constructor
  * @extends {ol.source.XYZ}
- * @param {ol.source.StamenOptions} options Stamen options.
+ * @param {olx.source.StamenOptions} options Stamen options.
  * @todo stability experimental
  */
 ol.source.Stamen = function(options) {

src/ol/source/tilejsonsource.exports

@@ -1 +1 @@
-@exportClass ol.source.TileJSON ol.source.TileJSONOptions
+@exportSymbol ol.source.TileJSON

src/ol/source/tilejsonsource.js

@@ -40,7 +40,7 @@ goog.exportSymbol('grid', grid);
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @param {ol.source.TileJSONOptions} options TileJSON options.
+ * @param {olx.source.TileJSONOptions} options TileJSON options.
  * @todo stability experimental
  */
 ol.source.TileJSON = function(options) {

src/ol/source/tilesource.js

@@ -106,6 +106,14 @@ ol.source.Tile.prototype.findLoadedTiles = function(loadedTilesByZ,
 };
 
 
+/**
+ * @return {number} Gutter.
+ */
+ol.source.Tile.prototype.getGutter = function() {
+  return 0;
+};
+
+
 /**
  * @param {number} z Z.
  * @param {number} x X.

src/ol/source/tilewmssource.exports

@@ -1,3 +1,3 @@
-@exportClass ol.source.TileWMS ol.source.TileWMSOptions
+@exportSymbol ol.source.TileWMS
 @exportProperty ol.source.TileWMS.prototype.getParams
 @exportProperty ol.source.TileWMS.prototype.updateParams

src/ol/source/tilewmssource.js

@@ -16,7 +16,7 @@ goog.require('ol.source.wms');
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @param {ol.source.TileWMSOptions} options Tile WMS options.
+ * @param {olx.source.TileWMSOptions} options Tile WMS options.
  * @todo stability experimental
  */
 ol.source.TileWMS = function(options) {
@@ -32,6 +32,12 @@ ol.source.TileWMS = function(options) {
     urls = ol.TileUrlFunction.expandUrl(options.url);
   }
 
+  /**
+   * @private
+   * @type {number}
+   */
+  this.gutter_ = goog.isDef(options.gutter) ? options.gutter : 0;
+
   /**
    * @private
    * @type {Object}
@@ -49,7 +55,7 @@ ol.source.TileWMS = function(options) {
     var tileUrlFunctions = goog.array.map(
         urls, function(url) {
           return ol.TileUrlFunction.createFromParamsFunction(
-              url, this.params_, ol.source.wms.getUrl);
+              url, this.params_, this.gutter_, ol.source.wms.getUrl);
         }, this);
     tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions(
         tileUrlFunctions);
@@ -106,6 +112,14 @@ ol.source.TileWMS = function(options) {
 goog.inherits(ol.source.TileWMS, ol.source.TileImage);
 
 
+/**
+ * @inheritDoc
+ */
+ol.source.TileWMS.prototype.getGutter = function() {
+  return this.gutter_;
+};
+
+
 /**
  * @inheritDoc
  */

src/ol/source/vectorfilesource.exports

@@ -1 +1 @@
-@exportClass ol.source.VectorFile ol.source.VectorFileOptions
+@exportSymbol ol.source.VectorFile

src/ol/source/vectorfilesource.js

@@ -14,7 +14,7 @@ goog.require('ol.source.Vector');
 /**
  * @constructor
  * @extends {ol.source.Vector}
- * @param {ol.source.VectorFileOptions=} opt_options Options.
+ * @param {olx.source.VectorFileOptions=} opt_options Options.
  */
 ol.source.VectorFile = function(opt_options) {
 

src/ol/source/vectorsource.exports

@@ -1,4 +1,4 @@
-@exportClass ol.source.Vector ol.source.VectorOptions
+@exportSymbol ol.source.Vector
 @exportProperty ol.source.Vector.prototype.addFeature
 @exportProperty ol.source.Vector.prototype.getClosestFeatureToCoordinate
 @exportProperty ol.source.Vector.prototype.forEachFeature

src/ol/source/vectorsource.js

@@ -27,7 +27,8 @@ ol.source.VectorEventType = {
 /**
  * @constructor
  * @extends {ol.source.Source}
- * @param {ol.source.VectorOptions=} opt_options Options.
+ * @param {olx.source.VectorOptions=} opt_options Vector source options.
+ * @todo stability experimental
  */
 ol.source.Vector = function(opt_options) {
 

src/ol/source/wmtssource.exports

@@ -1,4 +1,4 @@
-@exportClass ol.source.WMTS ol.source.WMTSOptions
+@exportSymbol ol.source.WMTS
 @exportProperty ol.source.WMTS.prototype.getDimensions
 @exportProperty ol.source.WMTS.prototype.updateDimensions
 @exportSymbol ol.source.WMTS.optionsFromCapabilities

src/ol/source/wmtssource.js

@@ -28,7 +28,7 @@ ol.source.WMTSRequestEncoding = {
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @param {ol.source.WMTSOptions} options WMTS options.
+ * @param {olx.source.WMTSOptions} options WMTS options.
  * @todo stability experimental
  */
 ol.source.WMTS = function(options) {
@@ -237,7 +237,7 @@ ol.source.WMTS.prototype.updateDimensions = function(dimensions) {
 /**
  * @param {Object} wmtsCap An object representing the capabilities document.
  * @param {string} layer The layer identifier.
- * @return {ol.source.WMTSOptions} WMTS source options object.
+ * @return {olx.source.WMTSOptions} WMTS source options object.
  * @todo stability experimental
  */
 ol.source.WMTS.optionsFromCapabilities = function(wmtsCap, layer) {

src/ol/source/xyzsource.exports

@@ -1,2 +1,2 @@
-@exportClass ol.source.XYZ ol.source.XYZOptions
+@exportSymbol ol.source.XYZ
 @exportProperty ol.source.XYZ.prototype.setUrl

src/ol/source/xyzsource.js

@@ -12,7 +12,7 @@ goog.require('ol.tilegrid.XYZ');
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @param {ol.source.XYZOptions} options XYZ options.
+ * @param {olx.source.XYZOptions} options XYZ options.
  * @todo stability experimental
  */
 ol.source.XYZ = function(options) {