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

old/src/ol/style/fillsymbolizer.js

@@ -14,7 +14,7 @@ goog.require('ol.style.Symbolizer');
 /**
  * @constructor
  * @extends {ol.style.Symbolizer}
- * @param {ol.style.FillOptions=} opt_options Polygon options.
+ * @param {olx.style.FillOptions=} opt_options Polygon options.
  * @todo stability experimental
  */
 ol.style.Fill = function(opt_options) {
@@ -68,7 +68,7 @@ ol.style.Fill.prototype.createLiteral = function(featureOrType) {
   var literal = null;
 
   if (type === ol.geom.GeometryType.POLYGON ||
-      type === ol.geom.GeometryType.MULTIPOLYGON) {
+      type === ol.geom.GeometryType.MULTI_POLYGON) {
 
     var color = ol.expr.evaluateFeature(this.color_, feature);
     goog.asserts.assertString(

old/src/ol/style/iconsymbolizer.js

@@ -14,7 +14,7 @@ goog.require('ol.style.Point');
 /**
  * @constructor
  * @extends {ol.style.Point}
- * @param {ol.style.IconOptions} options Icon options.
+ * @param {olx.style.IconOptions} options Icon options.
  * @todo stability experimental
  */
 ol.style.Icon = function(options) {
@@ -112,7 +112,7 @@ ol.style.Icon.prototype.createLiteral = function(featureOrType) {
 
   var literal = null;
   if (type === ol.geom.GeometryType.POINT ||
-      type === ol.geom.GeometryType.MULTIPOINT) {
+      type === ol.geom.GeometryType.MULTI_POINT) {
 
     var url = ol.expr.evaluateFeature(this.url_, feature);
     goog.asserts.assertString(url, 'url must be a string');

old/src/ol/style/rule.js

@@ -11,7 +11,7 @@ goog.require('ol.style.Symbolizer');
 
 /**
  * @constructor
- * @param {ol.style.RuleOptions} options Rule options.
+ * @param {olx.style.RuleOptions} options Rule options.
  * @todo stability experimental
  */
 ol.style.Rule = function(options) {

old/src/ol/style/shapesymbolizer.js

@@ -17,7 +17,7 @@ goog.require('ol.style.Stroke');
 /**
  * @constructor
  * @extends {ol.style.Point}
- * @param {ol.style.ShapeOptions} options Shape options.
+ * @param {olx.style.ShapeOptions} options Shape options.
  * @todo stability experimental
  */
 ol.style.Shape = function(options) {
@@ -84,7 +84,7 @@ ol.style.Shape.prototype.createLiteral = function(featureOrType) {
 
   var literal = null;
   if (type === ol.geom.GeometryType.POINT ||
-      type === ol.geom.GeometryType.MULTIPOINT) {
+      type === ol.geom.GeometryType.MULTI_POINT) {
     var size = Number(ol.expr.evaluateFeature(this.size_, feature));
     goog.asserts.assert(!isNaN(size), 'size must be a number');
 

old/src/ol/style/strokesymbolizer.js

@@ -16,7 +16,7 @@ goog.require('ol.style.Symbolizer');
 /**
  * @constructor
  * @extends {ol.style.Symbolizer}
- * @param {ol.style.StrokeOptions=} opt_options Stroke options.
+ * @param {olx.style.StrokeOptions=} opt_options Stroke options.
  * @todo stability experimental
  */
 ol.style.Stroke = function(opt_options) {
@@ -93,8 +93,8 @@ ol.style.Stroke.prototype.createLiteral = function(featureOrType) {
   goog.asserts.assert(!isNaN(zIndex), 'zIndex must be a number');
 
   var literal = null;
-  if (type === ol.geom.GeometryType.LINESTRING ||
-      type === ol.geom.GeometryType.MULTILINESTRING) {
+  if (type === ol.geom.GeometryType.LINE_STRING ||
+      type === ol.geom.GeometryType.MULTI_LINE_STRING) {
     literal = new ol.style.LineLiteral({
       color: color,
       opacity: opacity,
@@ -102,7 +102,7 @@ ol.style.Stroke.prototype.createLiteral = function(featureOrType) {
       zIndex: zIndex
     });
   } else if (type === ol.geom.GeometryType.POLYGON ||
-      type === ol.geom.GeometryType.MULTIPOLYGON) {
+      type === ol.geom.GeometryType.MULTI_POLYGON) {
     literal = new ol.style.PolygonLiteral({
       strokeColor: color,
       strokeOpacity: opacity,

old/src/ol/style/textsymbolizer.js

@@ -13,7 +13,7 @@ goog.require('ol.style.TextLiteral');
 /**
  * @constructor
  * @extends {ol.style.Symbolizer}
- * @param {ol.style.TextOptions} options Text options.
+ * @param {olx.style.TextOptions} options Text options.
  */
 ol.style.Text = function(options) {