Pulled up r679:r684 from trunk for the IE performance and bug fixes.
git-svn-id: http://svn.openlayers.org/branches/openlayers/1.0@685 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -33,10 +33,10 @@
|
|||||||
{map: '/www/freemap.in/boston/map/mass.map', layers: 'border,water,roads', format: 'png'} );
|
{map: '/www/freemap.in/boston/map/mass.map', layers: 'border,water,roads', format: 'png'} );
|
||||||
var rapid = new OpenLayers.Layer.WMS( "Rapid Transit",
|
var rapid = new OpenLayers.Layer.WMS( "Rapid Transit",
|
||||||
"http://boston.freemap.in/cgi-bin/mapserv?",
|
"http://boston.freemap.in/cgi-bin/mapserv?",
|
||||||
{map: '/www/freemap.in/boston/map/mass.map', layers: 'rapid_transit', format: 'png'} );
|
{map: '/www/freemap.in/boston/map/mass.map', layers: 'rapid_transit', format: 'png', transparent:'true'} );
|
||||||
var buildings = new OpenLayers.Layer.WMS( "Buildings",
|
var buildings = new OpenLayers.Layer.WMS( "Buildings",
|
||||||
"http://boston.freemap.in/cgi-bin/mapserv?",
|
"http://boston.freemap.in/cgi-bin/mapserv?",
|
||||||
{map: '/www/freemap.in/boston/map/mass.map', layers: 'buildings', format: 'png'} );
|
{map: '/www/freemap.in/boston/map/mass.map', layers: 'buildings', format: 'png', transparent:'true'} );
|
||||||
|
|
||||||
map.addLayer(basemap);
|
map.addLayer(basemap);
|
||||||
map.addLayer(rapid);
|
map.addLayer(rapid);
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ OpenLayers.Control.MouseDefaults.prototype =
|
|||||||
this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
|
this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
|
||||||
this.map.viewPortDiv.appendChild(this.zoomBox);
|
this.map.viewPortDiv.appendChild(this.zoomBox);
|
||||||
}
|
}
|
||||||
|
document.onselectstart=function() { return false; }
|
||||||
Event.stop(evt);
|
Event.stop(evt);
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -111,6 +112,7 @@ OpenLayers.Control.MouseDefaults.prototype =
|
|||||||
} else {
|
} else {
|
||||||
this.map.setCenter(this.map.center);
|
this.map.setCenter(this.map.center);
|
||||||
}
|
}
|
||||||
|
document.onselectstart=null;
|
||||||
this.mouseDragStart = null;
|
this.mouseDragStart = null;
|
||||||
this.map.div.style.cursor = "default";
|
this.map.div.style.cursor = "default";
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -164,6 +164,7 @@ OpenLayers.Control.MouseToolbar.prototype =
|
|||||||
this.map.div.style.cursor = "move";
|
this.map.div.style.cursor = "move";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
document.onselectstart = function() { return false; }
|
||||||
Event.stop(evt);
|
Event.stop(evt);
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -247,6 +248,7 @@ OpenLayers.Control.MouseToolbar.prototype =
|
|||||||
this.map.setCenter(this.map.center);
|
this.map.setCenter(this.map.center);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
document.onselectstart = null;
|
||||||
this.mouseDragStart = null;
|
this.mouseDragStart = null;
|
||||||
this.map.div.style.cursor = "default";
|
this.map.div.style.cursor = "default";
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ OpenLayers.Layer.Grid.prototype = Object.extend( new OpenLayers.Layer(), {
|
|||||||
new OpenLayers.Pixel(tileoffsetx - parseInt(this.map.layerContainerDiv.style.left),
|
new OpenLayers.Pixel(tileoffsetx - parseInt(this.map.layerContainerDiv.style.left),
|
||||||
tileoffsety - parseInt(this.map.layerContainerDiv.style.top))
|
tileoffsety - parseInt(this.map.layerContainerDiv.style.top))
|
||||||
);
|
);
|
||||||
tile.draw();
|
tile.draw((this.params.TRANSPARENT == 'true'));
|
||||||
row.append(tile);
|
row.append(tile);
|
||||||
|
|
||||||
tileoffsetlon += tilelon;
|
tileoffsetlon += tilelon;
|
||||||
@@ -181,7 +181,7 @@ OpenLayers.Layer.Grid.prototype = Object.extend( new OpenLayers.Layer(), {
|
|||||||
bounds.top = bounds.top + deltaLat;
|
bounds.top = bounds.top + deltaLat;
|
||||||
position.y = position.y + deltaY;
|
position.y = position.y + deltaY;
|
||||||
var newTile = this.addTile(bounds, position);
|
var newTile = this.addTile(bounds, position);
|
||||||
newTile.draw();
|
newTile.draw((this.params.TRANSPARENT == 'true'));
|
||||||
newRow.append(newTile);
|
newRow.append(newTile);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -215,7 +215,7 @@ OpenLayers.Layer.Grid.prototype = Object.extend( new OpenLayers.Layer(), {
|
|||||||
bounds.right = bounds.right + deltaLon;
|
bounds.right = bounds.right + deltaLon;
|
||||||
position.x = position.x + deltaX;
|
position.x = position.x + deltaX;
|
||||||
var newTile = this.addTile(bounds, position);
|
var newTile = this.addTile(bounds, position);
|
||||||
newTile.draw();
|
newTile.draw((this.params.TRANSPARENT == 'true'));
|
||||||
|
|
||||||
if (prepend) {
|
if (prepend) {
|
||||||
row = row.prepend(newTile);
|
row = row.prepend(newTile);
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ OpenLayers.Layer.WMS.prototype =
|
|||||||
* @type Boolean
|
* @type Boolean
|
||||||
*/
|
*/
|
||||||
isBaseLayer: function() {
|
isBaseLayer: function() {
|
||||||
return (this.params.TRANSPARENT != true);
|
return (this.params.TRANSPARENT != 'true');
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -35,12 +35,20 @@ OpenLayers.Tile.Image.prototype =
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
draw:function() {
|
draw:function(transparent) {
|
||||||
this.imgDiv = OpenLayers.Util.createAlphaImageDiv(null,
|
if (transparent) {
|
||||||
this.position,
|
this.imgDiv = OpenLayers.Util.createAlphaImageDiv(null,
|
||||||
this.size,
|
this.position,
|
||||||
this.url,
|
this.size,
|
||||||
"absolute");
|
this.url,
|
||||||
|
"absolute");
|
||||||
|
} else {
|
||||||
|
this.imgDiv = OpenLayers.Util.createImage(null,
|
||||||
|
this.position,
|
||||||
|
this.size,
|
||||||
|
this.url,
|
||||||
|
"absolute");
|
||||||
|
}
|
||||||
this.layer.div.appendChild(this.imgDiv);
|
this.layer.div.appendChild(this.imgDiv);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user