Pulling in patches for OL 2.11 RC3:
* ArcGISCache resolutions get compromised by some JS frameworks. (Closes #3474) * OpenLayers.Layer.HTTPRequest initialize simplification (Closes #3470) * missing requires (Closes #3467) * deleting a vertex does not update feature.modified (Closes #3463) * fixing test failure in some browsers (Closes #3461) * a grid layer may be moved while its grid hasn't been initialized yet (Closes #3458) -- this one is the actual release blocker * Change the callback function of Protocol.Script (JSONP) (Closes #3417) * "build.py -c closure" does not work on Windows systems. (Closes #3158) git-svn-id: http://svn.openlayers.org/branches/openlayers/2.11@12274 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -172,21 +172,23 @@ OpenLayers.Layer.ArcGISCache = OpenLayers.Class(OpenLayers.Layer.XYZ, {
|
||||
|
||||
this.lods = [];
|
||||
for(var key in info.tileInfo.lods) {
|
||||
var lod = info.tileInfo.lods[key];
|
||||
if (this.useScales) {
|
||||
this.scales.push(lod.scale);
|
||||
} else {
|
||||
this.resolutions.push(lod.resolution);
|
||||
if (info.tileInfo.lods.hasOwnProperty(key)) {
|
||||
var lod = info.tileInfo.lods[key];
|
||||
if (this.useScales) {
|
||||
this.scales.push(lod.scale);
|
||||
} else {
|
||||
this.resolutions.push(lod.resolution);
|
||||
}
|
||||
|
||||
var start = this.getContainingTileCoords(upperLeft, lod.resolution);
|
||||
lod.startTileCol = start.x;
|
||||
lod.startTileRow = start.y;
|
||||
|
||||
var end = this.getContainingTileCoords(bottomRight, lod.resolution);
|
||||
lod.endTileCol = end.x;
|
||||
lod.endTileRow = end.y;
|
||||
this.lods.push(lod);
|
||||
}
|
||||
|
||||
var start = this.getContainingTileCoords(upperLeft, lod.resolution);
|
||||
lod.startTileCol = start.x;
|
||||
lod.startTileRow = start.y;
|
||||
|
||||
var end = this.getContainingTileCoords(bottomRight, lod.resolution);
|
||||
lod.endTileCol = end.x;
|
||||
lod.endTileRow = end.y;
|
||||
this.lods.push(lod);
|
||||
}
|
||||
|
||||
this.maxExtent = this.calculateMaxExtentWithLOD(this.lods[0]);
|
||||
|
||||
@@ -58,9 +58,7 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
|
||||
* options - {Object} Hashtable of extra options to tag onto the layer
|
||||
*/
|
||||
initialize: function(name, url, params, options) {
|
||||
var newArguments = arguments;
|
||||
newArguments = [name, options];
|
||||
OpenLayers.Layer.prototype.initialize.apply(this, newArguments);
|
||||
OpenLayers.Layer.prototype.initialize.apply(this, [name, options]);
|
||||
this.url = url;
|
||||
this.params = OpenLayers.Util.extend( {}, params);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user