ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1453 from twpayne/clean-ups

Browse Source 
Miscellaneous clean-ups
This commit is contained in:
Tom Payne
2014-01-03 07:04:20 -08:00
parent 94c22055be 6da95e49d2
commit b5b3e22db9
12 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.py
View File

@@ -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')

4
buildcfg/base.json
View File

@@ -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",

4
buildcfg/examples-all.json
View File

@@ -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",

4
buildcfg/ol-all.json
View File

@@ -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",

4
buildcfg/ol-simple.json
View File

@@ -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",

4
buildcfg/ol-whitespace.json
View File

@@ -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",

4
buildcfg/ol.json
View File

@@ -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",

0
src/ol/layer.jsdoc → src/ol/layer/layer.jsdoc
View File

0
src/ol/proj.exports → src/ol/proj/proj.exports
View File

0
src/ol/proj.jsdoc → src/ol/proj/proj.jsdoc
View File

2
src/ol/structs/rbush.js
View File

@@ -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();
};

6
src/ol/tileurlfunction.js
View File

@@ -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());
}
});
};