Merge branch 'master' of github.com:openlayers/ol3 into vector

Conflicts:
	src/objectliterals.exports

src/objectliterals.exports

@@ -155,38 +155,21 @@
 @exportObjectLiteralProperty ol.source.TiledWMSOptions.url string|undefined
 @exportObjectLiteralProperty ol.source.TiledWMSOptions.urls Array.<string>|undefined
 
-@exportObjectLiteral ol.style.IconOptions
-@exportObjectLiteralProperty ol.style.IconOptions.url string|ol.Expression
-@exportObjectLiteralProperty ol.style.IconOptions.width number|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.IconOptions.height number|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.IconOptions.opacity number|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.IconOptions.rotation number|ol.Expression|undefined
-
-@exportObjectLiteral ol.style.LineOptions
-@exportObjectLiteralProperty ol.style.LineOptions.strokeColor string|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.LineOptions.strokeWidth number|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.LineOptions.opacity number|ol.Expression|undefined
-
-@exportObjectLiteral ol.style.PolygonOptions
-@exportObjectLiteralProperty ol.style.PolygonOptions.fillColor string|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.PolygonOptions.strokeColor string|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.PolygonOptions.strokeWidth number|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.PolygonOptions.opacity number|ol.Expression|undefined
-
-@exportObjectLiteral ol.style.RuleOptions
-@exportObjectLiteralProperty ol.style.RuleOptions.filter ol.filter.Filter|undefined
-@exportObjectLiteralProperty ol.style.RuleOptions.symbolizers Array.<ol.style.Symbolizer>|undefined
-
-@exportObjectLiteral ol.style.ShapeOptions
-@exportObjectLiteralProperty ol.style.ShapeOptions.type ol.style.ShapeType|undefined
-@exportObjectLiteralProperty ol.style.ShapeOptions.size number|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.ShapeOptions.fillColor string|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.ShapeOptions.strokeColor string|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.ShapeOptions.strokeWidth number|ol.Expression|undefined
-@exportObjectLiteralProperty ol.style.ShapeOptions.opacity number|ol.Expression|undefined
-
-@exportObjectLiteral ol.style.StyleOptions
-@exportObjectLiteralProperty ol.style.StyleOptions.rules Array.<ol.style.Rule>
+@exportObjectLiteral ol.source.WMTSOptions
+@exportObjectLiteralProperty ol.source.WMTSOptions.attributions Array.<ol.Attribution>|undefined
+@exportObjectLiteralProperty ol.source.WMTSOptions.crossOrigin string|null|undefined
+@exportObjectLiteralProperty ol.source.WMTSOptions.extent ol.Extent|undefined
+@exportObjectLiteralProperty ol.source.WMTSOptions.tileGrid ol.tilegrid.WMTS
+@exportObjectLiteralProperty ol.source.WMTSOptions.projection ol.Projection|undefined
+@exportObjectLiteralProperty ol.source.WMTSOptions.requestEncoding ol.source.WMTSRequestEncoding|undefined
+@exportObjectLiteralProperty ol.source.WMTSOptions.layer string
+@exportObjectLiteralProperty ol.source.WMTSOptions.style string
+@exportObjectLiteralProperty ol.source.WMTSOptions.format string|undefined
+@exportObjectLiteralProperty ol.source.WMTSOptions.matrixSet string
+@exportObjectLiteralProperty ol.source.WMTSOptions.dimensions Object|undefined
+@exportObjectLiteralProperty ol.source.WMTSOptions.url string|undefined
+@exportObjectLiteralProperty ol.source.WMTSOptions.maxZoom number|undefined
+@exportObjectLiteralProperty ol.source.WMTSOptions.urls Array.<string>|undefined
 
 @exportObjectLiteral ol.tilegrid.TileGridOptions
 @exportObjectLiteralProperty ol.tilegrid.TileGridOptions.origin ol.Coordinate|undefined
@@ -195,6 +178,14 @@
 @exportObjectLiteralProperty ol.tilegrid.TileGridOptions.tileSize ol.Size|undefined
 @exportObjectLiteralProperty ol.tilegrid.TileGridOptions.tileSizes Array.<ol.Size>|undefined
 
+@exportObjectLiteral ol.tilegrid.WMTSOptions
+@exportObjectLiteralProperty ol.tilegrid.WMTSOptions.origin ol.Coordinate|undefined
+@exportObjectLiteralProperty ol.tilegrid.WMTSOptions.origins Array.<ol.Coordinate>|undefined
+@exportObjectLiteralProperty ol.tilegrid.WMTSOptions.resolutions !Array.<number>
+@exportObjectLiteralProperty ol.tilegrid.WMTSOptions.matrixIds !Array.<string>
+@exportObjectLiteralProperty ol.tilegrid.WMTSOptions.tileSize ol.Size|undefined
+@exportObjectLiteralProperty ol.tilegrid.WMTSOptions.tileSizes Array.<ol.Size>|undefined
+
 @exportObjectLiteral ol.tilegrid.XYZOptions
 @exportObjectLiteralProperty ol.tilegrid.XYZOptions.maxZoom number
 

src/ol/coordinate.exports

@@ -1,2 +1,5 @@
 @exportSymbol ol.Coordinate
-@exportProperty ol.Coordinate.toStringHDMS
+@exportSymbol ol.Coordinate.createStringXY
+@exportSymbol ol.Coordinate.toStringHDMS
+@exportSymbol ol.Coordinate.toStringXY
+@exportSymbol ol.Coordinate.fromProjectedArray

src/ol/extent.exports

@@ -1,3 +1,11 @@
 @exportSymbol ol.Extent
+@exportProperty ol.Extent.prototype.getCenter
 @exportProperty ol.Extent.prototype.getHeight
 @exportProperty ol.Extent.prototype.getWidth
+@exportProperty ol.Extent.prototype.containsCoordinate
+@exportProperty ol.Extent.prototype.containsExtent
+@exportProperty ol.Extent.prototype.getBottomLeft
+@exportProperty ol.Extent.prototype.getBottomRight
+@exportProperty ol.Extent.prototype.getTopLeft
+@exportProperty ol.Extent.prototype.getTopRight
+@exportProperty ol.Extent.prototype.transform

src/ol/extent.js

@@ -45,6 +45,35 @@ ol.Extent.boundingExtent = function(var_args) {
 };
 
 
+/**
+ * @param {ol.Coordinate} center Center.
+ * @param {number} resolution Resolution.
+ * @param {number} rotation Rotation.
+ * @param {ol.Size} size Size.
+ * @return {ol.Extent} Extent.
+ */
+ol.Extent.getForView2DAndSize = function(center, resolution, rotation, size) {
+  var dx = resolution * size.width / 2;
+  var dy = resolution * size.height / 2;
+  var cosRotation = Math.cos(rotation);
+  var sinRotation = Math.sin(rotation);
+  var xs = [-dx, -dx, dx, dx];
+  var ys = [-dy, dy, -dy, dy];
+  var i, x, y;
+  for (i = 0; i < 4; ++i) {
+    x = xs[i];
+    y = ys[i];
+    xs[i] = center.x + x * cosRotation - y * sinRotation;
+    ys[i] = center.y + x * sinRotation + y * cosRotation;
+  }
+  var minX = Math.min.apply(null, xs);
+  var minY = Math.min.apply(null, ys);
+  var maxX = Math.max.apply(null, xs);
+  var maxY = Math.max.apply(null, ys);
+  return new ol.Extent(minX, minY, maxX, maxY);
+};
+
+
 /**
  * Checks if the passed coordinate is contained or on the edge
  * of the extent.

src/ol/map.js

@@ -728,24 +728,8 @@ ol.Map.prototype.renderFrame_ = function(time) {
 
   if (!goog.isNull(frameState)) {
     // FIXME works for View2D only
-    var center = view2DState.center;
-    var resolution = view2DState.resolution;
-    var rotation = view2DState.rotation;
-    var x = resolution * size.width / 2;
-    var y = resolution * size.height / 2;
-    var corners = [
-      new ol.Coordinate(-x, -y),
-      new ol.Coordinate(-x, y),
-      new ol.Coordinate(x, -y),
-      new ol.Coordinate(x, y)
-    ];
-    var corner;
-    for (i = 0; i < 4; ++i) {
-      corner = corners[i];
-      corner.rotate(rotation);
-      corner.add(center);
-    }
-    frameState.extent = ol.Extent.boundingExtent.apply(null, corners);
+    frameState.extent = ol.Extent.getForView2DAndSize(view2DState.center,
+        view2DState.resolution, view2DState.rotation, frameState.size);
   }
 
   this.frameState_ = frameState;

src/ol/parser/ogc/wmtscapabilities_v1_0_0.js

@@ -67,7 +67,7 @@ ol.parser.ogc.WMTSCapabilities_v1_0_0 = function() {
       },
       'TileMatrix': function(node, obj) {
         var tileMatrix = {
-          'supportedCRS': obj.supportedCRS
+          'supportedCRS': obj['supportedCRS']
         };
         this.readChildNodes(node, tileMatrix);
         obj['matrixIds'].push(tileMatrix);

src/ol/parser/polyline.js

@@ -0,0 +1,335 @@
+goog.provide('ol.parser.polyline');
+
+
+/**
+ * Encode a list of coordinates in a flat array and return an encoded string
+ *
+ * Attention: This function will modify the passed array!
+ *
+ * @param {Array.<number>} flatPoints A flat array of coordinates.
+ * @param {number=} opt_dimension The dimension of the coordinates in the array.
+ * @return {string} The encoded string.
+ */
+ol.parser.polyline.encodeFlatCoordinates =
+    function(flatPoints, opt_dimension) {
+  var dimension = opt_dimension || 2;
+  return ol.parser.polyline.encodeDeltas(flatPoints, dimension);
+};
+
+
+/**
+ * Decode a list of coordinates from an encoded string into a flat array
+ *
+ * @param {string} encoded An encoded string.
+ * @param {number=} opt_dimension The dimension of the coordinates in the
+ * encoded string.
+ * @return {Array.<number>} A flat array of coordinates.
+ */
+ol.parser.polyline.decodeFlatCoordinates = function(encoded, opt_dimension) {
+  var dimension = opt_dimension || 2;
+  return ol.parser.polyline.decodeDeltas(encoded, dimension);
+};
+
+
+/**
+ * Encode a list of n-dimensional points and return an encoded string
+ *
+ * Attention: This function will modify the passed array!
+ *
+ * @param {Array.<number>} numbers A list of n-dimensional points.
+ * @param {number} dimension The dimension of the points in the list.
+ * @param {number=} opt_factor The factor by which the numbers will be
+ * multiplied. The remaining decimal places will get rounded away.
+ * @return {string} The encoded string.
+ */
+ol.parser.polyline.encodeDeltas = function(numbers, dimension, opt_factor) {
+  var factor = opt_factor || 1e5;
+  var d;
+
+  var lastNumbers = new Array(dimension);
+  for (d = 0; d < dimension; ++d) {
+    lastNumbers[d] = 0;
+  }
+
+  var numbersLength = numbers.length;
+  for (var i = 0; i < numbersLength;) {
+    for (d = 0; d < dimension; ++d, ++i) {
+      var num = numbers[i];
+      var delta = num - lastNumbers[d];
+      lastNumbers[d] = num;
+
+      numbers[i] = delta;
+    }
+  }
+
+  return ol.parser.polyline.encodeFloats(numbers, factor);
+};
+
+
+/**
+ * Decode a list of n-dimensional points from an encoded string
+ *
+ * @param {string} encoded An encoded string.
+ * @param {number} dimension The dimension of the points in the encoded string.
+ * @param {number=} opt_factor The factor by which the resulting numbers will
+ * be divided.
+ * @return {Array.<number>} A list of n-dimensional points.
+ */
+ol.parser.polyline.decodeDeltas = function(encoded, dimension, opt_factor) {
+  var factor = opt_factor || 1e5;
+  var d;
+
+  var lastNumbers = new Array(dimension);
+  for (d = 0; d < dimension; ++d) {
+    lastNumbers[d] = 0;
+  }
+
+  var numbers = ol.parser.polyline.decodeFloats(encoded, factor);
+
+  var numbersLength = numbers.length;
+  for (var i = 0; i < numbersLength;) {
+    for (d = 0; d < dimension; ++d, ++i) {
+      lastNumbers[d] += numbers[i];
+
+      numbers[i] = lastNumbers[d];
+    }
+  }
+
+  return numbers;
+};
+
+
+/**
+ * Encode a list of floating point numbers and return an encoded string
+ *
+ * Attention: This function will modify the passed array!
+ *
+ * @param {Array.<number>} numbers A list of floating point numbers.
+ * @param {number=} opt_factor The factor by which the numbers will be
+ * multiplied. The remaining decimal places will get rounded away.
+ * @return {string} The encoded string.
+ */
+ol.parser.polyline.encodeFloats = function(numbers, opt_factor) {
+  var factor = opt_factor || 1e5;
+
+  var numbersLength = numbers.length;
+  for (var i = 0; i < numbersLength; ++i) {
+    numbers[i] = Math.round(numbers[i] * factor);
+  }
+
+  return ol.parser.polyline.encodeSignedIntegers(numbers);
+};
+
+
+/**
+ * Decode a list of floating point numbers from an encoded string
+ *
+ * @param {string} encoded An encoded string.
+ * @param {number=} opt_factor The factor by which the result will be divided.
+ * @return {Array.<number>} A list of floating point numbers.
+ */
+ol.parser.polyline.decodeFloats = function(encoded, opt_factor) {
+  var factor = opt_factor || 1e5;
+
+  var numbers = ol.parser.polyline.decodeSignedIntegers(encoded);
+
+  var numbersLength = numbers.length;
+  for (var i = 0; i < numbersLength; ++i) {
+    numbers[i] /= factor;
+  }
+
+  return numbers;
+};
+
+
+/**
+ * Encode a list of signed integers and return an encoded string
+ *
+ * Attention: This function will modify the passed array!
+ *
+ * @param {Array.<number>} numbers A list of signed integers.
+ * @return {string} The encoded string.
+ */
+ol.parser.polyline.encodeSignedIntegers = function(numbers) {
+  var numbersLength = numbers.length;
+  for (var i = 0; i < numbersLength; ++i) {
+    var num = numbers[i];
+
+    var signedNum = num << 1;
+    if (num < 0) {
+      signedNum = ~(signedNum);
+    }
+
+    numbers[i] = signedNum;
+  }
+
+  return ol.parser.polyline.encodeUnsignedIntegers(numbers);
+};
+
+
+/**
+ * Decode a list of signed integers from an encoded string
+ *
+ * @param {string} encoded An encoded string.
+ * @return {Array.<number>} A list of signed integers.
+ */
+ol.parser.polyline.decodeSignedIntegers = function(encoded) {
+  var numbers = ol.parser.polyline.decodeUnsignedIntegers(encoded);
+
+  var numbersLength = numbers.length;
+  for (var i = 0; i < numbersLength; ++i) {
+    var num = numbers[i];
+    numbers[i] = (num & 1) ? ~(num >> 1) : (num >> 1);
+  }
+
+  return numbers;
+};
+
+
+/**
+ * Encode a list of unsigned integers and return an encoded string
+ *
+ * @param {Array.<number>} numbers A list of unsigned integers.
+ * @return {string} The encoded string.
+ */
+ol.parser.polyline.encodeUnsignedIntegers = function(numbers) {
+  var encoded = '';
+
+  var numbersLength = numbers.length;
+  for (var i = 0; i < numbersLength; ++i) {
+    encoded += ol.parser.polyline.encodeUnsignedInteger(numbers[i]);
+  }
+
+  return encoded;
+};
+
+
+/**
+ * Decode a list of unsigned integers from an encoded string
+ *
+ * @param {string} encoded An encoded string.
+ * @return {Array.<number>} A list of unsigned integers.
+ */
+ol.parser.polyline.decodeUnsignedIntegers = function(encoded) {
+  var numbers = [];
+
+  var current = 0;
+  var shift = 0;
+
+  var encodedLength = encoded.length;
+  for (var i = 0; i < encodedLength; ++i) {
+    var b = encoded.charCodeAt(i) - 63;
+
+    current |= (b & 0x1f) << shift;
+
+    if (b < 0x20) {
+      numbers.push(current);
+      current = 0;
+      shift = 0;
+    } else {
+      shift += 5;
+    }
+  }
+
+  return numbers;
+};
+
+
+/**
+ * Encode one single floating point number and return an encoded string
+ *
+ * @param {number} num Floating point number that should be encoded.
+ * @param {number=} opt_factor The factor by which num will be multiplied.
+ * The remaining decimal places will get rounded away.
+ * @return {string} The encoded string.
+ */
+ol.parser.polyline.encodeFloat = function(num, opt_factor) {
+  num = Math.round(num * (opt_factor || 1e5));
+  return ol.parser.polyline.encodeSignedInteger(num);
+};
+
+
+/**
+ * Decode one single floating point number from an encoded string
+ *
+ * @param {string} encoded An encoded string.
+ * @param {number=} opt_factor The factor by which the result will be divided.
+ * @return {number} The decoded floating point number.
+ */
+ol.parser.polyline.decodeFloat = function(encoded, opt_factor) {
+  var result = ol.parser.polyline.decodeSignedInteger(encoded);
+  return result / (opt_factor || 1e5);
+};
+
+
+/**
+ * Encode one single signed integer and return an encoded string
+ *
+ * @param {number} num Signed integer that should be encoded.
+ * @return {string} The encoded string.
+ */
+ol.parser.polyline.encodeSignedInteger = function(num) {
+  var signedNum = num << 1;
+  if (num < 0) {
+    signedNum = ~(signedNum);
+  }
+
+  return ol.parser.polyline.encodeUnsignedInteger(signedNum);
+};
+
+
+/**
+ * Decode one single signed integer from an encoded string
+ *
+ * @param {string} encoded An encoded string.
+ * @return {number} The decoded signed integer.
+ */
+ol.parser.polyline.decodeSignedInteger = function(encoded) {
+  var result = ol.parser.polyline.decodeUnsignedInteger(encoded);
+  return ((result & 1) ? ~(result >> 1) : (result >> 1));
+};
+
+
+/**
+ * Encode one single unsigned integer and return an encoded string
+ *
+ * @param {number} num Unsigned integer that should be encoded.
+ * @return {string} The encoded string.
+ */
+ol.parser.polyline.encodeUnsignedInteger = function(num) {
+  var value, encoded = '';
+  while (num >= 0x20) {
+    value = (0x20 | (num & 0x1f)) + 63;
+    encoded += (String.fromCharCode(value));
+    num >>= 5;
+  }
+  value = num + 63;
+  encoded += (String.fromCharCode(value));
+  return encoded;
+};
+
+
+/**
+ * Decode one single unsigned integer from an encoded string
+ *
+ * @param {string} encoded An encoded string.
+ * @return {number} The decoded unsigned integer.
+ */
+ol.parser.polyline.decodeUnsignedInteger = function(encoded) {
+  var result = 0;
+  var shift = 0;
+
+  var encodedLength = encoded.length;
+  for (var i = 0; i < encodedLength; ++i) {
+    var b = encoded.charCodeAt(i) - 63;
+
+    result |= (b & 0x1f) << shift;
+
+    if (b < 0x20)
+      break;
+
+    shift += 5;
+  }
+
+  return result;
+};

src/ol/renderer/canvas/canvastilelayerrenderer.js

@@ -6,6 +6,7 @@ goog.provide('ol.renderer.canvas.TileLayer');
 goog.require('goog.array');
 goog.require('goog.dom');
 goog.require('goog.vec.Mat4');
+goog.require('ol.Extent');
 goog.require('ol.Size');
 goog.require('ol.Tile');
 goog.require('ol.TileCoord');
@@ -103,8 +104,17 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
   var z = tileGrid.getZForResolution(view2DState.resolution);
   var tileSize = tileGrid.getTileSize(z);
   var tileResolution = tileGrid.getResolution(z);
+  var center = view2DState.center;
+  var extent;
+  if (tileResolution == view2DState.resolution) {
+    center = this.snapCenterToPixel(center, tileResolution, frameState.size);
+    extent = ol.Extent.getForView2DAndSize(
+        center, tileResolution, view2DState.rotation, frameState.size);
+  } else {
+    extent = frameState.extent;
+  }
   var tileRange = tileGrid.getTileRangeForExtentAndResolution(
-      frameState.extent, tileResolution);
+      extent, tileResolution);
   var tileRangeWidth = tileRange.getWidth();
   var tileRangeHeight = tileRange.getHeight();
 
@@ -238,7 +248,7 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
   }
 
   this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
-  tileSource.useLowResolutionTiles(z, frameState.extent, tileGrid);
+  tileSource.useLowResolutionTiles(z, extent, tileGrid);
   this.scheduleExpireCache(frameState, tileSource);
 
   var transform = this.transform_;
@@ -253,8 +263,8 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
       1);
   goog.vec.Mat4.translate(
       transform,
-      (origin.x - view2DState.center.x) / tileResolution,
-      (view2DState.center.y - origin.y) / tileResolution,
+      (origin.x - center.x) / tileResolution,
+      (center.y - origin.y) / tileResolution,
       0);
 
 };

src/ol/renderer/dom/domtilelayerrenderer.js

@@ -90,8 +90,17 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
   }
   var z = tileGrid.getZForResolution(view2DState.resolution);
   var tileResolution = tileGrid.getResolution(z);
+  var center = view2DState.center;
+  var extent;
+  if (tileResolution == view2DState.resolution) {
+    center = this.snapCenterToPixel(center, tileResolution, frameState.size);
+    extent = ol.Extent.getForView2DAndSize(
+        center, tileResolution, view2DState.rotation, frameState.size);
+  } else {
+    extent = frameState.extent;
+  }
   var tileRange = tileGrid.getTileRangeForExtentAndResolution(
-      frameState.extent, tileResolution);
+      extent, tileResolution);
 
   /** @type {Object.<number, Object.<string, ol.Tile>>} */
   var tilesToDrawByZ = {};
@@ -146,7 +155,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
       tileLayerZ = this.tileLayerZs_[tileLayerZKey];
     } else {
       tileCoordOrigin =
-          tileGrid.getTileCoordForCoordAndZ(view2DState.center, tileLayerZKey);
+          tileGrid.getTileCoordForCoordAndZ(center, tileLayerZKey);
       tileLayerZ = new ol.renderer.dom.TileLayerZ_(tileGrid, tileCoordOrigin);
       newTileLayerZKeys[tileLayerZKey] = true;
       this.tileLayerZs_[tileLayerZKey] = tileLayerZ;
@@ -183,8 +192,8 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
         resolution / view2DState.resolution, 1);
     goog.vec.Mat4.translate(
         transform,
-        (origin.x - view2DState.center.x) / resolution,
-        (view2DState.center.y - origin.y) / resolution,
+        (origin.x - center.x) / resolution,
+        (center.y - origin.y) / resolution,
         0);
     tileLayerZ.setTransform(transform);
     if (tileLayerZKey in newTileLayerZKeys) {
@@ -201,7 +210,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
     } else {
       if (!frameState.viewHints[ol.ViewHint.ANIMATING] &&
           !frameState.viewHints[ol.ViewHint.INTERACTING]) {
-        tileLayerZ.removeTilesOutsideExtent(frameState.extent);
+        tileLayerZ.removeTilesOutsideExtent(extent);
       }
     }
   }
@@ -217,7 +226,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
   }
 
   this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
-  tileSource.useLowResolutionTiles(z, frameState.extent, tileGrid);
+  tileSource.useLowResolutionTiles(z, extent, tileGrid);
   this.scheduleExpireCache(frameState, tileSource);
 
 };

src/ol/renderer/layerrenderer.js

@@ -3,6 +3,7 @@ goog.provide('ol.renderer.Layer');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
 goog.require('ol.Attribution');
+goog.require('ol.Coordinate');
 goog.require('ol.FrameState');
 goog.require('ol.Image');
 goog.require('ol.ImageState');
@@ -299,3 +300,18 @@ ol.renderer.Layer.prototype.createGetTileIfLoadedFunction =
     return isLoadedFunction(tile) ? tile : null;
   };
 };
+
+
+/**
+ * @param {ol.Coordinate} center Center.
+ * @param {number} resolution Resolution.
+ * @param {ol.Size} size Size.
+ * @return {ol.Coordinate} Snapped center.
+ * @protected
+ */
+ol.renderer.Layer.prototype.snapCenterToPixel =
+    function(center, resolution, size) {
+  return new ol.Coordinate(
+      resolution * (Math.round(center.x / resolution) + (size.width % 2) / 2),
+      resolution * (Math.round(center.y / resolution) + (size.height % 2) / 2));
+};

src/ol/renderer/webgl/webgltilelayerrenderer.js

@@ -282,7 +282,6 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
 
   var view2DState = frameState.view2DState;
   var projection = view2DState.projection;
-  var center = view2DState.center;
 
   var tileLayer = this.getTileLayer();
   var tileSource = tileLayer.getTileSource();
@@ -293,8 +292,17 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
   }
   var z = tileGrid.getZForResolution(view2DState.resolution);
   var tileResolution = tileGrid.getResolution(z);
+  var center = view2DState.center;
+  var extent;
+  if (tileResolution == view2DState.resolution) {
+    center = this.snapCenterToPixel(center, tileResolution, frameState.size);
+    extent = ol.Extent.getForView2DAndSize(
+        center, tileResolution, view2DState.rotation, frameState.size);
+  } else {
+    extent = frameState.extent;
+  }
   var tileRange = tileGrid.getTileRangeForExtentAndResolution(
-      frameState.extent, tileResolution);
+      extent, tileResolution);
 
   var framebufferExtent;
   if (!goog.isNull(this.renderedTileRange_) &&
@@ -460,14 +468,14 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
   }
 
   this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
-  tileSource.useLowResolutionTiles(z, frameState.extent, tileGrid);
+  tileSource.useLowResolutionTiles(z, extent, tileGrid);
   this.scheduleExpireCache(frameState, tileSource);
 
   goog.vec.Mat4.makeIdentity(this.texCoordMatrix_);
   goog.vec.Mat4.translate(this.texCoordMatrix_,
-      (view2DState.center.x - framebufferExtent.minX) /
+      (center.x - framebufferExtent.minX) /
           (framebufferExtent.maxX - framebufferExtent.minX),
-      (view2DState.center.y - framebufferExtent.minY) /
+      (center.y - framebufferExtent.minY) /
           (framebufferExtent.maxY - framebufferExtent.minY),
       0);
   goog.vec.Mat4.rotateZ(this.texCoordMatrix_, view2DState.rotation);

src/ol/source/wmtssource.exports

@@ -0,0 +1,2 @@
+@exportClass ol.source.WMTS ol.source.WMTSOptions
+@exportSymbol ol.source.WMTS.optionsFromCapabilities

src/ol/source/wmtssource.js

@@ -0,0 +1,260 @@
+goog.provide('ol.source.WMTS');
+goog.provide('ol.source.WMTSRequestEncoding');
+
+goog.require('ol.Attribution');
+goog.require('ol.Extent');
+goog.require('ol.Projection');
+goog.require('ol.TileCoord');
+goog.require('ol.TileUrlFunction');
+goog.require('ol.TileUrlFunctionType');
+goog.require('ol.projection');
+goog.require('ol.source.ImageTileSource');
+goog.require('ol.tilegrid.WMTS');
+
+
+/**
+ * @enum {string}
+ */
+ol.source.WMTSRequestEncoding = {
+  KVP: 'KVP',  // see spec §8
+  REST: 'REST' // see spec §10
+};
+
+
+
+/**
+ * @constructor
+ * @extends {ol.source.ImageTileSource}
+ * @param {ol.source.WMTSOptions} wmtsOptions WMTS options.
+ */
+ol.source.WMTS = function(wmtsOptions) {
+
+  // TODO: add support for TileMatrixLimits
+
+  var version = goog.isDef(wmtsOptions.version) ?
+      wmtsOptions.version : '1.0.0';
+  var format = goog.isDef(wmtsOptions.format) ?
+      wmtsOptions.format : 'image/jpeg';
+  var dimensions = wmtsOptions.dimensions || {};
+
+  // FIXME: should we guess this requestEncoding from wmtsOptions.url(s)
+  //        structure? that would mean KVP only if a template is not provided.
+  var requestEncoding = goog.isDef(wmtsOptions.requestEncoding) ?
+      wmtsOptions.requestEncoding : ol.source.WMTSRequestEncoding.KVP;
+
+  // FIXME: should we create a default tileGrid?
+  // we could issue a getCapabilities xhr to retrieve missing configuration
+  var tileGrid = wmtsOptions.tileGrid;
+
+  var context = {
+    'Layer': wmtsOptions.layer,
+    'style': wmtsOptions.style,
+    'TileMatrixSet': wmtsOptions.matrixSet
+  };
+  goog.object.extend(context, dimensions);
+  var kvpParams;
+  if (requestEncoding == ol.source.WMTSRequestEncoding.KVP) {
+    kvpParams = {
+      'Service': 'WMTS',
+      'Request': 'GetTile',
+      'Version': version,
+      'Format': format,
+      'TileMatrix': '{TileMatrix}',
+      'TileRow': '{TileRow}',
+      'TileCol': '{TileCol}'
+    };
+    goog.object.extend(kvpParams, context);
+  }
+
+  // TODO: factorize the code below so that it is usable by all sources
+  var urls = wmtsOptions.urls;
+  if (!goog.isDef(urls)) {
+    urls = [];
+    var url = wmtsOptions.url;
+    goog.asserts.assert(goog.isDef(url));
+    var match = /\{(\d)-(\d)\}/.exec(url) || /\{([a-z])-([a-z])\}/.exec(url);
+    if (match) {
+      var startCharCode = match[1].charCodeAt(0);
+      var stopCharCode = match[2].charCodeAt(0);
+      var charCode;
+      for (charCode = startCharCode; charCode <= stopCharCode; ++charCode) {
+        urls.push(url.replace(match[0], String.fromCharCode(charCode)));
+      }
+    } else {
+      urls.push(url);
+    }
+  }
+
+  /**
+   * @param {string} template Template.
+   * @return {ol.TileUrlFunctionType} Tile URL function.
+   */
+  function createFromWMTSTemplate(template) {
+    return function(tileCoord) {
+      if (goog.isNull(tileCoord)) {
+        return undefined;
+      } else {
+        var localContext = {
+          'TileMatrix': tileGrid.getMatrixId(tileCoord.z),
+          'TileCol': tileCoord.x,
+          'TileRow': tileCoord.y
+        };
+        if (requestEncoding != ol.source.WMTSRequestEncoding.KVP) {
+          goog.object.extend(localContext, context);
+        }
+        var url = template;
+        for (var key in localContext) {
+          // FIXME: should we filter properties with hasOwnProperty?
+          url = url.replace('{' + key + '}', localContext[key])
+              .replace('%7B' + key + '%7D', localContext[key]);
+        }
+        return url;
+      }
+    };
+  }
+
+  var tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions(
+      goog.array.map(urls, function(url) {
+        if (goog.isDef(kvpParams)) {
+          // TODO: we may want to create our own appendParams function
+          // so that params order conforms to wmts spec guidance,
+          // and so that we can avoid to escape special template params
+          url = goog.uri.utils.appendParamsFromMap(url, kvpParams);
+        }
+        return createFromWMTSTemplate(url);
+      }));
+
+  tileUrlFunction = ol.TileUrlFunction.withTileCoordTransform(
+      function(tileCoord, tileGrid, projection) {
+        if (tileGrid.getResolutions().length <= tileCoord.z) {
+          return null;
+        }
+        var x = tileCoord.x;
+        var y = -tileCoord.y - 1;
+        var tileExtent = tileGrid.getTileCoordExtent(tileCoord);
+        var projectionExtent = projection.getExtent();
+        var extent = goog.isDef(wmtsOptions.extent) ?
+            wmtsOptions.extent : projectionExtent;
+
+        if (!goog.isNull(extent) && projection.isGlobal() &&
+            extent.minX === projectionExtent.minX &&
+            extent.maxX === projectionExtent.maxX) {
+          var numCols = Math.ceil(
+              (extent.maxX - extent.minX) /
+              (tileExtent.maxX - tileExtent.minX));
+          x = goog.math.modulo(x, numCols);
+          tileExtent = tileGrid.getTileCoordExtent(
+              new ol.TileCoord(tileCoord.z, x, tileCoord.y));
+        }
+        if (!tileExtent.intersects(extent)) {
+          return null;
+        }
+        return new ol.TileCoord(tileCoord.z, x, y);
+      },
+      tileUrlFunction);
+
+  goog.base(this, {
+    attributions: wmtsOptions.attributions,
+    crossOrigin: wmtsOptions.crossOrigin,
+    extent: wmtsOptions.extent,
+    projection: wmtsOptions.projection,
+    tileGrid: tileGrid,
+    tileUrlFunction: tileUrlFunction
+  });
+
+};
+goog.inherits(ol.source.WMTS, ol.source.ImageTileSource);
+
+
+/**
+ * @param {Object} wmtsCap An object representing the capabilities document.
+ * @param {string} layer The layer identifier.
+ * @return {ol.source.WMTSOptions} WMTS source options object.
+ */
+ol.source.WMTS.optionsFromCapabilities = function(wmtsCap, layer) {
+
+  // TODO: add support for TileMatrixLimits
+
+  var layers = wmtsCap['contents']['layers'];
+  var l = goog.array.find(layers, function(elt, index, array) {
+    return elt['identifier'] == layer;
+  });
+  goog.asserts.assert(!goog.isNull(l));
+  goog.asserts.assert(l['tileMatrixSetLinks'].length > 0);
+  var matrixSet = /** @type {string} */
+      (l['tileMatrixSetLinks'][0]['tileMatrixSet']);
+  var format = /** @type {string} */ (l['formats'][0]);
+  var idx = goog.array.findIndex(l['styles'], function(elt, index, array) {
+    return elt['isDefault'];
+  });
+  if (idx < 0) {
+    idx = 0;
+  }
+  var style = /** @type {string} */ (l['styles'][idx]['identifier']);
+
+  var dimensions = {};
+  goog.array.forEach(l['dimensions'], function(elt, index, array) {
+    var key = elt['identifier'];
+    var value = elt['default'];
+    if (goog.isDef(value)) {
+      goog.asserts.assert(goog.array.indexOf(elt['values'], value) >= 0);
+    } else {
+      value = elt['values'][0];
+    }
+    goog.asserts.assert(goog.isDef(value));
+    dimensions[key] = value;
+  });
+
+  var matrixSets = wmtsCap['contents']['tileMatrixSets'];
+  goog.asserts.assert(matrixSet in matrixSets);
+  var matrixSetObj = matrixSets[matrixSet];
+
+  var tileGrid = ol.tilegrid.WMTS.createFromCapabilitiesMatrixSet(
+      matrixSetObj);
+
+  var projection = ol.projection.get(matrixSetObj['supportedCRS']);
+
+  var gets = wmtsCap['operationsMetadata']['GetTile']['dcp']['http']['get'];
+  var encodings = goog.object.getKeys(
+      gets[0]['constraints']['GetEncoding']['allowedValues']);
+  goog.asserts.assert(encodings.length > 0);
+  var requestEncoding = /** @type {ol.source.WMTSRequestEncoding} */
+      (encodings[0]);
+  // TODO: arcgis support, quote from ol2:
+  // The OGC documentation is not clear if we should use REST or RESTful,
+  // ArcGis use RESTful, and OpenLayers use REST.
+
+  var urls;
+  switch (requestEncoding) {
+    case ol.source.WMTSRequestEncoding.REST:
+      goog.asserts.assert(l['resourceUrls'].hasOwnProperty('tile'));
+      goog.asserts.assert(l['resourceUrls']['tile'].hasOwnProperty(format));
+      urls = /** @type {Array.<string>} */
+          (l['resourceUrls']['tile'][format]);
+      break;
+    case ol.source.WMTSRequestEncoding.KVP:
+      urls = [];
+      goog.array.forEach(gets, function(elt, index, array) {
+        if (elt['constraints']['GetEncoding']['allowedValues'].hasOwnProperty(
+            ol.source.WMTSRequestEncoding.KVP)) {
+          urls.push(/** @type {string} */ (elt['url']));
+        }
+      });
+      goog.asserts.assert(urls.length > 0);
+      break;
+    default:
+      goog.asserts.assert(false);
+  }
+
+  return {
+    urls: urls,
+    layer: layer,
+    matrixSet: matrixSet,
+    format: format,
+    projection: projection,
+    requestEncoding: requestEncoding,
+    tileGrid: tileGrid,
+    style: style,
+    dimensions: dimensions
+  };
+};

src/ol/tilegrid/wmtstilegrid.exports

@@ -0,0 +1 @@
+@exportClass ol.tilegrid.WMTS ol.tilegrid.WMTSOptions

src/ol/tilegrid/wmtstilegrid.js

@@ -0,0 +1,83 @@
+goog.provide('ol.tilegrid.WMTS');
+
+goog.require('ol.Size');
+goog.require('ol.projection');
+goog.require('ol.tilegrid.TileGrid');
+
+
+
+/**
+ * @constructor
+ * @extends {ol.tilegrid.TileGrid}
+ * @param {ol.tilegrid.WMTSOptions} wmtsOptions WMTS options.
+ */
+ol.tilegrid.WMTS = function(wmtsOptions) {
+
+  goog.asserts.assert(
+      wmtsOptions.resolutions.length == wmtsOptions.matrixIds.length);
+
+  /**
+   * @private
+   * @type {!Array.<string>}
+   */
+  this.matrixIds_ = wmtsOptions.matrixIds;
+  // FIXME: should the matrixIds become optionnal?
+
+  goog.base(this, {
+    origin: wmtsOptions.origin,
+    origins: wmtsOptions.origins,
+    resolutions: wmtsOptions.resolutions,
+    tileSize: wmtsOptions.tileSize,
+    tileSizes: wmtsOptions.tileSizes
+  });
+
+};
+goog.inherits(ol.tilegrid.WMTS, ol.tilegrid.TileGrid);
+
+
+/**
+ * @param {number} z Z.
+ * @return {string} MatrixId..
+ */
+ol.tilegrid.WMTS.prototype.getMatrixId = function(z) {
+  goog.asserts.assert(0 <= z && z < this.matrixIds_.length);
+  return this.matrixIds_[z];
+};
+
+
+/**
+ * @return {Array.<string>} MatrixIds.
+ */
+ol.tilegrid.WMTS.prototype.getMatrixIds = function() {
+  return this.matrixIds_;
+};
+
+
+/**
+ * @param {Object} matrixSet An object representing a matrixSet in the
+ *     capabilities document.
+ * @return {ol.tilegrid.WMTS} WMTS tileGrid instance.
+ */
+ol.tilegrid.WMTS.createFromCapabilitiesMatrixSet =
+    function(matrixSet) {
+
+  var resolutions = [];
+  var matrixIds = [];
+  var origins = [];
+  var tileSizes = [];
+  var projection = ol.projection.get(matrixSet['supportedCRS']);
+  var metersPerUnit = projection.getMetersPerUnit();
+  goog.array.forEach(matrixSet['matrixIds'], function(elt, index, array) {
+    matrixIds.push(elt['identifier']);
+    origins.push(elt['topLeftCorner']);
+    resolutions.push(elt['scaleDenominator'] * 0.28E-3 / metersPerUnit);
+    tileSizes.push(new ol.Size(elt['tileWidth'], elt['tileHeight']));
+  });
+
+  return new ol.tilegrid.WMTS({
+    origins: origins,
+    resolutions: resolutions,
+    matrixIds: matrixIds,
+    tileSizes: tileSizes
+  });
+};

src/ol/tileurlfunction.js

@@ -60,6 +60,9 @@ ol.TileUrlFunction.createFromTemplates = function(templates) {
  * @return {ol.TileUrlFunctionType} Tile URL function.
  */
 ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
+  if (tileUrlFunctions.length === 1) {
+    return tileUrlFunctions[0];
+  }
   return function(tileCoord, tileGrid, projection) {
     if (goog.isNull(tileCoord)) {
       return undefined;