Merge pull request #301 from ahocevar/offline
Adding CacheRead and CacheWrite controls. r=@elemoine,@fredj
This commit is contained in:
ahocevar
98
tests/Control/CacheRead.html
Normal file
98
tests/Control/CacheRead.html
Normal file
@@ -0,0 +1,98 @@
|
||||
<html>
|
||||
<head>
|
||||
<script>
|
||||
/**
|
||||
* Because browsers that implement requestAnimationFrame may not execute
|
||||
* animation functions while a window is not displayed (e.g. in a hidden
|
||||
* iframe as in these tests), we mask the native implementations here. The
|
||||
* native requestAnimationFrame functionality is tested in Util.html and
|
||||
* in PanZoom.html (where a popup is opened before panning). The tests
|
||||
* here will test the fallback setTimeout implementation for animation.
|
||||
*/
|
||||
window.requestAnimationFrame =
|
||||
window.webkitRequestAnimationFrame =
|
||||
window.mozRequestAnimationFrame =
|
||||
window.oRequestAnimationFrame =
|
||||
window.msRequestAnimationFrame = null;
|
||||
</script>
|
||||
<script src="../OLLoader.js"></script>
|
||||
<script type="text/javascript">
|
||||
function test_addLayer_removeLayer(t) {
|
||||
t.plan(6);
|
||||
var control = new OpenLayers.Control.CacheRead();
|
||||
var map = new OpenLayers.Map({
|
||||
div: "map",
|
||||
controls: [control],
|
||||
layers: [
|
||||
new OpenLayers.Layer.WMS("One"),
|
||||
new OpenLayers.Layer.WMS("Two")
|
||||
]
|
||||
});
|
||||
t.ok(map.layers[0].events.listeners.tileloadstart, "tileloadstart listener registered on layer One");
|
||||
t.ok(map.layers[1].events.listeners.tileloadstart, "tileloadstart listener registered on layer Two");
|
||||
control.destroy();
|
||||
t.ok(!map.layers[1].events.listeners.tileloadstart.length, "tileloadstart listener unregistered");
|
||||
|
||||
control = new OpenLayers.Control.CacheRead({
|
||||
fetchEvent: "tileerror",
|
||||
layers: [map.layers[0]]
|
||||
});
|
||||
map.addControl(control);
|
||||
t.ok(map.layers[0].events.listeners.tileerror, "tileerror listener registered on layer One");
|
||||
t.ok(!map.layers[1].events.listeners.tileerror, "tileerror listener not registered on layer Two");
|
||||
control.destroy();
|
||||
t.ok(!map.layers[0].events.listeners.tileerror.length, "tileerror listener unregistered");
|
||||
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
function test_fetch(t) {
|
||||
|
||||
if (!window.localStorage) {
|
||||
t.plan(1);
|
||||
var scope = {active: true};
|
||||
t.eq(OpenLayers.Control.CacheRead.prototype.fetch.call(scope), undefined, "no tiles fetched when localStorage is not supported.");
|
||||
return;
|
||||
}
|
||||
|
||||
t.plan(4);
|
||||
|
||||
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);
|
||||
|
||||
var layer1 = new OpenLayers.Layer.XYZ("One", "foo/${x}/${y}/${z}");
|
||||
var layer2 = new OpenLayers.Layer.XYZ("Two", "bar/${x}/${y}/${z}", {isBaseLayer: false});
|
||||
var control1 = new OpenLayers.Control.CacheRead({
|
||||
layers: [layer1]
|
||||
});
|
||||
var control2 = new OpenLayers.Control.CacheRead({
|
||||
layers: [layer2],
|
||||
fetchEvent: "tileerror"
|
||||
});
|
||||
var map = new OpenLayers.Map({
|
||||
div: "map",
|
||||
projection: "EPSG:900913",
|
||||
controls: [control1, control2],
|
||||
layers: [layer1, layer2],
|
||||
zoom: 1,
|
||||
center: [0, 0]
|
||||
});
|
||||
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");
|
||||
t.eq(layer2.grid[1][1].imgDiv.src, data, "[tileerror] tile content from cache");
|
||||
t.ok(layer2.grid[0][0].imgDiv.src !== data, "[tileerror] tile content from remote resource");
|
||||
|
||||
window.localStorage.removeItem("olCache_foo/1/1/1");
|
||||
window.localStorage.removeItem("olCache_bar/1/1/1");
|
||||
map.destroy();
|
||||
});
|
||||
}
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="map" style="width: 400px; height: 250px;"/>
|
||||
</body>
|
||||
</html>
|
||||
87
tests/Control/CacheWrite.html
Normal file
87
tests/Control/CacheWrite.html
Normal file
@@ -0,0 +1,87 @@
|
||||
<html>
|
||||
<head>
|
||||
<script src="../OLLoader.js"></script>
|
||||
<script type="text/javascript">
|
||||
function test_addLayer_removeLayer(t) {
|
||||
t.plan(6);
|
||||
var control = new OpenLayers.Control.CacheWrite();
|
||||
var map = new OpenLayers.Map({
|
||||
div: "map",
|
||||
controls: [control],
|
||||
layers: [
|
||||
new OpenLayers.Layer.WMS("One"),
|
||||
new OpenLayers.Layer.WMS("Two")
|
||||
]
|
||||
});
|
||||
t.ok(map.layers[0].events.listeners.tileloaded, "tileloaded listener registered on layer One");
|
||||
t.ok(map.layers[1].events.listeners.tileloaded, "tileloaded listener registered on layer Two");
|
||||
control.destroy();
|
||||
t.ok(!map.layers[1].events.listeners.tileloaded.length, "tileloaded listener unregistered");
|
||||
|
||||
control = new OpenLayers.Control.CacheWrite({
|
||||
layers: [map.layers[0]]
|
||||
});
|
||||
map.addControl(control);
|
||||
t.ok(map.layers[0].events.listeners.tileloaded.length, "tileloaded listener registered on layer One");
|
||||
t.ok(!map.layers[1].events.listeners.tileloaded.length, "tileloaded listener not registered on layer Two");
|
||||
control.destroy();
|
||||
t.ok(!map.layers[0].events.listeners.tileloaded.length, "tileloaded listener unregistered");
|
||||
|
||||
map.destroy();
|
||||
}
|
||||
|
||||
function test_cache_clearCache(t) {
|
||||
|
||||
if (!window.localStorage) {
|
||||
t.plan(2);
|
||||
var scope = {active: true};
|
||||
t.eq(OpenLayers.Control.CacheWrite.prototype.cache.call(scope), undefined, "no tiles cached when localStorage is not supported.");
|
||||
t.ok(!OpenLayers.Control.CacheWrite.clearCache(), "clearCache does nothing when localStorage is not supported.");
|
||||
return;
|
||||
}
|
||||
|
||||
t.plan(3);
|
||||
OpenLayers.Control.CacheWrite.clearCache();
|
||||
var length = window.localStorage.length;
|
||||
|
||||
var tiles = 0;
|
||||
var layer = new OpenLayers.Layer.XYZ("One", "../../img/blank.gif?${x},${y},${z}", {
|
||||
eventListeners: {
|
||||
tileloaded: function() {
|
||||
tiles++;
|
||||
}
|
||||
}
|
||||
});
|
||||
var control = new OpenLayers.Control.CacheWrite({autoActivate: true});
|
||||
var map = new OpenLayers.Map({
|
||||
div: "map",
|
||||
projection: "EPSG:900913",
|
||||
controls: [control],
|
||||
layers: [layer],
|
||||
zoom: 1,
|
||||
center: [0, 0]
|
||||
});
|
||||
t.delay_call(1, function() {
|
||||
var canvasContext = layer.grid[1][1].getCanvasContext();
|
||||
t.eq(window.localStorage.length, length + (canvasContext ? tiles : 0), "cache filled with tiles");
|
||||
var url = layer.grid[1][1].url;
|
||||
// content will be null for browsers that have localStorage but no canvas support
|
||||
var content = canvasContext ? canvasContext.canvas.toDataURL("image/png") : null;
|
||||
t.eq(window.localStorage.getItem("olCache_"+url), content, "localStorage contains correct image data");
|
||||
|
||||
var key = Math.random();
|
||||
window.localStorage.setItem(key, "bar");
|
||||
OpenLayers.Control.CacheWrite.clearCache();
|
||||
t.eq(window.localStorage.length, length + 1, "cache cleared, but foreign entries left in localStorage");
|
||||
window.localStorage.removeItem(key);
|
||||
|
||||
map.destroy();
|
||||
});
|
||||
}
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="map" style="width: 400px; height: 250px;"/>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user