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

src/ol/structs/rbush.js

@@ -540,7 +540,7 @@ ol.structs.RBush.prototype.getExtent = function(opt_extent) {
  */
 ol.structs.RBush.prototype.getKey_ = function(value) {
   goog.asserts.assert(goog.isObject(value));
-  return goog.getUid(value) + '';
+  return goog.getUid(value).toString();
 };
 
 
@@ -555,7 +555,6 @@ ol.structs.RBush.prototype.insert = function(extent, value) {
   var key = this.getKey_(value);
   goog.asserts.assert(!this.valueExtent_.hasOwnProperty(key));
   this.insert_(extent, value, this.root_.height - 1);
-  this.valueExtent_[key] = ol.extent.clone(extent);
 };
 
 
@@ -583,6 +582,8 @@ ol.structs.RBush.prototype.insert_ = function(extent, value, level) {
   for (; i >= 0; --i) {
     ol.extent.extend(path[i].extent, extent);
   }
+  var key = this.getKey_(value);
+  this.valueExtent_[key] = ol.extent.clone(extent);
   return node;
 };
 

src/ol/tileurlfunction.js

@@ -37,9 +37,9 @@ ol.TileUrlFunction.createFromTemplate = function(template) {
         if (goog.isNull(tileCoord)) {
           return undefined;
         } else {
-          return template.replace('{z}', '' + tileCoord.z)
-                         .replace('{x}', '' + tileCoord.x)
-                         .replace('{y}', '' + tileCoord.y);
+          return template.replace('{z}', tileCoord.z.toString())
+                         .replace('{x}', tileCoord.x.toString())
+                         .replace('{y}', tileCoord.y.toString());
         }
       });
 };