the Reproject option on tiles has never worked quite perfectly (because of
#429). With the new GoogleMercator? layer going into 2.5, we shouldn't be needing this anyway, so turn it *off* by default, so that we don't have to deal with the pain anymore. (Closes #881) Thx to euz for review. git-svn-id: http://svn.openlayers.org/trunk/openlayers@4181 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -35,10 +35,13 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: reproject
|
* APIProperty: reproject
|
||||||
|
* *Deprecated*. See http://trac.openlayers.org/wiki/SpatialMercator
|
||||||
|
* for information on the replacement for this functionality.
|
||||||
* {Boolean} Whether layer should reproject itself based on base layer
|
* {Boolean} Whether layer should reproject itself based on base layer
|
||||||
* locations. This allows reprojection onto commercial layers.
|
* locations. This allows reprojection onto commercial layers.
|
||||||
* Default is false: Most layers can't reproject, but layers
|
* Default is false: Most layers can't reproject, but layers
|
||||||
* which can create non-square geographic pixels can, like WMS.
|
* which can create non-square geographic pixels can, like WMS.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
reproject: false,
|
reproject: false,
|
||||||
|
|
||||||
|
|||||||
@@ -13,12 +13,6 @@
|
|||||||
*/
|
*/
|
||||||
OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
||||||
|
|
||||||
/**
|
|
||||||
* APIProperty: reproject
|
|
||||||
* {Boolean}
|
|
||||||
*/
|
|
||||||
reproject: false,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: isBaseLayer
|
* APIProperty: isBaseLayer
|
||||||
* {Boolean}
|
* {Boolean}
|
||||||
|
|||||||
@@ -16,13 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
OpenLayers.Layer.TileCache = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
OpenLayers.Layer.TileCache = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
||||||
|
|
||||||
/**
|
|
||||||
* APIProperty: reproject
|
|
||||||
* {Boolean} Try to reproject this layer if it is used as an overlay.
|
|
||||||
* Default is false.
|
|
||||||
*/
|
|
||||||
reproject: false,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: isBaseLayer
|
* APIProperty: isBaseLayer
|
||||||
* {Boolean} Treat this layer as a base layer. Default is true.
|
* {Boolean} Treat this layer as a base layer. Default is true.
|
||||||
|
|||||||
@@ -31,12 +31,14 @@ OpenLayers.Layer.WMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Property: reproject
|
* Property: reproject
|
||||||
|
* *Deprecated*. See http://trac.openlayers.org/wiki/SpatialMercator
|
||||||
|
* for information on the replacement for this functionality.
|
||||||
* {Boolean} Try to reproject this layer if its coordinate reference system
|
* {Boolean} Try to reproject this layer if its coordinate reference system
|
||||||
* is different than that of the base layer. Default is true.
|
* is different than that of the base layer. Default is true.
|
||||||
* Set this in the layer options. Should be set to false in
|
* Set this in the layer options. Should be set to false in
|
||||||
* most cases.
|
* most cases.
|
||||||
*/
|
*/
|
||||||
reproject: true,
|
reproject: false,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIProperty: isBaseLayer
|
* APIProperty: isBaseLayer
|
||||||
|
|||||||
@@ -205,6 +205,12 @@ OpenLayers.Tile = OpenLayers.Class({
|
|||||||
* bounds - {<OpenLayers.Bounds>}
|
* bounds - {<OpenLayers.Bounds>}
|
||||||
*/
|
*/
|
||||||
getBoundsFromBaseLayer: function(position) {
|
getBoundsFromBaseLayer: function(position) {
|
||||||
|
OpenLayers.Console.warn("You are using the 'reproject' option " +
|
||||||
|
"on the " + this.layer.name + " layer. This option is deprecated: " +
|
||||||
|
"its use was designed to support displaying data over commercial " +
|
||||||
|
"basemaps, but that functionality should now be achieved by using " +
|
||||||
|
"Spherical Mercator support. More information is available from " +
|
||||||
|
"http://trac.openlayers.org/wiki/SphericalMercator.");
|
||||||
var topLeft = this.layer.map.getLonLatFromLayerPx(position);
|
var topLeft = this.layer.map.getLonLatFromLayerPx(position);
|
||||||
var bottomRightPx = position.clone();
|
var bottomRightPx = position.clone();
|
||||||
bottomRightPx.x += this.size.w;
|
bottomRightPx.x += this.size.w;
|
||||||
|
|||||||
@@ -282,7 +282,7 @@
|
|||||||
var layer = new OpenLayers.Layer.Google("Google");
|
var layer = new OpenLayers.Layer.Google("Google");
|
||||||
map.addLayer(layer);
|
map.addLayer(layer);
|
||||||
var wmslayer = new OpenLayers.Layer.WMS(name, url, params,
|
var wmslayer = new OpenLayers.Layer.WMS(name, url, params,
|
||||||
{isBaseLayer: false});
|
{isBaseLayer: false, reproject:true});
|
||||||
wmslayer.isBaseLayer=false;
|
wmslayer.isBaseLayer=false;
|
||||||
map.addLayer(wmslayer);
|
map.addLayer(wmslayer);
|
||||||
map.setCenter(new OpenLayers.LonLat(0,0), 5);
|
map.setCenter(new OpenLayers.LonLat(0,0), 5);
|
||||||
|
|||||||
@@ -168,7 +168,7 @@
|
|||||||
var size = new OpenLayers.Size(5,6);
|
var size = new OpenLayers.Size(5,6);
|
||||||
var map = new OpenLayers.Map('map');
|
var map = new OpenLayers.Map('map');
|
||||||
var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
|
var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
|
||||||
"http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'});
|
"http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}, {'reproject': true});
|
||||||
map.addLayer(layer);
|
map.addLayer(layer);
|
||||||
map.zoomToMaxExtent();
|
map.zoomToMaxExtent();
|
||||||
tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-90,-85,-90,85), url, size);
|
tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-90,-85,-90,85), url, size);
|
||||||
@@ -176,7 +176,7 @@
|
|||||||
tile.moveTo(new OpenLayers.Bounds(-185,-90,-180,-80), new OpenLayers.Pixel(-180,-85), true);
|
tile.moveTo(new OpenLayers.Bounds(-185,-90,-180,-80), new OpenLayers.Pixel(-180,-85), true);
|
||||||
t.delay_call( 1, function() { t.eq(tile.imgDiv, null, "Tile imgDiv is null.") } );
|
t.delay_call( 1, function() { t.eq(tile.imgDiv, null, "Tile imgDiv is null.") } );
|
||||||
var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
|
var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
|
||||||
"http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}, {'alpha':true});
|
"http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}, {'reproject': true, 'alpha':true});
|
||||||
map.addLayer(layer);
|
map.addLayer(layer);
|
||||||
tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-90,-85,-90,85), url, size);
|
tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-90,-85,-90,85), url, size);
|
||||||
tile.draw();
|
tile.draw();
|
||||||
|
|||||||
Reference in New Issue
Block a user