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

Merge pull request #998 from bartvde/tilemgrdefault

Browse Source 
enable TileManager by default as suggested by @marcjansen and @bartvde ... (r=@ahocevar)
This commit is contained in:
Bart van den Eijnden
2013-06-06 05:17:19 -07:00
parent 4d52d4aeb5
commit 1c21d9cc15
18 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Control/UTFGrid.html
+1
View File
@@ -30,6 +30,7 @@
});
map = new OpenLayers.Map({
div: "map",
tileManager: null,
projection: "EPSG:900913",
layers: [layer],
center: [0, 0],
tests/Layer/ArcGIS93Rest.html
+2 -2
View File
@@ -60,7 +60,7 @@
t.plan( 6 );
layer = new OpenLayers.Layer.ArcGIS93Rest(name, url, params);
var map = new OpenLayers.Map('map');
var map = new OpenLayers.Map('map', {tileManager: null});
map.addLayer(layer);
var pixel = new OpenLayers.Pixel(5,6);
var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
@@ -258,7 +258,7 @@
t.plan( 9 );
layer = new OpenLayers.Layer.ArcGIS93Rest(name, url, params);
var map = new OpenLayers.Map('map');
var map = new OpenLayers.Map('map', {tileManager: null});
map.addLayer(layer);
var pixel = new OpenLayers.Pixel(5,6);
var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
tests/Layer/Grid.html
+4 -3
View File
@@ -48,7 +48,7 @@
function test_setMap(t) {
t.plan(1);
var map = new OpenLayers.Map('map');
var map = new OpenLayers.Map('map', {tileManager: null});
layer = new OpenLayers.Layer.Grid(name, url, params, null);
map.addLayer(layer);
t.ok(OpenLayers.Element.hasClass(layer.div, "olLayerGrid"),
@@ -1130,7 +1130,7 @@
function test_backbuffer_replace(t) {
t.plan(6);
var map = new OpenLayers.Map('map');
var map = new OpenLayers.Map('map', {tileManager: null});
var layer = new OpenLayers.Layer.WMS('', '../../img/blank.gif');
map.addLayer(layer);
map.zoomToMaxExtent();
@@ -1220,7 +1220,8 @@
var map = new OpenLayers.Map('map', {
resolutions: [32, 16, 8, 4, 2, 1],
zoomMethod: null
zoomMethod: null,
tileManager: null
});
var layer = new OpenLayers.Layer.WMS(
"WMS",
tests/Layer/MapServer.html
+1 -1
View File
@@ -36,7 +36,7 @@
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
layer = new OpenLayers.Layer.MapServer(name, url, params);
var map = new OpenLayers.Map('map');
var map = new OpenLayers.Map('map', {tileManager: null});
map.addLayer(layer);
var pixel = new OpenLayers.Pixel(5,6);
var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
tests/Layer/UTFGrid.html
+2 -1
View File
@@ -32,7 +32,8 @@
projection: "EPSG:900913",
layers: [layer],
center: [0, 0],
zoom: 1
zoom: 1,
tileManager: null
});
}
tests/Layer/WMS.html
+2 -2
View File
@@ -73,7 +73,7 @@
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
layer = new OpenLayers.Layer.WMS(name, url, params);
var map = new OpenLayers.Map('map');
var map = new OpenLayers.Map('map', {tileManager: null});
map.addLayer(layer);
var pixel = new OpenLayers.Pixel(5,6);
var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
@@ -104,7 +104,7 @@
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
layer = new OpenLayers.Layer.WMS(name, url, params, {encodeBBOX:true});
var map = new OpenLayers.Map('map');
var map = new OpenLayers.Map('map', {tileManager: null});
map.addLayer(layer);
var pixel = new OpenLayers.Pixel(5,6);
var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
tests/Layer/WrapDateLine.html
+3 -3
View File
@@ -134,7 +134,7 @@
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
layer = new OpenLayers.Layer.WMS(name, url, params, {'wrapDateLine':true,encodeBBOX:true, buffer: 2});
var m = new OpenLayers.Map('map', {adjustZoom: function(z) {return z;}});
var m = new OpenLayers.Map('map', {tileManager: null, adjustZoom: function(z) {return z;}});
m.addLayer(layer);
m.zoomToMaxExtent();
t.eq(layer.grid[3][0].url, "http://octo.metacarta.com/cgi-bin/mapserv?MAP=%2Fmapdata%2Fvmap_wms.map&LAYERS=basic&FORMAT=image%2Fpng&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&STYLES=&SRS=EPSG%3A4326&BBOX=0%2C-90%2C180%2C90&WIDTH=256&HEIGHT=256", "cell [3][0] is wrapped around the world.");
@@ -151,7 +151,7 @@
"http://www.openlayers.org/world/index.php",
{g: "satellite", map: "world"},
{wrapDateLine: true, buffer: 2} );
var m = new OpenLayers.Map('map', {adjustZoom: function(z) {return z;}});
var m = new OpenLayers.Map('map', {tileManager: null, adjustZoom: function(z) {return z;}});
m.addLayer(layer);
m.zoomToMaxExtent();
t.eq(layer.grid[4][7].url, "http://www.openlayers.org/world/index.php?g=satellite&map=world&i=jpeg&t=0&l=-256&s=221471921.25", "grid[5][7] kamap is okay");
@@ -170,7 +170,7 @@
"prov_bound,fedlimit,rail,road,popplace",
transparent: "true", format: "image/png"},
{wrapDateLine: true, encodeBBOX:true, buffer:2});
var m = new OpenLayers.Map('map', {adjustZoom: function(z) {return z;}});
var m = new OpenLayers.Map('map', {tileManager: null, adjustZoom: function(z) {return z;}});
m.addLayers([baselayer,layer]);
m.zoomToMaxExtent();
t.eq(layer.grid[3][0].url, "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap?LAYERS=bathymetry%2Cland_fn%2Cpark%2Cdrain_fn%2Cdrainage%2Cprov_bound%2Cfedlimit%2Crail%2Croad%2Cpopplace&TRANSPARENT=true&FORMAT=image%2Fpng&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&STYLES=&SRS=EPSG%3A4326&BBOX=0%2C-90%2C180%2C90&WIDTH=256&HEIGHT=256", "grid[0][0] wms overlay is okay");
tests/Map.html
+16 -1
View File
@@ -193,6 +193,7 @@
// test that events.on is called at map construction
var options = {
eventListeners: {foo: "bar"},
tileManager: null,
controls: []
};
OpenLayers.Events.prototype.on = function(obj) {
@@ -207,7 +208,7 @@
OpenLayers.Events.prototype.on = function(obj) {
t.fail("events.on called without eventListeners");
}
var map2 = new OpenLayers.Map("map", {controls: []});
var map2 = new OpenLayers.Map("map", {tileManager: null, controls: []});
OpenLayers.Events.prototype.on = method;
map2.destroy();
}
@@ -2249,6 +2250,20 @@
map.destroy();
}
function test_tileManager(t) {
t.plan(3);
var map = new OpenLayers.Map('map');
t.ok(map.tileManager instanceof OpenLayers.TileManager, "Default tileManager created");
map.destroy();
map = new OpenLayers.Map('map', {tileManager: null});
t.ok(map.tileManager === null, "No tileManager created");
map.destroy();
var options = {cacheSize: 512};
map = new OpenLayers.Map('map', {tileManager: options});
t.eq(map.tileManager.cacheSize, 512, "cacheSize taken from options");
map.destroy();
}
</script>
</head>
<body>
tests/Tile/Image/IFrame.html
+2 -2
View File
@@ -19,7 +19,7 @@
function test_Tile_Image_IFrame_create (t) {
t.plan( 3 );
map = new OpenLayers.Map('map');
map = new OpenLayers.Map('map', {tileManager: null});
var bar = new Array(205).join("1234567890");
layer = new OpenLayers.Layer.WMS(name, wmsUrl,
{layers: 'basic', foo: bar},
@@ -87,7 +87,7 @@
function test_Tile_Image_IFrame_createImage (t) {
t.plan( 9 );
map = new OpenLayers.Map('map');
map = new OpenLayers.Map('map', {tileManager: null});
layer = new OpenLayers.Layer.WMS(name, wmsUrl, {layers: 'basic'}, {tileOptions: {maxGetUrlLength: 0}});
map.addLayer(layer);
var tile = layer.addTile(bounds, position);
tests/Tile/UTFGrid.html
+2 -1
View File
@@ -32,7 +32,8 @@
projection: "EPSG:900913",
layers: [layer],
center: [0, 0],
zoom: 1
zoom: 1,
tileManager: null
});
}
tests/TileManager.html
+1 -1
View File
@@ -134,4 +134,4 @@
<body>
<div id="map" style="width:499px;height:549px;display:none"></div>
</body>
</html>
</html>
tests/deprecated/Layer/MapServer/Untiled.html
+1 -1
View File
@@ -69,7 +69,7 @@
function test_Layer_MapServer_Untiled_mergeNewParams (t) {
t.plan( 5 );
var map = new OpenLayers.Map("map");
var map = new OpenLayers.Map("map", {tileManager: null});
var url = "http://labs.metacarta.com/cgi-bin/mapserv";
layer = new OpenLayers.Layer.MapServer.Untiled(name, url, params);