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

fix for #843 - remove unnecesary url prepping in image tiles

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@3768 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2007-07-16 22:08:28 +00:00
parent cc1b0269c9
commit 918b430802
9 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Layer/Image.js
View File

@@ -159,7 +159,7 @@ OpenLayers.Layer.Image = OpenLayers.Class(OpenLayers.Layer, {
if(firstRendering) {
//create the new tile
this.tile = new OpenLayers.Tile.Image(this, ulPx, this.extent,
this.url, this.tileSize);
null, this.tileSize);
} else {
//just resize the tile and set it's new position
this.tile.size = this.tileSize.clone();

4
lib/OpenLayers/Layer/MapServer.js
View File

@@ -88,8 +88,8 @@ OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
* {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
*/
addTile:function(bounds,position) {
var url = this.getURL(bounds);
return new OpenLayers.Tile.Image(this, position, bounds, url, this.tileSize);
return new OpenLayers.Tile.Image(this, position, bounds,
null, this.tileSize);
},
/**

5
lib/OpenLayers/Layer/MapServer/Untiled.js
View File

@@ -181,9 +181,6 @@ OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(
//determine new tile size
this.setTileSize();
//formulate request url string
var url = this.getURL(tileBounds);
//determine new position (upper left corner of new bounds)
var ul = new OpenLayers.LonLat(tileBounds.left, tileBounds.top);
var pos = this.map.getLayerPxFromLonLat(ul);
@@ -197,7 +194,7 @@ OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(
this.doneLoading = false;
if (!this.tile) {
this.tile = new OpenLayers.Tile.Image(this, pos, tileBounds,
url, this.tileSize);
null, this.tileSize);
this.tile.draw();
var onload = function() {
this.doneLoading = true;

3
lib/OpenLayers/Layer/TMS.js
View File

@@ -116,9 +116,8 @@ OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
* {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
*/
addTile:function(bounds,position) {
var url = this.getURL(bounds);
return new OpenLayers.Tile.Image(this, position, bounds,
url, this.tileSize);
null, this.tileSize);
},
/**

3
lib/OpenLayers/Layer/WMS.js
View File

@@ -162,9 +162,8 @@ OpenLayers.Layer.WMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
* {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
*/
addTile:function(bounds,position) {
var url = this.getURL(bounds);
return new OpenLayers.Tile.Image(this, position, bounds,
url, this.tileSize);
null, this.tileSize);
},
/**

12
lib/OpenLayers/Layer/WorldWind.js
View File

@@ -64,16 +64,8 @@ OpenLayers.Layer.WorldWind = OpenLayers.Class(OpenLayers.Layer.Grid, {
* Method: addTile
*/
addTile:function(bounds,position) {
if (this.map.getResolution() <= (this.lzd/512)
&& this.getZoom() <= this.zoomLevels) {
var url = this.getURL(bounds);
return new OpenLayers.Tile.Image(this, position, bounds,
url, this.tileSize);
} else {
return new OpenLayers.Tile.Image(this, position, bounds,
OpenLayers.Util.getImagesLocation() + "blank.gif",
this.tileSize);
}
return new OpenLayers.Tile.Image(this, position, bounds,
null, this.tileSize);
},
/**

10
lib/OpenLayers/Tile/Image.js
View File

@@ -36,9 +36,9 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
*/
frame: null,
/** TBD 3.0 - reorder the parameters to the init function to put URL
* as last, so we can continue to call tile.initialize()
* without changing the arguments.
/** TBD 3.0 - reorder the parameters to the init function to remove
* URL. the getUrl() function on the layer gets called on
* each draw() and moveTo(), so no need to specify it here.
*
* Constructor: OpenLayers.Tile.Image
* Constructor for a new <OpenLayers.Tile.Image> instance.
@@ -47,13 +47,13 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
* layer - {<OpenLayers.Layer>} layer that the tile will go in.
* position - {<OpenLayers.Pixel>}
* bounds - {<OpenLayers.Bounds>}
* url - {<String>}
* url - {<String>} Deprecated. Remove me in 3.0.
* size - {<OpenLayers.Size>}
*/
initialize: function(layer, position, bounds, url, size) {
OpenLayers.Tile.prototype.initialize.apply(this, arguments);
this.url = url;
this.url = url; //deprecated remove me
this.frame = document.createElement('div');
this.frame.style.overflow = 'hidden';

3
tests/Layer/test_MapServer.html
View File

@@ -124,7 +124,7 @@
}
function test_06_Layer_MapServer_mergeNewParams (t) {
t.plan( 5 );
t.plan( 4 );
var map = new OpenLayers.Map("map");
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
@@ -135,7 +135,6 @@
map.addLayer(layer);
map.zoomToMaxExtent();
t.ok( !layer.grid[0][0].url.match("chickpeas"), "chickpeas is not in URL of first tile in grid" );
layer.mergeNewParams(newParams);

3
tests/Layer/test_WMS.html
View File

@@ -148,7 +148,7 @@
}
function test_06_Layer_WMS_mergeNewParams (t) {
t.plan( 5 );
t.plan( 4 );
var map = new OpenLayers.Map("map");
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
@@ -159,7 +159,6 @@
map.addLayer(layer);
map.zoomToMaxExtent();
t.ok( !layer.grid[0][0].url.match("CHICKPEAS"), "CHICKPEAS is not in URL of first tile in grid" );
layer.mergeNewParams(newParams);