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

Pullups for OL 2.8 RC3.

Browse Source 
jQuery lib fix (Closes #1391)
  getRenderedSize regression (Closes #1906)
  element.scrolls error with panzoombar (Closes #2054)
  createUrlObject bug (Closes #2060)
  google layer in late rendered maps (Closes #2075)
  IE6/Lang.nb bug (Closes #2093)
  Layer.TMS/TileCache bugs (Closes #2099) (Closes #2100)
  Graphic names issues (Closes #2101)


git-svn-id: http://svn.openlayers.org/branches/openlayers/2.8@9406 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2009-05-22 14:03:17 +00:00
parent 6162cbafec
commit aeff2e62df
14 changed files with 168 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/OpenLayers/Events.js
View File

@@ -435,6 +435,14 @@ OpenLayers.Events = OpenLayers.Class({
*/
includeXY: false,
/**
* Method: clearMouseListener
* A version of <clearMouseCache> that is bound to this instance so that
* it can be used with <OpenLayers.Event.observe> and
* <OpenLayers.Event.stopObserving>.
*/
clearMouseListener: null,
/**
* Constructor: OpenLayers.Events
* Construct an OpenLayers.Events object.
@@ -458,6 +466,11 @@ OpenLayers.Events = OpenLayers.Class({
this.eventHandler = OpenLayers.Function.bindAsEventListener(
this.handleBrowserEvent, this
);
// to be used with observe and stopObserving
this.clearMouseListener = OpenLayers.Function.bind(
this.clearMouseCache, this
);
// if eventTypes is specified, create a listeners list for each
// custom application event.
@@ -481,6 +494,11 @@ OpenLayers.Events = OpenLayers.Class({
destroy: function () {
if (this.element) {
OpenLayers.Event.stopObservingElement(this.element);
if(this.element.hasScrollEvent) {
OpenLayers.Event.stopObserving(
window, "scroll", this.clearMouseListener
);
}
}
this.element = null;
@@ -773,8 +791,7 @@ OpenLayers.Events = OpenLayers.Class({
if (!this.includeXY) {
this.clearMouseCache();
} else if (!this.element.hasScrollEvent) {
OpenLayers.Event.observe(window, 'scroll',
OpenLayers.Function.bind(this.clearMouseCache, this));
OpenLayers.Event.observe(window, "scroll", this.clearMouseListener);
this.element.hasScrollEvent = true;
}

3
lib/OpenLayers/Lang/nb.js
View File

@@ -93,8 +93,7 @@ OpenLayers.Lang["nb"] = {
"Denne innstillingen er foreldet, den var ment for <20> st<73>tte " +
"visning av kartdata over kommersielle bakgrunnskart, men det " +
"b<>r n<> gj<67>res med st<73>tten for Spherical Mercator. Mer informasjon " +
"finnes p<> " +
"http://trac.openlayers.org/wiki/SphericalMercator.",
"finnes p<> http://trac.openlayers.org/wiki/SphericalMercator.",
// console message
'methodDeprecated':

12
lib/OpenLayers/Layer/Google.js
View File

@@ -212,14 +212,14 @@ OpenLayers.Layer.Google = OpenLayers.Class(
* evt - {Event}
*/
onMapResize: function() {
if(this.visibility) {
// workaround for resizing of invisible or not yet fully loaded layers
// where GMap2.checkResize() does not work. We need to load all tiles
// for the old div size, then checkResize(), and then call
// layer.moveTo() to trigger GMap.setCenter() (which will finish
// the GMap initialization).
if(this.visibility && this.mapObject.isLoaded()) {
this.mapObject.checkResize();
} else {
// workaround for resizing of invisible layers where
// GMap2.checkResize() does not work. We need to load all tiles
// for the old div size, then checkResize(), and then call
// layer.moveTo() to trigger GMap.setCenter() (which will finish
// the GMap initialization).
if(!this._resized) {
var layer = this;
var handle = GEvent.addListener(this.mapObject, "tilesloaded", function() {

4
lib/OpenLayers/Layer/TMS.js
View File

@@ -105,7 +105,9 @@ OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
var res = this.map.getResolution();
var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
var z = this.serverResolutions != null ? this.serverResolutions.indexOf(res) : this.map.getZoom();
var z = this.serverResolutions != null ?
OpenLayers.Util.indexOf(this.serverResolutions, res) :
this.map.getZoom();
var path = this.serviceVersion + "/" + this.layername + "/" + z + "/" + x + "/" + y + "." + this.type;
var url = this.url;
if (url instanceof Array) {

4
lib/OpenLayers/Layer/TileCache.js
View File

@@ -105,7 +105,9 @@ OpenLayers.Layer.TileCache = OpenLayers.Class(OpenLayers.Layer.Grid, {
var size = this.tileSize;
var tileX = Math.round((bounds.left - bbox.left) / (res * size.w));
var tileY = Math.round((bounds.bottom - bbox.bottom) / (res * size.h));
var tileZ = this.serverResolutions != null ? this.serverResolutions.indexOf(res) : this.map.getZoom();
var tileZ = this.serverResolutions != null ?
OpenLayers.Util.indexOf(this.serverResolutions, res) :
this.map.getZoom();
/**
* Zero-pad a positive integer.
* number - {Int}

17
lib/OpenLayers/Map.js
View File

@@ -1661,13 +1661,16 @@ OpenLayers.Map = OpenLayers.Class({
var bounds = this.getExtent();
//send the move call to the baselayer and all the overlays
this.baseLayer.moveTo(bounds, zoomChanged, dragging);
if(dragging) {
this.baseLayer.events.triggerEvent("move");
} else {
this.baseLayer.events.triggerEvent("moveend",
{"zoomChanged": zoomChanged}
);
if(this.baseLayer.visibility) {
this.baseLayer.moveTo(bounds, zoomChanged, dragging);
if(dragging) {
this.baseLayer.events.triggerEvent("move");
} else {
this.baseLayer.events.triggerEvent("moveend",
{"zoomChanged": zoomChanged}
);
}
}
bounds = this.baseLayer.getExtent();

2
lib/OpenLayers/Popup.js
View File

@@ -506,7 +506,7 @@ OpenLayers.Popup = OpenLayers.Class({
// contents into a fake contentDiv (for the CSS) and then measuring it
var preparedHTML = "<div class='" + this.contentDisplayClass+ "'>" +
this.contentDiv.innerHTML +
"<div>";
"</div>";
var containerElement = (this.map) ? this.map.layerContainerDiv
: document.body;

29
lib/OpenLayers/Renderer/SVG.js
View File

@@ -291,23 +291,28 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
var href = "#" + id;
pos = this.getPosition(node);
widthFactor = this.symbolSize[id] / size;
// Only set the href if it is different from the current one.
// This is a workaround for strange rendering behavior in FF3.
if (node.getAttributeNS(this.xlinkns, "href") != href) {
node.setAttributeNS(this.xlinkns, "href", href);
} else if (size != parseFloat(node.getAttributeNS(null, "width"))) {
// hide the element (and force a reflow so it really gets
// hidden. This workaround is needed for Safari.
node.style.visibility = "hidden";
this.container.scrollLeft = this.container.scrollLeft;
// remove the node from the dom before we modify it. This
// prevents various rendering issues in Safari and FF
var parent = node.parentNode;
var nextSibling = node.nextSibling;
if(parent) {
parent.removeChild(node);
}
node.setAttributeNS(this.xlinkns, "href", href);
node.setAttributeNS(null, "width", size);
node.setAttributeNS(null, "height", size);
node.setAttributeNS(null, "x", pos.x - offset);
node.setAttributeNS(null, "y", pos.y - offset);
// set the visibility back to normal (after the Safari
// workaround above)
node.style.visibility = "";
// now that the node has all its new properties, insert it
// back into the dom where it was
if(nextSibling) {
parent.insertBefore(node, nextSibling);
} else if(parent) {
parent.appendChild(node);
}
} else {
node.setAttributeNS(null, "r", style.pointRadius);
}

58
lib/OpenLayers/Util.js
View File

@@ -32,10 +32,10 @@ OpenLayers.Util.getElement = function() {
};
/**
* Maintain $() from prototype
* Maintain existing definition of $.
*/
if ($ == null) {
var $ = OpenLayers.Util.getElement;
if(typeof window.$ === "undefined") {
window.$ = OpenLayers.Util.getElement;
}
/**
@@ -1346,7 +1346,21 @@ OpenLayers.Util.isEquivalentUrl = function(url1, url2, options) {
OpenLayers.Util.createUrlObject = function(url, options) {
options = options || {};
var urlObject = {};
// deal with relative urls first
if(!(/^\w+:\/\//).test(url)) {
var loc = window.location;
var port = loc.port ? ":" + loc.port : "";
var fullUrl = loc.protocol + "//" + loc.host + port;
if(url.indexOf("/") === 0) {
// full pathname
url = fullUrl + url;
} else {
// relative to current path
var parts = loc.pathname.split("/");
parts.pop();
url = fullUrl + parts.join("/") + "/" + url;
}
}
if (options.ignoreCase) {
url = url.toLowerCase();
@@ -1355,13 +1369,15 @@ OpenLayers.Util.createUrlObject = function(url, options) {
var a = document.createElement('a');
a.href = url;
var urlObject = {};
//host (without port)
// if we don't have a host (which is the case with URLs starting with "/"
// in IE), take the window location's host to match other browsers that
// fill in the window's location host automatically
urlObject.host = a.host || window.location.host;
var port = a.port;
if (port.length <= 0) {
if (port.length > 0) {
var newHostLength = urlObject.host.length - (port.length);
urlObject.host = urlObject.host.substring(0, newHostLength);
}
@@ -1540,9 +1556,7 @@ OpenLayers.Util.getRenderedDimensions = function(contentHTML, size, options) {
// create temp container div with restricted size
var container = document.createElement("div");
container.style.overflow= "";
container.style.position = "absolute";
container.style.left = "-9999px";
container.style.visibility = "hidden";
var containerElement = (options && options.containerElement)
? options.containerElement : document.body;
@@ -1567,12 +1581,40 @@ OpenLayers.Util.getRenderedDimensions = function(contentHTML, size, options) {
var content = document.createElement("div");
content.innerHTML = contentHTML;
// we need overflow visible when calculating the size
content.style.overflow = "visible";
if (content.childNodes) {
for (var i=0, l=content.childNodes.length; i<l; i++) {
if (!content.childNodes[i].style) continue;
content.childNodes[i].style.overflow = "visible";
}
}
// add content to restricted container
container.appendChild(content);
// append container to body for rendering
containerElement.appendChild(container);
// Opera and IE7 can't handle a node with position:aboslute if it inherits
// position:absolute from a parent.
var parentHasPositionAbsolute = false;
var parent = container.parentNode;
while (parent && parent.tagName.toLowerCase()!="body") {
var parentPosition = OpenLayers.Element.getStyle(parent, "position");
if(parentPosition == "absolute") {
parentHasPositionAbsolute = true;
break;
} else if (parentPosition && parentPosition != "static") {
break;
}
parent = parent.parentNode;
}
if(!parentHasPositionAbsolute) {
container.style.position = "absolute";
}
// calculate scroll width of content and add corners and shadow width
if (!w) {
w = parseInt(content.scrollWidth);