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

Update TileCache format determination to support TileCache's weird jpg->jpeg

Browse Source 
translation correctly. Also, update example to show usage, and tests to test
jpeg instead of testing png incorrectly.


git-svn-id: http://svn.openlayers.org/trunk/openlayers@5100 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2007-11-02 02:16:44 +00:00
parent 8007298d7b
commit 07965f6fed
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/tilecache.html
+1 -1
View File
@@ -28,7 +28,7 @@
"http://c2.labs.metacarta.com/wms-c/cache/", "http://c2.labs.metacarta.com/wms-c/cache/",
"http://c3.labs.metacarta.com/wms-c/cache/", "http://c3.labs.metacarta.com/wms-c/cache/",
"http://c4.labs.metacarta.com/wms-c/cache/"], "http://c4.labs.metacarta.com/wms-c/cache/"],
"basic"); "basic", {'format': 'image/png'});
map.addLayer(layer); map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0, 0), 0); map.setCenter(new OpenLayers.LonLat(0, 0), 0);
} }
lib/OpenLayers/Layer/TileCache.js
+1 -1
View File
@@ -52,7 +52,7 @@ OpenLayers.Layer.TileCache = OpenLayers.Class(OpenLayers.Layer.Grid, {
OpenLayers.Layer.Grid.prototype.initialize.apply(this, OpenLayers.Layer.Grid.prototype.initialize.apply(this,
[name, url, {}, options]); [name, url, {}, options]);
this.extension = this.format.split('/')[1].toLowerCase(); this.extension = this.format.split('/')[1].toLowerCase();
this.extension = (this.extension == 'jpeg') ? 'jpg' : this.extension; this.extension = (this.extension == 'jpg') ? 'jpeg' : this.extension;
}, },
/** /**
tests/Layer/test_TileCache.html
+3 -3
View File
@@ -110,16 +110,16 @@
t.plan(2); t.plan(2);
var map = new OpenLayers.Map('map', options); var map = new OpenLayers.Map('map', options);
var options = {'layername':'basic', 'type':'png'}; var options = {'layername':'basic', 'format':'image/jpg'};
layer = new OpenLayers.Layer.TileCache(name, url, layername, options); layer = new OpenLayers.Layer.TileCache(name, url, layername, options);
map.addLayer(layer); map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0), 9); map.setCenter(new OpenLayers.LonLat(0,0), 9);
var tileurl = layer.getURL(new OpenLayers.Bounds(3.515625,45,4.21875,45.703125)); var tileurl = layer.getURL(new OpenLayers.Bounds(3.515625,45,4.21875,45.703125));
t.eq(tileurl, "http://labs.metacarta.com/wms-c/Basic.py/basic/09/000/000/522/000/000/384.png", "Tile URL is correct"); t.eq(tileurl, "http://labs.metacarta.com/wms-c/Basic.py/basic/09/000/000/522/000/000/384.jpeg", "Tile URL is correct");
layer.url = ["http://tilecache1/", "http://tilecache2/", "http://tilecache3/"]; layer.url = ["http://tilecache1/", "http://tilecache2/", "http://tilecache3/"];
tileurl = layer.getURL(new OpenLayers.Bounds(3.515625,45,4.21875,45.703125)); tileurl = layer.getURL(new OpenLayers.Bounds(3.515625,45,4.21875,45.703125));
t.eq(tileurl, "http://tilecache3/basic/09/000/000/522/000/000/384.png", "Tile URL is deterministic"); t.eq(tileurl, "http://tilecache2/basic/09/000/000/522/000/000/384.jpeg", "Tile URL is deterministic");
} }
function test_11_Layer_TileCache_setMap(t) { function test_11_Layer_TileCache_setMap(t) {