protect for in loops with hasOwnProperty
This commit is contained in:
@@ -91,11 +91,13 @@ OpenLayers.Util.extend = function(destination, source) {
|
|||||||
destination = destination || {};
|
destination = destination || {};
|
||||||
if (source) {
|
if (source) {
|
||||||
for (var property in source) {
|
for (var property in source) {
|
||||||
|
if (source.hasOwnProperty(property)) {
|
||||||
var value = source[property];
|
var value = source[property];
|
||||||
if (value !== undefined) {
|
if (value !== undefined) {
|
||||||
destination[property] = value;
|
destination[property] = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* IE doesn't include the toString property when iterating over an object's
|
* IE doesn't include the toString property when iterating over an object's
|
||||||
|
|||||||
@@ -258,9 +258,11 @@ OpenLayers.Control.GetFeature = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
activate: function () {
|
activate: function () {
|
||||||
if (!this.active) {
|
if (!this.active) {
|
||||||
for(var i in this.handlers) {
|
for(var i in this.handlers) {
|
||||||
|
if (this.handlers.hasOwnProperty(i)) {
|
||||||
this.handlers[i].activate();
|
this.handlers[i].activate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return OpenLayers.Control.prototype.activate.apply(
|
return OpenLayers.Control.prototype.activate.apply(
|
||||||
this, arguments
|
this, arguments
|
||||||
);
|
);
|
||||||
@@ -276,9 +278,11 @@ OpenLayers.Control.GetFeature = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
deactivate: function () {
|
deactivate: function () {
|
||||||
if (this.active) {
|
if (this.active) {
|
||||||
for(var i in this.handlers) {
|
for(var i in this.handlers) {
|
||||||
|
if (this.handlers.hasOwnProperty(i)) {
|
||||||
this.handlers[i].deactivate();
|
this.handlers[i].deactivate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return OpenLayers.Control.prototype.deactivate.apply(
|
return OpenLayers.Control.prototype.deactivate.apply(
|
||||||
this, arguments
|
this, arguments
|
||||||
);
|
);
|
||||||
@@ -560,8 +564,10 @@ OpenLayers.Control.GetFeature = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
unselectAll: function() {
|
unselectAll: function() {
|
||||||
// we'll want an option to supress notification here
|
// we'll want an option to supress notification here
|
||||||
for(var fid in this.features) {
|
for(var fid in this.features) {
|
||||||
|
if (this.features.hasOwnProperty(fid)) {
|
||||||
this.unselect(this.features[fid]);
|
this.unselect(this.features[fid]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -573,8 +579,10 @@ OpenLayers.Control.GetFeature = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
*/
|
*/
|
||||||
setMap: function(map) {
|
setMap: function(map) {
|
||||||
for(var i in this.handlers) {
|
for(var i in this.handlers) {
|
||||||
|
if (this.handlers.hasOwnProperty(i)) {
|
||||||
this.handlers[i].setMap(map);
|
this.handlers[i].setMap(map);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
OpenLayers.Control.prototype.setMap.apply(this, arguments);
|
OpenLayers.Control.prototype.setMap.apply(this, arguments);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -193,8 +193,10 @@ OpenLayers.Control.NavigationHistory = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
this.next.destroy();
|
this.next.destroy();
|
||||||
this.deactivate();
|
this.deactivate();
|
||||||
for(var prop in this) {
|
for(var prop in this) {
|
||||||
|
if (this.hasOwnProperty(prop)) {
|
||||||
this[prop] = null;
|
this[prop] = null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -334,6 +336,7 @@ OpenLayers.Control.NavigationHistory = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
setListeners: function() {
|
setListeners: function() {
|
||||||
this.listeners = {};
|
this.listeners = {};
|
||||||
for(var type in this.registry) {
|
for(var type in this.registry) {
|
||||||
|
if (this.registry.hasOwnProperty(type)) {
|
||||||
this.listeners[type] = OpenLayers.Function.bind(function() {
|
this.listeners[type] = OpenLayers.Function.bind(function() {
|
||||||
if(!this.restoring) {
|
if(!this.restoring) {
|
||||||
var state = this.registry[type].apply(this, arguments);
|
var state = this.registry[type].apply(this, arguments);
|
||||||
@@ -354,6 +357,7 @@ OpenLayers.Control.NavigationHistory = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
return true;
|
return true;
|
||||||
}, this);
|
}, this);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -371,8 +375,10 @@ OpenLayers.Control.NavigationHistory = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
this.setListeners();
|
this.setListeners();
|
||||||
}
|
}
|
||||||
for(var type in this.listeners) {
|
for(var type in this.listeners) {
|
||||||
|
if (this.listeners.hasOwnProperty(type)) {
|
||||||
this.map.events.register(type, this, this.listeners[type]);
|
this.map.events.register(type, this, this.listeners[type]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
activated = true;
|
activated = true;
|
||||||
if(this.previousStack.length == 0) {
|
if(this.previousStack.length == 0) {
|
||||||
this.initStack();
|
this.initStack();
|
||||||
@@ -405,10 +411,12 @@ OpenLayers.Control.NavigationHistory = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
if(this.map) {
|
if(this.map) {
|
||||||
if(OpenLayers.Control.prototype.deactivate.apply(this)) {
|
if(OpenLayers.Control.prototype.deactivate.apply(this)) {
|
||||||
for(var type in this.listeners) {
|
for(var type in this.listeners) {
|
||||||
|
if (this.listeners.hasOwnProperty(type)) {
|
||||||
this.map.events.unregister(
|
this.map.events.unregister(
|
||||||
type, this, this.listeners[type]
|
type, this, this.listeners[type]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if(this.clearOnDeactivate) {
|
if(this.clearOnDeactivate) {
|
||||||
this.clear();
|
this.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -168,12 +168,17 @@ OpenLayers.Control.SLDSelect = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
* Take care of things that are not handled in superclass.
|
* Take care of things that are not handled in superclass.
|
||||||
*/
|
*/
|
||||||
destroy: function() {
|
destroy: function() {
|
||||||
for (var key in this.layerCache) {
|
var key;
|
||||||
|
for (key in this.layerCache) {
|
||||||
|
if (this.layerCache.hasOwnProperty(key)) {
|
||||||
delete this.layerCache[key];
|
delete this.layerCache[key];
|
||||||
}
|
}
|
||||||
for (var key in this.wfsCache) {
|
}
|
||||||
|
for (key in this.wfsCache) {
|
||||||
|
if (this.wfsCache.hasOwnProperty(key)) {
|
||||||
delete this.wfsCache[key];
|
delete this.wfsCache[key];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
OpenLayers.Control.prototype.destroy.apply(this, arguments);
|
OpenLayers.Control.prototype.destroy.apply(this, arguments);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -456,12 +456,14 @@ OpenLayers.Control.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Control, {
|
|||||||
}
|
}
|
||||||
var layers;
|
var layers;
|
||||||
for (var url in services) {
|
for (var url in services) {
|
||||||
|
if (services.hasOwnProperty(url)) {
|
||||||
layers = services[url];
|
layers = services[url];
|
||||||
var wmsOptions = this.buildWMSOptions(url, layers,
|
var wmsOptions = this.buildWMSOptions(url, layers,
|
||||||
clickPosition, layers[0].params.FORMAT);
|
clickPosition, layers[0].params.FORMAT);
|
||||||
OpenLayers.Request.GET(wmsOptions);
|
OpenLayers.Request.GET(wmsOptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -564,6 +564,7 @@ OpenLayers.Format.GML.Base = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
this.writeNode("feature:_geometry", feature.geometry, node);
|
this.writeNode("feature:_geometry", feature.geometry, node);
|
||||||
}
|
}
|
||||||
for(var name in feature.attributes) {
|
for(var name in feature.attributes) {
|
||||||
|
if (feature.attributes.hasOwnProperty(name)) {
|
||||||
var value = feature.attributes[name];
|
var value = feature.attributes[name];
|
||||||
if(value != null) {
|
if(value != null) {
|
||||||
this.writeNode(
|
this.writeNode(
|
||||||
@@ -572,6 +573,7 @@ OpenLayers.Format.GML.Base = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return node;
|
return node;
|
||||||
},
|
},
|
||||||
"_geometry": function(geometry) {
|
"_geometry": function(geometry) {
|
||||||
|
|||||||
@@ -325,6 +325,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
featureNode.appendChild(linkNode);
|
featureNode.appendChild(linkNode);
|
||||||
}
|
}
|
||||||
for(var attr in feature.attributes) {
|
for(var attr in feature.attributes) {
|
||||||
|
if (feature.attributes.hasOwnProperty(attr)) {
|
||||||
if (attr == "link" || attr == "title" || attr == "description") { continue; }
|
if (attr == "link" || attr == "title" || attr == "description") { continue; }
|
||||||
var attrText = this.createTextNode(feature.attributes[attr]);
|
var attrText = this.createTextNode(feature.attributes[attr]);
|
||||||
var nodename = attr;
|
var nodename = attr;
|
||||||
@@ -335,6 +336,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
attrContainer.appendChild(attrText);
|
attrContainer.appendChild(attrText);
|
||||||
featureNode.appendChild(attrContainer);
|
featureNode.appendChild(attrContainer);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
featureNode.appendChild(geometryNode);
|
featureNode.appendChild(geometryNode);
|
||||||
return featureNode;
|
return featureNode;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -140,6 +140,7 @@ OpenLayers.Format.OSM = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
feat_list[i] = feat;
|
feat_list[i] = feat;
|
||||||
}
|
}
|
||||||
for (var node_id in nodes) {
|
for (var node_id in nodes) {
|
||||||
|
if (nodes.hasOwnProperty(node_id)) {
|
||||||
var node = nodes[node_id];
|
var node = nodes[node_id];
|
||||||
if (!node.used || this.checkTags) {
|
if (!node.used || this.checkTags) {
|
||||||
var tags = null;
|
var tags = null;
|
||||||
@@ -168,6 +169,7 @@ OpenLayers.Format.OSM = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
// Memory cleanup
|
// Memory cleanup
|
||||||
node.node = null;
|
node.node = null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return feat_list;
|
return feat_list;
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -273,12 +275,14 @@ OpenLayers.Format.OSM = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
}
|
}
|
||||||
if (this.checkTags) {
|
if (this.checkTags) {
|
||||||
for(var key in way.tags) {
|
for(var key in way.tags) {
|
||||||
|
if (way.tags.hasOwnProperty(key)) {
|
||||||
if (this.areaTags[key]) {
|
if (this.areaTags[key]) {
|
||||||
poly_tags = true;
|
poly_tags = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return poly_shaped && (this.checkTags ? poly_tags : true);
|
return poly_shaped && (this.checkTags ? poly_tags : true);
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -430,11 +434,13 @@ OpenLayers.Format.OSM = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
*/
|
*/
|
||||||
serializeTags: function(feature, node) {
|
serializeTags: function(feature, node) {
|
||||||
for (var key in feature.attributes) {
|
for (var key in feature.attributes) {
|
||||||
|
if (feature.attributes.hasOwnProperty(key)) {
|
||||||
var tag = this.createElementNS(null, "tag");
|
var tag = this.createElementNS(null, "tag");
|
||||||
tag.setAttribute("k", key);
|
tag.setAttribute("k", key);
|
||||||
tag.setAttribute("v", feature.attributes[key]);
|
tag.setAttribute("v", feature.attributes[key]);
|
||||||
node.appendChild(tag);
|
node.appendChild(tag);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -541,11 +541,13 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
|||||||
getCssProperty: function(sym) {
|
getCssProperty: function(sym) {
|
||||||
var css = null;
|
var css = null;
|
||||||
for(var prop in this.cssMap) {
|
for(var prop in this.cssMap) {
|
||||||
|
if (this.cssMap.hasOwnProperty(prop)) {
|
||||||
if(this.cssMap[prop] == sym) {
|
if(this.cssMap[prop] == sym) {
|
||||||
css = prop;
|
css = prop;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return css;
|
return css;
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -565,12 +567,14 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
|||||||
getGraphicFormat: function(href) {
|
getGraphicFormat: function(href) {
|
||||||
var format, regex;
|
var format, regex;
|
||||||
for(var key in this.graphicFormats) {
|
for(var key in this.graphicFormats) {
|
||||||
|
if (this.graphicFormats.hasOwnProperty(key)) {
|
||||||
if(this.graphicFormats[key].test(href)) {
|
if(this.graphicFormats[key].test(href)) {
|
||||||
format = key;
|
format = key;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return format || this.defautlGraphicFormat;
|
}
|
||||||
|
return format || this.defaultGraphicFormat;
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -676,9 +680,11 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for(var name in sld.namedLayers) {
|
for(var name in sld.namedLayers) {
|
||||||
|
if (sld.namedLayers.hasOwnProperty(name)) {
|
||||||
this.writeNode("NamedLayer", sld.namedLayers[name], root);
|
this.writeNode("NamedLayer", sld.namedLayers[name], root);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return root;
|
return root;
|
||||||
},
|
},
|
||||||
"Name": function(name) {
|
"Name": function(name) {
|
||||||
@@ -769,12 +775,14 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
|||||||
ruleMap[zIndex].symbolizers.push(symbolizer.clone());
|
ruleMap[zIndex].symbolizers.push(symbolizer.clone());
|
||||||
}
|
}
|
||||||
for (zIndex in ruleMap) {
|
for (zIndex in ruleMap) {
|
||||||
|
if (ruleMap.hasOwnProperty(zIndex)) {
|
||||||
if (!(zIndex in rulesByZ)) {
|
if (!(zIndex in rulesByZ)) {
|
||||||
zValues.push(zIndex);
|
zValues.push(zIndex);
|
||||||
rulesByZ[zIndex] = [];
|
rulesByZ[zIndex] = [];
|
||||||
}
|
}
|
||||||
rulesByZ[zIndex].push(ruleMap[zIndex]);
|
rulesByZ[zIndex].push(ruleMap[zIndex]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// no symbolizers in rule
|
// no symbolizers in rule
|
||||||
rulesByZ[0].push(rule.clone());
|
rulesByZ[0].push(rule.clone());
|
||||||
|
|||||||
@@ -128,12 +128,14 @@ OpenLayers.Format.SLD.v1_0_0_GeoServer = OpenLayers.Class(
|
|||||||
var options = symbolizer.vendorOptions;
|
var options = symbolizer.vendorOptions;
|
||||||
if (options) {
|
if (options) {
|
||||||
for (var key in symbolizer.vendorOptions) {
|
for (var key in symbolizer.vendorOptions) {
|
||||||
|
if (symbolizer.vendorOptions.hasOwnProperty(key)) {
|
||||||
this.writeNode("VendorOption", {
|
this.writeNode("VendorOption", {
|
||||||
name: key,
|
name: key,
|
||||||
value: symbolizer.vendorOptions[key]
|
value: symbolizer.vendorOptions[key]
|
||||||
}, node);
|
}, node);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return node;
|
return node;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -210,11 +210,15 @@ OpenLayers.Format.SOSGetObservation = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
this.writeNode("eventTime", options, node);
|
this.writeNode("eventTime", options, node);
|
||||||
}
|
}
|
||||||
for (var procedure in options.procedures) {
|
for (var procedure in options.procedures) {
|
||||||
|
if (options.procedures.hasOwnProperty(procedure)) {
|
||||||
this.writeNode("procedure", options.procedures[procedure], node);
|
this.writeNode("procedure", options.procedures[procedure], node);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
for (var observedProperty in options.observedProperties) {
|
for (var observedProperty in options.observedProperties) {
|
||||||
|
if (options.observedProperties.hasOwnProperty(observedProperty)) {
|
||||||
this.writeNode("observedProperty", options.observedProperties[observedProperty], node);
|
this.writeNode("observedProperty", options.observedProperties[observedProperty], node);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (options.foi) {
|
if (options.foi) {
|
||||||
this.writeNode("featureOfInterest", options.foi, node);
|
this.writeNode("featureOfInterest", options.foi, node);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, {
|
|||||||
var featureContainer = this.createElementNS(this.featureNS, "feature:" + this.featureName);
|
var featureContainer = this.createElementNS(this.featureNS, "feature:" + this.featureName);
|
||||||
featureContainer.appendChild(geomContainer);
|
featureContainer.appendChild(geomContainer);
|
||||||
for(var attr in feature.attributes) {
|
for(var attr in feature.attributes) {
|
||||||
|
if (feature.attributes.hasOwnProperty(attr)) {
|
||||||
var attrText = this.createTextNode(feature.attributes[attr]);
|
var attrText = this.createTextNode(feature.attributes[attr]);
|
||||||
var nodename = attr;
|
var nodename = attr;
|
||||||
if (attr.search(":") != -1) {
|
if (attr.search(":") != -1) {
|
||||||
@@ -113,6 +114,7 @@ OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, {
|
|||||||
attrContainer.appendChild(attrText);
|
attrContainer.appendChild(attrText);
|
||||||
featureContainer.appendChild(attrContainer);
|
featureContainer.appendChild(attrContainer);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return featureContainer;
|
return featureContainer;
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -166,6 +168,7 @@ OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, {
|
|||||||
|
|
||||||
// add in attributes
|
// add in attributes
|
||||||
for(var propName in feature.attributes) {
|
for(var propName in feature.attributes) {
|
||||||
|
if (feature.attributes.hasOwnProperty(propName)) {
|
||||||
propertyNode = this.createElementNS(this.wfsns, 'wfs:Property');
|
propertyNode = this.createElementNS(this.wfsns, 'wfs:Property');
|
||||||
nameNode = this.createElementNS(this.wfsns, 'wfs:Name');
|
nameNode = this.createElementNS(this.wfsns, 'wfs:Name');
|
||||||
nameNode.appendChild(this.createTextNode(propName));
|
nameNode.appendChild(this.createTextNode(propName));
|
||||||
@@ -175,6 +178,7 @@ OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, {
|
|||||||
propertyNode.appendChild(valueNode);
|
propertyNode.appendChild(valueNode);
|
||||||
updateNode.appendChild(propertyNode);
|
updateNode.appendChild(propertyNode);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
var filterNode = this.createElementNS(this.ogcns, 'ogc:Filter');
|
var filterNode = this.createElementNS(this.ogcns, 'ogc:Filter');
|
||||||
|
|||||||
@@ -332,6 +332,7 @@ OpenLayers.Format.WFST.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
|
|
||||||
// add in attributes
|
// add in attributes
|
||||||
for(var key in feature.attributes) {
|
for(var key in feature.attributes) {
|
||||||
|
if (feature.attributes.hasOwnProperty(key)) {
|
||||||
if(feature.attributes[key] !== undefined &&
|
if(feature.attributes[key] !== undefined &&
|
||||||
(!modified || !modified.attributes ||
|
(!modified || !modified.attributes ||
|
||||||
(modified.attributes && modified.attributes[key] !== undefined))) {
|
(modified.attributes && modified.attributes[key] !== undefined))) {
|
||||||
@@ -340,6 +341,7 @@ OpenLayers.Format.WFST.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// add feature id filter
|
// add feature id filter
|
||||||
this.writeNode("ogc:Filter", new OpenLayers.Filter.FeatureId({
|
this.writeNode("ogc:Filter", new OpenLayers.Filter.FeatureId({
|
||||||
@@ -410,11 +412,13 @@ OpenLayers.Format.WFST.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
var parts = [];
|
var parts = [];
|
||||||
var uri;
|
var uri;
|
||||||
for(var key in schemaLocations) {
|
for(var key in schemaLocations) {
|
||||||
|
if (schemaLocations.hasOwnProperty(key)) {
|
||||||
uri = this.namespaces[key];
|
uri = this.namespaces[key];
|
||||||
if(uri) {
|
if(uri) {
|
||||||
parts.push(uri + " " + schemaLocations[key]);
|
parts.push(uri + " " + schemaLocations[key]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
var value = parts.join(" ") || undefined;
|
var value = parts.join(" ") || undefined;
|
||||||
return value;
|
return value;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -48,11 +48,13 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
prefix = this.namespaces[this.defaultPrefix];
|
prefix = this.namespaces[this.defaultPrefix];
|
||||||
} else {
|
} else {
|
||||||
for(prefix in this.namespaces) {
|
for(prefix in this.namespaces) {
|
||||||
|
if (this.namespaces.hasOwnProperty(prefix)) {
|
||||||
if(this.namespaces[prefix] == uri) {
|
if(this.namespaces[prefix] == uri) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return prefix;
|
return prefix;
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -674,6 +676,7 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
setAttributes: function(node, obj) {
|
setAttributes: function(node, obj) {
|
||||||
var value;
|
var value;
|
||||||
for(var name in obj) {
|
for(var name in obj) {
|
||||||
|
if (obj.hasOwnProperty(name)) {
|
||||||
value = obj[name].toString();
|
value = obj[name].toString();
|
||||||
if(value.match(/[A-Z]/)) {
|
if(value.match(/[A-Z]/)) {
|
||||||
// safari lowercases attributes with setAttribute
|
// safari lowercases attributes with setAttribute
|
||||||
@@ -682,6 +685,7 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
node.setAttribute(name, value);
|
node.setAttribute(name, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1091,15 +1095,18 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
userValue: true
|
userValue: true
|
||||||
};
|
};
|
||||||
for (var dim in context.dimensions) {
|
for (var dim in context.dimensions) {
|
||||||
|
if (context.dimensions.hasOwnProperty(dim)) {
|
||||||
var attributes = {};
|
var attributes = {};
|
||||||
var dimension = context.dimensions[dim];
|
var dimension = context.dimensions[dim];
|
||||||
for (var name in dimension) {
|
for (var name in dimension) {
|
||||||
|
if (dimension.hasOwnProperty(name)) {
|
||||||
if (typeof dimension[name] == "boolean") {
|
if (typeof dimension[name] == "boolean") {
|
||||||
attributes[name] = Number(dimension[name]);
|
attributes[name] = Number(dimension[name]);
|
||||||
} else {
|
} else {
|
||||||
attributes[name] = dimension[name];
|
attributes[name] = dimension[name];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
var values = "";
|
var values = "";
|
||||||
if (attributes.values) {
|
if (attributes.values) {
|
||||||
values = attributes.values.join(",");
|
values = attributes.values.join(",");
|
||||||
@@ -1110,6 +1117,7 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
|
|||||||
"Dimension", values, attributes
|
"Dimension", values, attributes
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return node;
|
return node;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -122,9 +122,11 @@ OpenLayers.Format.WMC.v1_1_0 = OpenLayers.Class(
|
|||||||
// optional SRS element(s)
|
// optional SRS element(s)
|
||||||
if (context.srs) {
|
if (context.srs) {
|
||||||
for(var name in context.srs) {
|
for(var name in context.srs) {
|
||||||
|
if (context.srs.hasOwnProperty(name)) {
|
||||||
node.appendChild(this.createElementDefaultNS("SRS", name));
|
node.appendChild(this.createElementDefaultNS("SRS", name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// optional FormatList element
|
// optional FormatList element
|
||||||
node.appendChild(this.write_wmc_FormatList(context));
|
node.appendChild(this.write_wmc_FormatList(context));
|
||||||
|
|||||||
@@ -84,10 +84,12 @@ OpenLayers.Format.WMTSCapabilities = OpenLayers.Class(OpenLayers.Format.XML.Vers
|
|||||||
matrixSet: true
|
matrixSet: true
|
||||||
};
|
};
|
||||||
for (var prop in required) {
|
for (var prop in required) {
|
||||||
|
if (required.hasOwnProperty(prop)) {
|
||||||
if (!(prop in config)) {
|
if (!(prop in config)) {
|
||||||
throw new Error("Missing property '" + prop + "' in layer configuration.");
|
throw new Error("Missing property '" + prop + "' in layer configuration.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var contents = capabilities.contents;
|
var contents = capabilities.contents;
|
||||||
var matrixSet = contents.tileMatrixSets[config.matrixSet];
|
var matrixSet = contents.tileMatrixSets[config.matrixSet];
|
||||||
|
|||||||
@@ -89,8 +89,10 @@ OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, {
|
|||||||
this.namespaces = OpenLayers.Util.extend({}, this.namespaces);
|
this.namespaces = OpenLayers.Util.extend({}, this.namespaces);
|
||||||
this.namespaceAlias = {};
|
this.namespaceAlias = {};
|
||||||
for(var alias in this.namespaces) {
|
for(var alias in this.namespaces) {
|
||||||
|
if (this.namespaces.hasOwnProperty(alias)) {
|
||||||
this.namespaceAlias[this.namespaces[alias]] = alias;
|
this.namespaceAlias[this.namespaces[alias]] = alias;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -558,6 +560,7 @@ OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, {
|
|||||||
setAttributes: function(node, obj) {
|
setAttributes: function(node, obj) {
|
||||||
var value, uri;
|
var value, uri;
|
||||||
for(var name in obj) {
|
for(var name in obj) {
|
||||||
|
if (obj.hasOwnProperty(name)) {
|
||||||
if(obj[name] != null && obj[name].toString) {
|
if(obj[name] != null && obj[name].toString) {
|
||||||
value = obj[name].toString();
|
value = obj[name].toString();
|
||||||
// check for qualified attribute name ("prefix:local")
|
// check for qualified attribute name ("prefix:local")
|
||||||
@@ -565,6 +568,7 @@ OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, {
|
|||||||
this.setAttributeNS(node, uri, name, value);
|
this.setAttributeNS(node, uri, name, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -423,8 +423,10 @@ OpenLayers.Layer = OpenLayers.Class({
|
|||||||
getOptions: function() {
|
getOptions: function() {
|
||||||
var options = {};
|
var options = {};
|
||||||
for(var o in this.options) {
|
for(var o in this.options) {
|
||||||
|
if (this.options.hasOwnProperty(o)) {
|
||||||
options[o] = this[o];
|
options[o] = this[o];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return options;
|
return options;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -218,10 +218,12 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
|
|||||||
var urlParams =
|
var urlParams =
|
||||||
OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));
|
OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));
|
||||||
for(var key in allParams) {
|
for(var key in allParams) {
|
||||||
|
if (allParams.hasOwnProperty(key)) {
|
||||||
if(key.toUpperCase() in urlParams) {
|
if(key.toUpperCase() in urlParams) {
|
||||||
delete allParams[key];
|
delete allParams[key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
paramsString = OpenLayers.Util.getParameterString(allParams);
|
paramsString = OpenLayers.Util.getParameterString(allParams);
|
||||||
|
|
||||||
return OpenLayers.Util.urlAppend(url, paramsString);
|
return OpenLayers.Util.urlAppend(url, paramsString);
|
||||||
|
|||||||
@@ -346,10 +346,12 @@ OpenLayers.Layer.MapGuide = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
|||||||
var urlParams = OpenLayers.Util.upperCaseObject(
|
var urlParams = OpenLayers.Util.upperCaseObject(
|
||||||
OpenLayers.Util.getParameters(url));
|
OpenLayers.Util.getParameters(url));
|
||||||
for(var key in allParams) {
|
for(var key in allParams) {
|
||||||
|
if (allParams.hasOwnProperty(key)) {
|
||||||
if(key.toUpperCase() in urlParams) {
|
if(key.toUpperCase() in urlParams) {
|
||||||
delete allParams[key];
|
delete allParams[key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
var paramsString = OpenLayers.Util.getParameterString(allParams);
|
var paramsString = OpenLayers.Util.getParameterString(allParams);
|
||||||
|
|
||||||
/* MapGuide needs '+' seperating things like bounds/height/width.
|
/* MapGuide needs '+' seperating things like bounds/height/width.
|
||||||
|
|||||||
@@ -142,10 +142,12 @@ OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
|||||||
var urlParams = OpenLayers.Util.upperCaseObject(
|
var urlParams = OpenLayers.Util.upperCaseObject(
|
||||||
OpenLayers.Util.getParameters(url));
|
OpenLayers.Util.getParameters(url));
|
||||||
for(var key in allParams) {
|
for(var key in allParams) {
|
||||||
|
if (allParams.hasOwnProperty(key)) {
|
||||||
if(key.toUpperCase() in urlParams) {
|
if(key.toUpperCase() in urlParams) {
|
||||||
delete allParams[key];
|
delete allParams[key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
paramsString = OpenLayers.Util.getParameterString(allParams);
|
paramsString = OpenLayers.Util.getParameterString(allParams);
|
||||||
|
|
||||||
// requestString always starts with url
|
// requestString always starts with url
|
||||||
|
|||||||
@@ -509,12 +509,14 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
|
|||||||
|
|
||||||
if(!zoomChanged && coordSysUnchanged) {
|
if(!zoomChanged && coordSysUnchanged) {
|
||||||
for(var i in this.unrenderedFeatures) {
|
for(var i in this.unrenderedFeatures) {
|
||||||
|
if (this.unrenderedFeatures.hasOwnProperty(i)) {
|
||||||
var feature = this.unrenderedFeatures[i];
|
var feature = this.unrenderedFeatures[i];
|
||||||
this.drawFeature(feature);
|
this.drawFeature(feature);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (!this.drawn || (!ng && (zoomChanged || !coordSysUnchanged))) {
|
if (!this.drawn || (!ng && (zoomChanged || !coordSysUnchanged))) {
|
||||||
this.drawn = true;
|
this.drawn = true;
|
||||||
var feature;
|
var feature;
|
||||||
|
|||||||
@@ -229,10 +229,12 @@ OpenLayers.Layer.WMTS = OpenLayers.Class(OpenLayers.Layer.Grid, {
|
|||||||
matrixSet: true
|
matrixSet: true
|
||||||
};
|
};
|
||||||
for (var prop in required) {
|
for (var prop in required) {
|
||||||
|
if (required.hasOwnProperty(prop)) {
|
||||||
if (!(prop in config)) {
|
if (!(prop in config)) {
|
||||||
throw new Error("Missing property '" + prop + "' in layer configuration.");
|
throw new Error("Missing property '" + prop + "' in layer configuration.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
config.params = OpenLayers.Util.upperCaseObject(config.params);
|
config.params = OpenLayers.Util.upperCaseObject(config.params);
|
||||||
var args = [config.name, config.url, config.params, config];
|
var args = [config.name, config.url, config.params, config];
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ OpenLayers.Protocol.Script = OpenLayers.Class(OpenLayers.Protocol, {
|
|||||||
});
|
});
|
||||||
this.filterToParams = function(filter, params) {
|
this.filterToParams = function(filter, params) {
|
||||||
return format.write(filter, params);
|
return format.write(filter, params);
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -311,9 +311,11 @@ OpenLayers.Protocol.Script = OpenLayers.Class(OpenLayers.Protocol, {
|
|||||||
this.destroyRequest(response.priv);
|
this.destroyRequest(response.priv);
|
||||||
} else {
|
} else {
|
||||||
for (var key in this.pendingRequests) {
|
for (var key in this.pendingRequests) {
|
||||||
|
if (this.pendingRequests.hasOwnProperty(key)) {
|
||||||
this.destroyRequest(this.pendingRequests[key]);
|
this.destroyRequest(this.pendingRequests[key]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -181,8 +181,10 @@ OpenLayers.Request = {
|
|||||||
config.method, url, config.async, config.user, config.password
|
config.method, url, config.async, config.user, config.password
|
||||||
);
|
);
|
||||||
for(var header in config.headers) {
|
for(var header in config.headers) {
|
||||||
|
if (config.headers.hasOwnProperty(header)) {
|
||||||
request.setRequestHeader(header, config.headers[header]);
|
request.setRequestHeader(header, config.headers[header]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var events = this.events;
|
var events = this.events;
|
||||||
|
|
||||||
|
|||||||
@@ -128,8 +128,10 @@ OpenLayers.Rule = OpenLayers.Class({
|
|||||||
*/
|
*/
|
||||||
destroy: function() {
|
destroy: function() {
|
||||||
for (var i in this.symbolizer) {
|
for (var i in this.symbolizer) {
|
||||||
|
if (this.symbolizer.hasOwnProperty(i)) {
|
||||||
this.symbolizer[i] = null;
|
this.symbolizer[i] = null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
this.symbolizer = null;
|
this.symbolizer = null;
|
||||||
delete this.symbolizers;
|
delete this.symbolizers;
|
||||||
},
|
},
|
||||||
@@ -216,6 +218,7 @@ OpenLayers.Rule = OpenLayers.Class({
|
|||||||
options.symbolizer = {};
|
options.symbolizer = {};
|
||||||
var value, type;
|
var value, type;
|
||||||
for(var key in this.symbolizer) {
|
for(var key in this.symbolizer) {
|
||||||
|
if (this.symbolizer.hasOwnProperty(key)) {
|
||||||
value = this.symbolizer[key];
|
value = this.symbolizer[key];
|
||||||
type = typeof value;
|
type = typeof value;
|
||||||
if(type === "object") {
|
if(type === "object") {
|
||||||
@@ -225,6 +228,7 @@ OpenLayers.Rule = OpenLayers.Class({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// clone filter
|
// clone filter
|
||||||
options.filter = this.filter && this.filter.clone();
|
options.filter = this.filter && this.filter.clone();
|
||||||
// clone context
|
// clone context
|
||||||
|
|||||||
@@ -273,8 +273,10 @@ OpenLayers.Style = OpenLayers.Class({
|
|||||||
OpenLayers.Util.extend(context, this.context);
|
OpenLayers.Util.extend(context, this.context);
|
||||||
|
|
||||||
for (var i in this.propertyStyles) {
|
for (var i in this.propertyStyles) {
|
||||||
|
if (this.propertyStyles.hasOwnProperty(i)) {
|
||||||
style[i] = OpenLayers.Style.createLiteral(style[i], context, feature, i);
|
style[i] = OpenLayers.Style.createLiteral(style[i], context, feature, i);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return style;
|
return style;
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -301,6 +303,7 @@ OpenLayers.Style = OpenLayers.Class({
|
|||||||
for (var i=0, len=rules.length; i<len; i++) {
|
for (var i=0, len=rules.length; i<len; i++) {
|
||||||
symbolizer = rules[i].symbolizer;
|
symbolizer = rules[i].symbolizer;
|
||||||
for (var key in symbolizer) {
|
for (var key in symbolizer) {
|
||||||
|
if (symbolizer.hasOwnProperty(key)) {
|
||||||
value = symbolizer[key];
|
value = symbolizer[key];
|
||||||
if (typeof value == "object") {
|
if (typeof value == "object") {
|
||||||
// symbolizer key is "Point", "Line" or "Polygon"
|
// symbolizer key is "Point", "Line" or "Polygon"
|
||||||
@@ -312,6 +315,7 @@ OpenLayers.Style = OpenLayers.Class({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return propertyStyles;
|
return propertyStyles;
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -329,12 +333,14 @@ OpenLayers.Style = OpenLayers.Class({
|
|||||||
addPropertyStyles: function(propertyStyles, symbolizer) {
|
addPropertyStyles: function(propertyStyles, symbolizer) {
|
||||||
var property;
|
var property;
|
||||||
for (var key in symbolizer) {
|
for (var key in symbolizer) {
|
||||||
|
if (symbolizer.hasOwnProperty(key)) {
|
||||||
property = symbolizer[key];
|
property = symbolizer[key];
|
||||||
if (typeof property == "string" &&
|
if (typeof property == "string" &&
|
||||||
property.match(/\$\{\w+\}/)) {
|
property.match(/\$\{\w+\}/)) {
|
||||||
propertyStyles[key] = true;
|
propertyStyles[key] = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return propertyStyles;
|
return propertyStyles;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ OpenLayers.StyleMap = OpenLayers.Class({
|
|||||||
this.styles["delete"] = style;
|
this.styles["delete"] = style;
|
||||||
} else if(typeof style == "object") {
|
} else if(typeof style == "object") {
|
||||||
for(var key in style) {
|
for(var key in style) {
|
||||||
|
if (style.hasOwnProperty(key)) {
|
||||||
if(style[key] instanceof OpenLayers.Style) {
|
if(style[key] instanceof OpenLayers.Style) {
|
||||||
// user passed a hash of style objects
|
// user passed a hash of style objects
|
||||||
this.styles[key] = style[key];
|
this.styles[key] = style[key];
|
||||||
@@ -79,6 +80,7 @@ OpenLayers.StyleMap = OpenLayers.Class({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
OpenLayers.Util.extend(this, options);
|
OpenLayers.Util.extend(this, options);
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -87,8 +89,10 @@ OpenLayers.StyleMap = OpenLayers.Class({
|
|||||||
*/
|
*/
|
||||||
destroy: function() {
|
destroy: function() {
|
||||||
for(var key in this.styles) {
|
for(var key in this.styles) {
|
||||||
|
if (this.styles.hasOwnProperty(key)) {
|
||||||
this.styles[key].destroy();
|
this.styles[key].destroy();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
this.styles = null;
|
this.styles = null;
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -144,6 +148,7 @@ OpenLayers.StyleMap = OpenLayers.Class({
|
|||||||
addUniqueValueRules: function(renderIntent, property, symbolizers, context) {
|
addUniqueValueRules: function(renderIntent, property, symbolizers, context) {
|
||||||
var rules = [];
|
var rules = [];
|
||||||
for (var value in symbolizers) {
|
for (var value in symbolizers) {
|
||||||
|
if (symbolizers.hasOwnProperty(value)) {
|
||||||
rules.push(new OpenLayers.Rule({
|
rules.push(new OpenLayers.Rule({
|
||||||
symbolizer: symbolizers[value],
|
symbolizer: symbolizers[value],
|
||||||
context: context,
|
context: context,
|
||||||
@@ -154,6 +159,7 @@ OpenLayers.StyleMap = OpenLayers.Class({
|
|||||||
})
|
})
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
this.styles[renderIntent].addRules(rules);
|
this.styles[renderIntent].addRules(rules);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -163,12 +163,14 @@ OpenLayers.Tile.Image.IFrame = {
|
|||||||
field;
|
field;
|
||||||
|
|
||||||
for(var par in params) {
|
for(var par in params) {
|
||||||
|
if (params.hasOwnProperty(par)) {
|
||||||
field = document.createElement('input');
|
field = document.createElement('input');
|
||||||
field.type = 'hidden';
|
field.type = 'hidden';
|
||||||
field.name = par;
|
field.name = par;
|
||||||
field.value = params[par];
|
field.value = params[par];
|
||||||
form.appendChild(field);
|
form.appendChild(field);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return form;
|
return form;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -127,6 +127,7 @@ OpenLayers.Tween = OpenLayers.Class({
|
|||||||
play: function() {
|
play: function() {
|
||||||
var value = {};
|
var value = {};
|
||||||
for (var i in this.begin) {
|
for (var i in this.begin) {
|
||||||
|
if (this.begin.hasOwnProperty(i)) {
|
||||||
var b = this.begin[i];
|
var b = this.begin[i];
|
||||||
var f = this.finish[i];
|
var f = this.finish[i];
|
||||||
if (b == null || f == null || isNaN(b) || isNaN(f)) {
|
if (b == null || f == null || isNaN(b) || isNaN(f)) {
|
||||||
@@ -136,6 +137,7 @@ OpenLayers.Tween = OpenLayers.Class({
|
|||||||
var c = f - b;
|
var c = f - b;
|
||||||
value[i] = this.easing.apply(this, [this.time, b, c, this.duration]);
|
value[i] = this.easing.apply(this, [this.time, b, c, this.duration]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
this.time++;
|
this.time++;
|
||||||
|
|
||||||
if (this.callbacks && this.callbacks.eachStep) {
|
if (this.callbacks && this.callbacks.eachStep) {
|
||||||
|
|||||||
@@ -441,8 +441,10 @@ OpenLayers.Util.createAlphaImageDiv = function(id, px, sz, imgURL,
|
|||||||
OpenLayers.Util.upperCaseObject = function (object) {
|
OpenLayers.Util.upperCaseObject = function (object) {
|
||||||
var uObject = {};
|
var uObject = {};
|
||||||
for (var key in object) {
|
for (var key in object) {
|
||||||
|
if (object.hasOwnProperty(key)) {
|
||||||
uObject[key.toUpperCase()] = object[key];
|
uObject[key.toUpperCase()] = object[key];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return uObject;
|
return uObject;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -509,6 +511,7 @@ OpenLayers.Util.getParameterString = function(params) {
|
|||||||
var paramsArray = [];
|
var paramsArray = [];
|
||||||
|
|
||||||
for (var key in params) {
|
for (var key in params) {
|
||||||
|
if (params.hasOwnProperty(key)) {
|
||||||
var value = params[key];
|
var value = params[key];
|
||||||
if ((value != null) && (typeof value != 'function')) {
|
if ((value != null) && (typeof value != 'function')) {
|
||||||
var encodedValue;
|
var encodedValue;
|
||||||
@@ -531,6 +534,7 @@ OpenLayers.Util.getParameterString = function(params) {
|
|||||||
paramsArray.push(encodeURIComponent(key) + "=" + encodedValue);
|
paramsArray.push(encodeURIComponent(key) + "=" + encodedValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return paramsArray.join("&");
|
return paramsArray.join("&");
|
||||||
};
|
};
|
||||||
@@ -1300,25 +1304,31 @@ OpenLayers.Util.isEquivalentUrl = function(url1, url2, options) {
|
|||||||
var urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
|
var urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
|
||||||
|
|
||||||
//compare all keys except for "args" (treated below)
|
//compare all keys except for "args" (treated below)
|
||||||
for(var key in urlObj1) {
|
for (var key in urlObj1) {
|
||||||
|
if (urlObj1.hasOwnProperty(key)) {
|
||||||
if(key !== "args") {
|
if(key !== "args") {
|
||||||
if(urlObj1[key] != urlObj2[key]) {
|
if(urlObj1[key] != urlObj2[key]) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// compare search args - irrespective of order
|
// compare search args - irrespective of order
|
||||||
for(var key in urlObj1.args) {
|
for (var key in urlObj1.args) {
|
||||||
|
if (urlObj1.args.hasOwnProperty(key)) {
|
||||||
if(urlObj1.args[key] != urlObj2.args[key]) {
|
if(urlObj1.args[key] != urlObj2.args[key]) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
delete urlObj2.args[key];
|
delete urlObj2.args[key];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// urlObj2 shouldn't have any args left
|
// urlObj2 shouldn't have any args left
|
||||||
for(var key in urlObj2.args) {
|
for (var key in urlObj2.args) {
|
||||||
|
if (urlObj2.args.hasOwnProperty(key)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user