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

build.py

@@ -215,8 +215,9 @@ def build_ol_whitespace_js(t):
 virtual('build-all', 'build/ol-all.js')
 
 
-@target('build/ol-all.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC,
+@target('build/ol-all.js', PLOVR_JAR, SRC, EXTERNAL_SRC, INTERNAL_SRC,
-        LIBTESS_JS_SRC, 'buildcfg/base.json', 'buildcfg/ol-all.json')
+        SHADER_SRC, LIBTESS_JS_SRC, 'buildcfg/base.json',
+        'buildcfg/ol-all.json')
 def build_ol_all_js(t):
     t.output('%(JAVA)s', '-server', '-XX:+TieredCompilation', '-jar',
             PLOVR_JAR, 'build', 'buildcfg/ol-all.json')

buildcfg/base.json

@@ -49,12 +49,12 @@
   "externs": [
     "//json.js",
     "../externs/bingmaps.js",
+    "../externs/closure-compiler.js",
     "../externs/geojson.js",
-    "../externs/topojson.js",
     "../externs/oli.js",
     "../externs/proj4js.js",
     "../externs/tilejson.js",
-    "../externs/closure-compiler.js"
+    "../externs/topojson.js"
   ],
 
   "level": "VERBOSE",

buildcfg/examples-all.json

@@ -4,12 +4,12 @@
         "//jquery-1.7.js", 
         "../externs/bingmaps.js", 
         "../externs/bootstrap.js", 
+        "../externs/closure-compiler.js",
         "../externs/geojson.js", 
-        "../externs/topojson.js", 
         "../externs/oli.js", 
         "../externs/proj4js.js", 
         "../externs/tilejson.js", 
-        "../externs/closure-compiler.js"
+        "../externs/topojson.js"
     ], 
     "id": "simple", 
     "inherits": "base.json", 

buildcfg/ol-all.json

@@ -6,12 +6,12 @@
     "//json.js",
     "../build/src/external/externs/types.js",
     "../externs/bingmaps.js",
+    "../externs/closure-compiler.js",
     "../externs/geojson.js",
-    "../externs/topojson.js",
     "../externs/oli.js",
     "../externs/proj4js.js",
     "../externs/tilejson.js",
-    "../externs/closure-compiler.js"
+    "../externs/topojson.js"
   ],
 
   "inherits": "base.json",

buildcfg/ol-simple.json

@@ -16,12 +16,12 @@
     "//json.js",
     "../build/src/external/externs/types.js",
     "../externs/bingmaps.js",
+    "../externs/closure-compiler.js",
     "../externs/geojson.js",
-    "../externs/topojson.js",
     "../externs/oli.js",
     "../externs/proj4js.js",
     "../externs/tilejson.js",
-    "../externs/closure-compiler.js"
+    "../externs/topojson.js"
   ],
 
   "inherits": "ol.json",

buildcfg/ol-whitespace.json

@@ -16,12 +16,12 @@
   "externs": [
     "//json.js",
     "../externs/bingmaps.js",
+    "../externs/closure-compiler.js",
     "../externs/geojson.js",
-    "../externs/topojson.js",
     "../externs/oli.js",
     "../externs/proj4js.js",
     "../externs/tilejson.js",
-    "../externs/closure-compiler.js"
+    "../externs/topojson.js"
   ],
 
   "inherits": "ol.json",

buildcfg/ol.json

@@ -16,12 +16,12 @@
     "//json.js",
     "../build/src/external/externs/types.js",
     "../externs/bingmaps.js",
+    "../externs/closure-compiler.js",
     "../externs/geojson.js",
-    "../externs/topojson.js",
     "../externs/oli.js",
     "../externs/proj4js.js",
     "../externs/tilejson.js",
-    "../externs/closure-compiler.js"
+    "../externs/topojson.js"
   ],
 
   "inherits": "base.json",

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)
+          return template.replace('{z}', tileCoord.z.toString())
-                         .replace('{x}', '' + tileCoord.x)
+                         .replace('{x}', tileCoord.x.toString())
-                         .replace('{y}', '' + tileCoord.y);
+                         .replace('{y}', tileCoord.y.toString());
         }
       });
 };