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

Fixing typo which causes CacheRead to fail when CacheWrite is active

Browse Source
This commit is contained in:
ahocevar
2012-03-21 19:33:41 +01:00
parent 97582d637f
commit 8d42f33a28
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Control/CacheRead.js
View File

@@ -119,7 +119,7 @@ OpenLayers.Control.CacheRead = OpenLayers.Class(OpenLayers.Control, {
url.indexOf(OpenLayers.ProxyHost) === 0) {
url = OpenLayers.Control.CacheWrite.urlMap[url];
}
var dataURI = window.localStorage.getItem("olCache_" + tile.url);
var dataURI = window.localStorage.getItem("olCache_" + url);
if (dataURI) {
tile.url = dataURI;
if (evt.type === "tileerror") {

14
tests/Control/CacheRead.html
View File

@@ -55,8 +55,8 @@
return;
}
t.plan(4);
t.plan(5);
var data = "data:image/gif;base64,R0lGODlhAQABAIAAAP7//wAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==";
window.localStorage.setItem("olCache_foo/1/1/1", data);
window.localStorage.setItem("olCache_bar/1/1/1", data);
@@ -70,6 +70,7 @@
layers: [layer2],
fetchEvent: "tileerror"
});
var map = new OpenLayers.Map({
div: "map",
projection: "EPSG:900913",
@@ -78,6 +79,15 @@
zoom: 1,
center: [0, 0]
});
OpenLayers.ProxyHost = "proxy?url=";
var tile = new OpenLayers.Tile.Image(layer1, new OpenLayers.LonLat(0, 0), new OpenLayers.Bounds(0, 0, 1, 1), "proxy?url=foo/1/1/1");
OpenLayers.Control.CacheWrite.urlMap[tile.url] = "foo/1/1/1";
control1.fetch({tile: tile});
t.eq(tile.url, data, "proxied url replaced with data uri for original url");
delete OpenLayers.Control.CacheWrite.urlMap[tile.url];
t.delay_call(1, function() {
t.eq(layer1.grid[1][1].imgDiv.src, data, "[tileloadstart] tile content from cache");
t.ok(layer1.grid[0][0].imgDiv.src !== data, "[tileloadstart] tile content from remote resource");