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

guess i missed a few in r2920

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@2921 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2007-03-29 07:09:48 +00:00
parent 919af2ff90
commit 913e040fd6
3 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Layer/MapServer/Untiled.js
+1 -1
View File
@@ -131,7 +131,7 @@ OpenLayers.Layer.MapServer.Untiled.prototype =
//clear out the old tile //clear out the old tile
if (this.tile) { if (this.tile) {
this.tile.clear(); this.tile.clear();
} }
//determine new tile bounds //determine new tile bounds
tests/Layer/test_MapServer.html
+4 -19
View File
@@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script>Z <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script>Z
<script src="../../lib/OpenLayers.js"></script> <script src="../../lib/OpenLayers.js"></script>
<script type="text/javascript"><!-- <script type="text/javascript"><!--
@@ -40,16 +40,7 @@
var img = tile.imgDiv; var img = tile.imgDiv;
var tParams = OpenLayers.Util.extend({},params); var tParams = OpenLayers.Util.extend({},params);
tParams = OpenLayers.Util.extend(tParams, { tParams = OpenLayers.Util.extend(tParams, {␍ layers: 'basic', ␍ mode: 'map',␍ map_imagetype: 'png',␍ mapext:[1,2,3,4],␍ imgext:[1,2,3,4],␍ map_size:[256, 256],␍ imgx:128,␍ imgy:128,␍ imgxy:[256,256]
layers: 'basic',
mode: 'map',
map_imagetype: 'png',
mapext:[1,2,3,4],
imgext:[1,2,3,4],
map_size:[256, 256],
imgx:128,
imgy:128,
imgxy:[256,256]
}); });
t.eq( img.src, t.eq( img.src,
url + "?" + OpenLayers.Util.getParameterString(tParams).replace(/,/g, "+"), url + "?" + OpenLayers.Util.getParameterString(tParams).replace(/,/g, "+"),
@@ -159,15 +150,9 @@
var tLayer = new OpenLayers.Layer.MapServer(name, tUrl, tParams); var tLayer = new OpenLayers.Layer.MapServer(name, tUrl, tParams);
map.addLayer(tLayer); map.addLayer(tLayer);
str = tLayer.getFullRequestString(); str = tLayer.getFullRequestString();
var tParams = { var tParams = {␍ layers: 'basic', ␍ format: 'png',␍ mode: 'map',␍ map_imagetype: 'png'
layers: 'basic',
format: 'png',
mode: 'map',
map_imagetype: 'png'
}; };
␍ var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams);␍ sStr = sStr.replace(/,/g, "+");
var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams);
sStr = sStr.replace(/,/g, "+");
t.eq(str, sStr , "getFullRequestString() works"); t.eq(str, sStr , "getFullRequestString() works");
tests/Layer/test_MapServer_Untiled.html
+9 -9
View File
@@ -34,8 +34,8 @@
map.addLayer(layer); map.addLayer(layer);
var clone = layer.clone(); var clone = layer.clone();
layer.tile = [[1,2],[3,4]]; layer.tile = [[1,2],[3,4]];
t.ok( clone.tile != layer.tile, "clone does not copy tile"); t.ok( clone.tile != layer.tile, "clone does not copy tile");
layer.ratio += 1; layer.ratio += 1;
@@ -100,15 +100,15 @@
map.addLayer(tLayer); map.addLayer(tLayer);
str = tLayer.getFullRequestString(); str = tLayer.getFullRequestString();
var tParams = { var tParams = {
layers: 'basic', layers: 'basic',
format: 'png', format: 'png',
mode: 'map', mode: 'map',
map_imagetype: 'png', map_imagetype: 'png',
srs: 'EPSG:4326' srs: 'EPSG:4326'
}; };
var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams); var sStr = tUrl + "?" + OpenLayers.Util.getParameterString(tParams);
sStr = sStr.replace(/,/g, "+"); sStr = sStr.replace(/,/g, "+");
t.eq(str, sStr , "getFullRequestString() works"); t.eq(str, sStr , "getFullRequestString() works");