Merge branch '2.12'
This commit is contained in:
@@ -280,7 +280,8 @@ OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
this.externalProjection);
|
||||
}
|
||||
if (geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
|
||||
var wpt = this.buildWptNode(feature);
|
||||
var wpt = this.buildWptNode(geometry);
|
||||
this.appendAttributesNode(wpt, feature);
|
||||
return wpt;
|
||||
} else {
|
||||
var trkNode = this.createElementNSPlus("gpx:trk");
|
||||
@@ -348,16 +349,15 @@ OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
* Builds a wpt node given a point
|
||||
*
|
||||
* Parameters:
|
||||
* feature - {<OpenLayers.Feature.Vector>}
|
||||
* geometry - {<OpenLayers.Geometry.Point>}
|
||||
*
|
||||
* Returns:
|
||||
* {DOMElement} A wpt node
|
||||
*/
|
||||
buildWptNode: function(feature) {
|
||||
buildWptNode: function(geometry) {
|
||||
var node = this.createElementNSPlus("gpx:wpt");
|
||||
node.setAttribute("lon", feature.geometry.x);
|
||||
node.setAttribute("lat", feature.geometry.y);
|
||||
this.appendAttributesNode(node, feature);
|
||||
node.setAttribute("lon", geometry.x);
|
||||
node.setAttribute("lat", geometry.y);
|
||||
return node;
|
||||
},
|
||||
|
||||
|
||||
@@ -233,7 +233,8 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
|
||||
new OpenLayers.Projection("EPSG:4326")
|
||||
);
|
||||
var providers = res.imageryProviders,
|
||||
zoom = this.serverResolutions.indexOf(this.getServerResolution()),
|
||||
zoom = OpenLayers.Util.indexOf(this.serverResolutions,
|
||||
this.getServerResolution()),
|
||||
copyrights = "", provider, i, ii, j, jj, bbox, coverage;
|
||||
for (i=0,ii=providers.length; i<ii; ++i) {
|
||||
provider = providers[i];
|
||||
|
||||
@@ -448,7 +448,9 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
||||
* {DOMElement} The specific render engine's root element
|
||||
*/
|
||||
createRenderRoot: function() {
|
||||
return this.nodeFactory(this.container.id + "_svgRoot", "svg");
|
||||
var svg = this.nodeFactory(this.container.id + "_svgRoot", "svg");
|
||||
svg.style.position = "absolute";
|
||||
return svg;
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@@ -81,20 +81,11 @@ OpenLayers.Strategy.BBOX = OpenLayers.Class(OpenLayers.Strategy, {
|
||||
if(activated) {
|
||||
this.layer.events.on({
|
||||
"moveend": this.update,
|
||||
scope: this
|
||||
});
|
||||
this.layer.events.on({
|
||||
"refresh": this.update,
|
||||
"visibilitychanged": this.update,
|
||||
scope: this
|
||||
});
|
||||
if(this.layer.visibility === true && this.layer.inRange === true) {
|
||||
this.update();
|
||||
} else {
|
||||
this.layer.events.on({
|
||||
"visibilitychanged": this.update,
|
||||
scope: this
|
||||
});
|
||||
}
|
||||
this.update();
|
||||
}
|
||||
return activated;
|
||||
},
|
||||
@@ -134,7 +125,7 @@ OpenLayers.Strategy.BBOX = OpenLayers.Class(OpenLayers.Strategy, {
|
||||
update: function(options) {
|
||||
var mapBounds = this.getMapBounds();
|
||||
if (mapBounds !== null && ((options && options.force) ||
|
||||
this.invalidBounds(mapBounds))) {
|
||||
(this.layer.visibility && this.layer.calculateInRange() && this.invalidBounds(mapBounds)))) {
|
||||
this.calculateBounds(mapBounds);
|
||||
this.resolution = this.layer.map.getResolution();
|
||||
this.triggerRead(options);
|
||||
|
||||
Reference in New Issue
Block a user