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

Merge branch '3526' of https://github.com/tschaub/openlayers into 3526

Browse Source
This commit is contained in:
ahocevar
2011-09-30 17:31:45 -06:00
parent b782df0849 38e59965f1
commit 49e4547865
2 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/OpenLayers/BaseTypes/Bounds.js
View File

@@ -372,27 +372,21 @@ OpenLayers.Bounds = OpenLayers.Class({
* {Boolean} The passed-in lonlat is within this bounds.
*/
containsLonLat: function(ll, options) {
options = options || {};
if (typeof options === "boolean") {
options.inclusive = options;
options = {inclusive: options};
}
options = options || {};
var contains = this.contains(ll.lon, ll.lat, options.inclusive),
worldBounds = options.worldBounds;
if (worldBounds && !contains) {
var worldWidth = worldBounds.getWidth();
ll = ll.clone();
while(!contains && ll.lon > worldBounds.right) {
ll.lon -= worldWidth;
contains = worldBounds.containsLonLat(
ll, {inclusive: options.inclusive}
);
}
while(!contains && ll.lon < worldBounds.left) {
ll.lon += worldWidth;
contains = worldBounds.containsLonLat(
ll, {inclusive: options.inclusive}
);
}
var worldCenterX = (worldBounds.left + worldBounds.right) / 2;
var worldsAway = Math.round((ll.lon - worldCenterX) / worldWidth);
ll.lon -= (worldsAway * worldWidth);
contains = this.containsLonLat(
ll, {inclusive: options.inclusive}
);
}
return contains;
},
@@ -472,10 +466,10 @@ OpenLayers.Bounds = OpenLayers.Class({
* {Boolean} The passed-in bounds object intersects this bounds.
*/
intersectsBounds:function(bounds, options) {
options = options || {};
if (typeof options === "boolean") {
options = {inclusive: true};
if (typeof options === "boolean") {
options = {inclusive: options};
}
options = options || {};
if (options.worldBounds) {
var self = this.wrapDateLine(options.worldBounds);
bounds = bounds.wrapDateLine(options.worldBounds);