From 46267a9059006fed57fb0586863b386758ced09f Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 2 Jan 2014 22:14:02 +0100 Subject: [PATCH 1/5] Use toString() instead of + '' --- src/ol/structs/rbush.js | 2 +- src/ol/tileurlfunction.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ol/structs/rbush.js b/src/ol/structs/rbush.js index 3f1b20dea8..b84554ac7c 100644 --- a/src/ol/structs/rbush.js +++ b/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(); }; diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js index 008e609f39..d193383766 100644 --- a/src/ol/tileurlfunction.js +++ b/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()); } }); }; From da396039ce49e43cb0582c6c92a70049cf2affe6 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 2 Jan 2014 22:15:32 +0100 Subject: [PATCH 2/5] Move proj.exports and proj.jsdoc into proj directory --- src/ol/{ => proj}/proj.exports | 0 src/ol/{ => proj}/proj.jsdoc | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/{ => proj}/proj.exports (100%) rename src/ol/{ => proj}/proj.jsdoc (100%) diff --git a/src/ol/proj.exports b/src/ol/proj/proj.exports similarity index 100% rename from src/ol/proj.exports rename to src/ol/proj/proj.exports diff --git a/src/ol/proj.jsdoc b/src/ol/proj/proj.jsdoc similarity index 100% rename from src/ol/proj.jsdoc rename to src/ol/proj/proj.jsdoc From c6a1967ccefb3c6e7554d844aa10748b657af43c Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 2 Jan 2014 22:17:29 +0100 Subject: [PATCH 3/5] Move layer.jsdoc into src/ol/layer --- src/ol/{ => layer}/layer.jsdoc | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/{ => layer}/layer.jsdoc (100%) diff --git a/src/ol/layer.jsdoc b/src/ol/layer/layer.jsdoc similarity index 100% rename from src/ol/layer.jsdoc rename to src/ol/layer/layer.jsdoc From 0e7a545871fc34ccdc0386e4075628edd25a5742 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 2 Jan 2014 22:23:15 +0100 Subject: [PATCH 4/5] Add missing dependency for build/ol-all.js --- build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.py b/build.py index 64e5b04473..fbb28d86ac 100755 --- a/build.py +++ b/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, - LIBTESS_JS_SRC, 'buildcfg/base.json', 'buildcfg/ol-all.json') +@target('build/ol-all.js', PLOVR_JAR, SRC, EXTERNAL_SRC, INTERNAL_SRC, + 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') From 6da95e49d280f15be1d022a546e2112e2b07ad32 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Fri, 3 Jan 2014 14:33:49 +0100 Subject: [PATCH 5/5] Sort externs files alphabetically --- buildcfg/base.json | 4 ++-- buildcfg/examples-all.json | 4 ++-- buildcfg/ol-all.json | 4 ++-- buildcfg/ol-simple.json | 4 ++-- buildcfg/ol-whitespace.json | 4 ++-- buildcfg/ol.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/buildcfg/base.json b/buildcfg/base.json index 9435a339fe..956f26a727 100644 --- a/buildcfg/base.json +++ b/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", diff --git a/buildcfg/examples-all.json b/buildcfg/examples-all.json index 32af55283e..4812a4bb65 100644 --- a/buildcfg/examples-all.json +++ b/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", diff --git a/buildcfg/ol-all.json b/buildcfg/ol-all.json index 02563fec18..5e9c1057f4 100644 --- a/buildcfg/ol-all.json +++ b/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", diff --git a/buildcfg/ol-simple.json b/buildcfg/ol-simple.json index 4afa4b5ff6..74b989a243 100644 --- a/buildcfg/ol-simple.json +++ b/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", diff --git a/buildcfg/ol-whitespace.json b/buildcfg/ol-whitespace.json index b74b4a8376..fe8ffdf282 100644 --- a/buildcfg/ol-whitespace.json +++ b/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", diff --git a/buildcfg/ol.json b/buildcfg/ol.json index 6c207af40a..0b73e72219 100644 --- a/buildcfg/ol.json +++ b/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",