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

Caching array length instead of accessing it with each iteration. r=crschmidt (closes #1636)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@7627 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2008-07-31 04:44:25 +00:00
parent 89b10da8db
commit 66a4c6fb0e
50 changed files with 196 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/OpenLayers.js
View File

@@ -40,7 +40,7 @@
var scriptName = OpenLayers._scriptName; var scriptName = OpenLayers._scriptName;
var scripts = document.getElementsByTagName('script'); var scripts = document.getElementsByTagName('script');
for (var i = 0; i < scripts.length; i++) { for (var i=0, len=scripts.length; i<len; i++) {
var src = scripts[i].getAttribute('src'); var src = scripts[i].getAttribute('src');
if (src) { if (src) {
var index = src.lastIndexOf(scriptName); var index = src.lastIndexOf(scriptName);
@@ -222,7 +222,7 @@
var allScriptTags = new Array(jsfiles.length); var allScriptTags = new Array(jsfiles.length);
} }
var host = OpenLayers._getScriptLocation() + "lib/"; var host = OpenLayers._getScriptLocation() + "lib/";
for (var i = 0; i < jsfiles.length; i++) { for (var i=0, len=jsfiles.length; i<len; i++) {
if (docWrite) { if (docWrite) {
allScriptTags[i] = "<script src='" + host + jsfiles[i] + allScriptTags[i] = "<script src='" + host + jsfiles[i] +
"'></script>"; "'></script>";

4
lib/OpenLayers/BaseTypes.js
View File

@@ -84,7 +84,7 @@ OpenLayers.String = {
camelize: function(str) { camelize: function(str) {
var oStringList = str.split('-'); var oStringList = str.split('-');
var camelizedString = oStringList[0]; var camelizedString = oStringList[0];
for (var i = 1; i < oStringList.length; i++) { for (var i=1, len=oStringList.length; i<len; i++) {
var s = oStringList[i]; var s = oStringList[i];
camelizedString += s.charAt(0).toUpperCase() + s.substring(1); camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
} }
@@ -118,7 +118,7 @@ OpenLayers.String = {
} }
var tokens = template.split("${"); var tokens = template.split("${");
var item, last, replacement; var item, last, replacement;
for(var i=1; i<tokens.length; i++) { for(var i=1, len=tokens.length; i<len; i++) {
item = tokens[i]; item = tokens[i];
last = item.indexOf("}"); last = item.indexOf("}");
if(last > 0) { if(last > 0) {

4
lib/OpenLayers/BaseTypes/Class.js
View File

@@ -34,7 +34,7 @@ OpenLayers.Class = function() {
}; };
var extended = {}; var extended = {};
var parent; var parent;
for(var i=0; i<arguments.length; ++i) { for(var i=0, len=arguments.length; i<len; ++i) {
if(typeof arguments[i] == "function") { if(typeof arguments[i] == "function") {
// get the prototype of the superclass // get the prototype of the superclass
parent = arguments[i].prototype; parent = arguments[i].prototype;
@@ -85,7 +85,7 @@ OpenLayers.Class.create = function() {
OpenLayers.Class.inherit = function () { OpenLayers.Class.inherit = function () {
var superClass = arguments[0]; var superClass = arguments[0];
var proto = new superClass(OpenLayers.Class.isPrototype); var proto = new superClass(OpenLayers.Class.isPrototype);
for (var i = 1; i < arguments.length; i++) { for (var i=1, len=arguments.length; i<len; i++) {
if (typeof arguments[i] == "function") { if (typeof arguments[i] == "function") {
var mixin = arguments[i]; var mixin = arguments[i];
arguments[i] = new mixin(OpenLayers.Class.isPrototype); arguments[i] = new mixin(OpenLayers.Class.isPrototype);

6
lib/OpenLayers/BaseTypes/Element.js
View File

@@ -28,7 +28,7 @@ OpenLayers.Element = {
* element - {DOMElement} Actually user can pass any number of elements * element - {DOMElement} Actually user can pass any number of elements
*/ */
toggle: function() { toggle: function() {
for (var i = 0; i < arguments.length; i++) { for (var i=0, len=arguments.length; i<len; i++) {
var element = OpenLayers.Util.getElement(arguments[i]); var element = OpenLayers.Util.getElement(arguments[i]);
var display = OpenLayers.Element.visible(element) ? 'hide' var display = OpenLayers.Element.visible(element) ? 'hide'
: 'show'; : 'show';
@@ -45,7 +45,7 @@ OpenLayers.Element = {
* element - {DOMElement} Actually user can pass any number of elements * element - {DOMElement} Actually user can pass any number of elements
*/ */
hide: function() { hide: function() {
for (var i = 0; i < arguments.length; i++) { for (var i=0, len=arguments.length; i<len; i++) {
var element = OpenLayers.Util.getElement(arguments[i]); var element = OpenLayers.Util.getElement(arguments[i]);
element.style.display = 'none'; element.style.display = 'none';
} }
@@ -59,7 +59,7 @@ OpenLayers.Element = {
* element - {DOMElement} Actually user can pass any number of elements * element - {DOMElement} Actually user can pass any number of elements
*/ */
show: function() { show: function() {
for (var i = 0; i < arguments.length; i++) { for (var i=0, len=arguments.length; i<len; i++) {
var element = OpenLayers.Util.getElement(arguments[i]); var element = OpenLayers.Util.getElement(arguments[i]);
element.style.display = ''; element.style.display = '';
} }

2
lib/OpenLayers/Console.js
View File

@@ -220,7 +220,7 @@ OpenLayers.Console = {
*/ */
if(window.console) { if(window.console) {
var scripts = document.getElementsByTagName("script"); var scripts = document.getElementsByTagName("script");
for(var i=0; i<scripts.length; ++i) { for(var i=0, len=scripts.length; i<len; ++i) {
if(scripts[i].src.indexOf("firebug.js") != -1) { if(scripts[i].src.indexOf("firebug.js") != -1) {
OpenLayers.Util.extend(OpenLayers.Console, console); OpenLayers.Util.extend(OpenLayers.Console, console);
break; break;

4
lib/OpenLayers/Control/ArgParser.js
View File

@@ -68,7 +68,7 @@ OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
OpenLayers.Control.prototype.setMap.apply(this, arguments); OpenLayers.Control.prototype.setMap.apply(this, arguments);
//make sure we dont already have an arg parser attached //make sure we dont already have an arg parser attached
for(var i=0; i< this.map.controls.length; i++) { for(var i=0, len=this.map.controls.length; i<len; i++) {
var control = this.map.controls[i]; var control = this.map.controls[i];
if ( (control != this) && if ( (control != this) &&
(control.CLASS_NAME == "OpenLayers.Control.ArgParser") ) { (control.CLASS_NAME == "OpenLayers.Control.ArgParser") ) {
@@ -141,7 +141,7 @@ OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
if (this.layers.length == this.map.layers.length) { if (this.layers.length == this.map.layers.length) {
this.map.events.unregister('addlayer', this, this.configureLayers); this.map.events.unregister('addlayer', this, this.configureLayers);
for(var i=0; i < this.layers.length; i++) { for(var i=0, len=this.layers.length; i<len; i++) {
var layer = this.map.layers[i]; var layer = this.map.layers[i];
var c = this.layers.charAt(i); var c = this.layers.charAt(i);

2
lib/OpenLayers/Control/Attribution.js
View File

@@ -75,7 +75,7 @@ OpenLayers.Control.Attribution =
updateAttribution: function() { updateAttribution: function() {
var attributions = []; var attributions = [];
if (this.map && this.map.layers) { if (this.map && this.map.layers) {
for(var i=0; i < this.map.layers.length; i++) { for(var i=0, len=this.map.layers.length; i<len; i++) {
var layer = this.map.layers[i]; var layer = this.map.layers[i];
if (layer.attribution && layer.getVisibility()) { if (layer.attribution && layer.getVisibility()) {
attributions.push( layer.attribution ); attributions.push( layer.attribution );

2
lib/OpenLayers/Control/EditingToolbar.js
View File

@@ -36,7 +36,7 @@ OpenLayers.Control.EditingToolbar = OpenLayers.Class(
new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Path, {'displayClass': 'olControlDrawFeaturePath'}), new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Path, {'displayClass': 'olControlDrawFeaturePath'}),
new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Polygon, {'displayClass': 'olControlDrawFeaturePolygon'}) new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Polygon, {'displayClass': 'olControlDrawFeaturePolygon'})
]; ];
for (var i = 0; i < controls.length; i++) { for (var i=0, len=controls.length; i<len; i++) {
controls[i].featureAdded = function(feature) { feature.state = OpenLayers.State.INSERT; }; controls[i].featureAdded = function(feature) { feature.state = OpenLayers.State.INSERT; };
} }
this.addControls(controls); this.addControls(controls);

15
lib/OpenLayers/Control/LayerSwitcher.js
View File

@@ -177,7 +177,7 @@ OpenLayers.Control.LayerSwitcher =
clearLayersArray: function(layersType) { clearLayersArray: function(layersType) {
var layers = this[layersType + "Layers"]; var layers = this[layersType + "Layers"];
if (layers) { if (layers) {
for(var i=0; i < layers.length; i++) { for(var i=0, len=layers.length; i<len ; i++) {
var layer = layers[i]; var layer = layers[i];
OpenLayers.Event.stopObservingElement(layer.inputElem); OpenLayers.Event.stopObservingElement(layer.inputElem);
OpenLayers.Event.stopObservingElement(layer.labelSpan); OpenLayers.Event.stopObservingElement(layer.labelSpan);
@@ -201,7 +201,7 @@ OpenLayers.Control.LayerSwitcher =
(this.map.layers.length != this.layerStates.length) ) { (this.map.layers.length != this.layerStates.length) ) {
redraw = true; redraw = true;
} else { } else {
for (var i=0; i < this.layerStates.length; i++) { for (var i=0, len=this.layerStates.length; i<len; i++) {
var layerState = this.layerStates[i]; var layerState = this.layerStates[i];
var layer = this.map.layers[i]; var layer = this.map.layers[i];
if ( (layerState.name != layer.name) || if ( (layerState.name != layer.name) ||
@@ -243,8 +243,9 @@ OpenLayers.Control.LayerSwitcher =
// We save this before redrawing, because in the process of redrawing // We save this before redrawing, because in the process of redrawing
// we will trigger more visibility changes, and we want to not redraw // we will trigger more visibility changes, and we want to not redraw
// and enter an infinite loop. // and enter an infinite loop.
this.layerStates = new Array(this.map.layers.length); var len = this.map.layers.length;
for (var i = 0; i < this.map.layers.length; i++) { this.layerStates = new Array(len);
for (var i=0; i <len; i++) {
var layer = this.map.layers[i]; var layer = this.map.layers[i];
this.layerStates[i] = { this.layerStates[i] = {
'name': layer.name, 'name': layer.name,
@@ -256,7 +257,7 @@ OpenLayers.Control.LayerSwitcher =
var layers = this.map.layers.slice(); var layers = this.map.layers.slice();
if (!this.ascending) { layers.reverse(); } if (!this.ascending) { layers.reverse(); }
for( var i = 0; i < layers.length; i++) { for(var i=0, len=layers.length; i<len; i++) {
var layer = layers[i]; var layer = layers[i];
var baseLayer = layer.isBaseLayer; var baseLayer = layer.isBaseLayer;
@@ -387,7 +388,7 @@ OpenLayers.Control.LayerSwitcher =
updateMap: function() { updateMap: function() {
// set the newly selected base layer // set the newly selected base layer
for(var i=0; i < this.baseLayers.length; i++) { for(var i=0, len=this.baseLayers.length; i<len; i++) {
var layerEntry = this.baseLayers[i]; var layerEntry = this.baseLayers[i];
if (layerEntry.inputElem.checked) { if (layerEntry.inputElem.checked) {
this.map.setBaseLayer(layerEntry.layer, false); this.map.setBaseLayer(layerEntry.layer, false);
@@ -395,7 +396,7 @@ OpenLayers.Control.LayerSwitcher =
} }
// set the correct visibilities for the overlays // set the correct visibilities for the overlays
for(var i=0; i < this.dataLayers.length; i++) { for(var i=0, len=this.dataLayers.length; i<len; i++) {
var layerEntry = this.dataLayers[i]; var layerEntry = this.dataLayers[i];
layerEntry.layer.setVisibility(layerEntry.inputElem.checked); layerEntry.layer.setVisibility(layerEntry.inputElem.checked);
} }

4
lib/OpenLayers/Control/ModifyFeature.js
View File

@@ -548,7 +548,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
this.virtualVertices = []; this.virtualVertices = [];
var control = this; var control = this;
function collectComponentVertices(geometry) { function collectComponentVertices(geometry) {
var i, vertex, component; var i, vertex, component, len;
if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") { if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
vertex = new OpenLayers.Feature.Vector(geometry); vertex = new OpenLayers.Feature.Vector(geometry);
control.vertices.push(vertex); control.vertices.push(vertex);
@@ -569,7 +569,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
// add virtual vertices in the middle of each edge // add virtual vertices in the middle of each edge
if(geometry.CLASS_NAME != "OpenLayers.Geometry.MultiPoint") { if(geometry.CLASS_NAME != "OpenLayers.Geometry.MultiPoint") {
for(i=0; i<geometry.components.length-1; ++i) { for(i=0, len=geometry.components.length; i<len-1; ++i) {
var prevVertex = geometry.components[i]; var prevVertex = geometry.components[i];
var nextVertex = geometry.components[i + 1]; var nextVertex = geometry.components[i + 1];
if(prevVertex.CLASS_NAME == "OpenLayers.Geometry.Point" && if(prevVertex.CLASS_NAME == "OpenLayers.Geometry.Point" &&

2
lib/OpenLayers/Control/MouseToolbar.js
View File

@@ -271,7 +271,7 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class(
OpenLayers.Util.modifyAlphaImageDiv(this.buttons[this.mode], null, null, null, this.buttons[this.mode].imgLocation); OpenLayers.Util.modifyAlphaImageDiv(this.buttons[this.mode], null, null, null, this.buttons[this.mode].imgLocation);
} }
if (this.mode == "measure" && mode != "measure") { if (this.mode == "measure" && mode != "measure") {
for(var i = 0; i < this.measureDivs.length; i++) { for(var i=0, len=this.measureDivs.length; i<len; i++) {
if (this.measureDivs[i]) { if (this.measureDivs[i]) {
this.map.layerContainerDiv.removeChild(this.measureDivs[i]); this.map.layerContainerDiv.removeChild(this.measureDivs[i]);
} }

2
lib/OpenLayers/Control/OverviewMap.js
View File

@@ -240,7 +240,7 @@ OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, {
var eventsToStop = ['dblclick','mousedown']; var eventsToStop = ['dblclick','mousedown'];
for (var i = 0; i < eventsToStop.length; i++) { for (var i=0, len=eventsToStop.length; i<len; i++) {
OpenLayers.Event.observe(this.maximizeDiv, OpenLayers.Event.observe(this.maximizeDiv,
eventsToStop[i], eventsToStop[i],

14
lib/OpenLayers/Control/Panel.js
View File

@@ -62,7 +62,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
*/ */
activate: function() { activate: function() {
if (OpenLayers.Control.prototype.activate.apply(this, arguments)) { if (OpenLayers.Control.prototype.activate.apply(this, arguments)) {
for(var i = 0; i < this.controls.length; i++) { for(var i=0, len=this.controls.length; i<len; i++) {
if (this.controls[i] == this.defaultControl) { if (this.controls[i] == this.defaultControl) {
this.controls[i].activate(); this.controls[i].activate();
} }
@@ -79,7 +79,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
*/ */
deactivate: function() { deactivate: function() {
if (OpenLayers.Control.prototype.deactivate.apply(this, arguments)) { if (OpenLayers.Control.prototype.deactivate.apply(this, arguments)) {
for(var i = 0; i < this.controls.length; i++) { for(var i=0, len=this.controls.length; i<len; i++) {
this.controls[i].deactivate(); this.controls[i].deactivate();
} }
return true; return true;
@@ -96,7 +96,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
*/ */
draw: function() { draw: function() {
OpenLayers.Control.prototype.draw.apply(this, arguments); OpenLayers.Control.prototype.draw.apply(this, arguments);
for (var i = 0; i < this.controls.length; i++) { for (var i=0, len=this.controls.length; i<len; i++) {
this.map.addControl(this.controls[i]); this.map.addControl(this.controls[i]);
this.controls[i].deactivate(); this.controls[i].deactivate();
this.controls[i].events.on({ this.controls[i].events.on({
@@ -115,7 +115,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
redraw: function() { redraw: function() {
this.div.innerHTML = ""; this.div.innerHTML = "";
if (this.active) { if (this.active) {
for (var i = 0; i < this.controls.length; i++) { for (var i=0, len=this.controls.length; i<len; i++) {
var element = this.controls[i].panel_div; var element = this.controls[i].panel_div;
if (this.controls[i].active) { if (this.controls[i].active) {
element.className = this.controls[i].displayClass + "ItemActive"; element.className = this.controls[i].displayClass + "ItemActive";
@@ -149,7 +149,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
this.redraw(); this.redraw();
return; return;
} }
for (var i = 0; i < this.controls.length; i++) { for (var i=0, len=this.controls.length; i<len; i++) {
if (this.controls[i] != control) { if (this.controls[i] != control) {
if (this.controls[i].type != OpenLayers.Control.TYPE_TOGGLE) { if (this.controls[i].type != OpenLayers.Control.TYPE_TOGGLE) {
this.controls[i].deactivate(); this.controls[i].deactivate();
@@ -179,7 +179,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
// control added to the panel. // control added to the panel.
// Also, stop mousedowns and clicks, but don't stop mouseup, // Also, stop mousedowns and clicks, but don't stop mouseup,
// since they need to pass through. // since they need to pass through.
for (var i = 0; i < controls.length; i++) { for (var i=0, len=controls.length; i<len; i++) {
var element = document.createElement("div"); var element = document.createElement("div");
var textNode = document.createTextNode(" "); var textNode = document.createTextNode(" ");
controls[i].panel_div = element; controls[i].panel_div = element;
@@ -193,7 +193,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
} }
if (this.map) { // map.addControl() has already been called on the panel if (this.map) { // map.addControl() has already been called on the panel
for (var i = 0; i < controls.length; i++) { for (var i=0, len=controls.length; i<len; i++) {
this.map.addControl(controls[i]); this.map.addControl(controls[i]);
controls[i].deactivate(); controls[i].deactivate();
controls[i].events.on({ controls[i].events.on({

4
lib/OpenLayers/Control/Permalink.js
View File

@@ -79,7 +79,7 @@ OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, {
OpenLayers.Control.prototype.setMap.apply(this, arguments); OpenLayers.Control.prototype.setMap.apply(this, arguments);
//make sure we have an arg parser attached //make sure we have an arg parser attached
for(var i=0; i< this.map.controls.length; i++) { for(var i=0, len=this.map.controls.length; i<len; i++) {
var control = this.map.controls[i]; var control = this.map.controls[i];
if (control.CLASS_NAME == "OpenLayers.Control.ArgParser") { if (control.CLASS_NAME == "OpenLayers.Control.ArgParser") {
@@ -153,7 +153,7 @@ OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, {
params.lon = Math.round(lon*100000)/100000; params.lon = Math.round(lon*100000)/100000;
params.layers = ''; params.layers = '';
for (var i=0; i < this.map.layers.length; i++) { for (var i=0, len=this.map.layers.length; i<len; i++) {
var layer = this.map.layers[i]; var layer = this.map.layers[i];
if (layer.isBaseLayer) { if (layer.isBaseLayer) {

8
lib/OpenLayers/Events.js
View File

@@ -449,7 +449,7 @@ OpenLayers.Events = OpenLayers.Class({
// custom application event. // custom application event.
this.eventTypes = []; this.eventTypes = [];
if (eventTypes != null) { if (eventTypes != null) {
for (var i = 0; i < eventTypes.length; i++) { for (var i=0, len=eventTypes.length; i<len; i++) {
this.addEventType(eventTypes[i]); this.addEventType(eventTypes[i]);
} }
} }
@@ -499,7 +499,7 @@ OpenLayers.Events = OpenLayers.Class({
* element - {HTMLDOMElement} a DOM element to attach browser events to * element - {HTMLDOMElement} a DOM element to attach browser events to
*/ */
attachToElement: function (element) { attachToElement: function (element) {
for (var i = 0; i < this.BROWSER_EVENTS.length; i++) { for (var i=0, len=this.BROWSER_EVENTS.length; i<len; i++) {
var eventType = this.BROWSER_EVENTS[i]; var eventType = this.BROWSER_EVENTS[i];
// every browser event has a corresponding application event // every browser event has a corresponding application event
@@ -639,7 +639,7 @@ OpenLayers.Events = OpenLayers.Class({
} }
var listeners = this.listeners[type]; var listeners = this.listeners[type];
if (listeners != null) { if (listeners != null) {
for (var i = 0; i < listeners.length; i++) { for (var i=0, len=listeners.length; i<len; i++) {
if (listeners[i].obj == obj && listeners[i].func == func) { if (listeners[i].obj == obj && listeners[i].func == func) {
listeners.splice(i, 1); listeners.splice(i, 1);
break; break;
@@ -693,7 +693,7 @@ OpenLayers.Events = OpenLayers.Class({
this.listeners[type].slice() : null; this.listeners[type].slice() : null;
if ((listeners != null) && (listeners.length > 0)) { if ((listeners != null) && (listeners.length > 0)) {
var continueChain; var continueChain;
for (var i = 0; i < listeners.length; i++) { for (var i=0, len=listeners.length; i<len; i++) {
var callback = listeners[i]; var callback = listeners[i];
// bind the context to callback.obj // bind the context to callback.obj
continueChain = callback.func.apply(callback.obj, [evt]); continueChain = callback.func.apply(callback.obj, [evt]);

2
lib/OpenLayers/Filter/FeatureId.js
View File

@@ -53,7 +53,7 @@ OpenLayers.Filter.FeatureId = OpenLayers.Class(OpenLayers.Filter, {
* {Boolean} true if the rule applies, false if it does not * {Boolean} true if the rule applies, false if it does not
*/ */
evaluate: function(feature) { evaluate: function(feature) {
for (var i=0; i<this.fids.length; i++) { for (var i=0, len=this.fids.length; i<len; i++) {
var fid = feature.fid || feature.id; var fid = feature.fid || feature.id;
if (fid == this.fids[i]) { if (fid == this.fids[i]) {
return true; return true;

4
lib/OpenLayers/Filter/Logical.js
View File

@@ -70,7 +70,7 @@ OpenLayers.Filter.Logical = OpenLayers.Class(OpenLayers.Filter, {
evaluate: function(context) { evaluate: function(context) {
switch(this.type) { switch(this.type) {
case OpenLayers.Filter.Logical.AND: case OpenLayers.Filter.Logical.AND:
for (var i=0; i<this.filters.length; i++) { for (var i=0, len=this.filters.length; i<len; i++) {
if (this.filters[i].evaluate(context) == false) { if (this.filters[i].evaluate(context) == false) {
return false; return false;
} }
@@ -78,7 +78,7 @@ OpenLayers.Filter.Logical = OpenLayers.Class(OpenLayers.Filter, {
return true; return true;
case OpenLayers.Filter.Logical.OR: case OpenLayers.Filter.Logical.OR:
for (var i=0; i<this.filters.length; i++) { for (var i=0, len=this.filters.length; i<len; i++) {
if (this.filters[i].evaluate(context) == true) { if (this.filters[i].evaluate(context) == true) {
return true; return true;
} }

4
lib/OpenLayers/Format/GPX.js
View File

@@ -84,7 +84,7 @@ OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
if(this.extractTracks) { if(this.extractTracks) {
var tracks = doc.getElementsByTagName("trk"); var tracks = doc.getElementsByTagName("trk");
for (var i = 0, len = tracks.length; i < tracks.length; i++) { for (var i=0, len=tracks.length; i<len; i++) {
// Attributes are only in trk nodes, not trkseg nodes // Attributes are only in trk nodes, not trkseg nodes
var attrs = {} var attrs = {}
if(this.extractAttributes) { if(this.extractAttributes) {
@@ -103,7 +103,7 @@ OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
if(this.extractRoutes) { if(this.extractRoutes) {
var routes = doc.getElementsByTagName("rte"); var routes = doc.getElementsByTagName("rte");
for (var k = 0; k < routes.length; k++) { for (var k=0, klen=routes.length; k<klen; k++) {
var attrs = {} var attrs = {}
if(this.extractAttributes) { if(this.extractAttributes) {
attrs = this.parseAttributes(routes[k]); attrs = this.parseAttributes(routes[k]);

22
lib/OpenLayers/Format/GeoJSON.js
View File

@@ -104,7 +104,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
} }
break; break;
case "FeatureCollection": case "FeatureCollection":
for(var i=0; i<obj.features.length; ++i) { for(var i=0, len=obj.features.length; i<len; ++i) {
try { try {
results.push(this.parseFeature(obj.features[i])); results.push(this.parseFeature(obj.features[i]));
} catch(err) { } catch(err) {
@@ -278,7 +278,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
"multipoint": function(array) { "multipoint": function(array) {
var points = []; var points = [];
var p = null; var p = null;
for(var i=0; i<array.length; ++i) { for(var i=0, len=array.length; i<len; ++i) {
try { try {
p = this.parseCoords["point"].apply(this, [array[i]]); p = this.parseCoords["point"].apply(this, [array[i]]);
} catch(err) { } catch(err) {
@@ -303,7 +303,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
"linestring": function(array) { "linestring": function(array) {
var points = []; var points = [];
var p = null; var p = null;
for(var i=0; i<array.length; ++i) { for(var i=0, len=array.length; i<len; ++i) {
try { try {
p = this.parseCoords["point"].apply(this, [array[i]]); p = this.parseCoords["point"].apply(this, [array[i]]);
} catch(err) { } catch(err) {
@@ -328,7 +328,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
"multilinestring": function(array) { "multilinestring": function(array) {
var lines = []; var lines = [];
var l = null; var l = null;
for(var i=0; i<array.length; ++i) { for(var i=0, len=array.length; i<len; ++i) {
try { try {
l = this.parseCoords["linestring"].apply(this, [array[i]]); l = this.parseCoords["linestring"].apply(this, [array[i]]);
} catch(err) { } catch(err) {
@@ -350,7 +350,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
"polygon": function(array) { "polygon": function(array) {
var rings = []; var rings = [];
var r, l; var r, l;
for(var i=0; i<array.length; ++i) { for(var i=0, len=array.length; i<len; ++i) {
try { try {
l = this.parseCoords["linestring"].apply(this, [array[i]]); l = this.parseCoords["linestring"].apply(this, [array[i]]);
} catch(err) { } catch(err) {
@@ -376,7 +376,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
"multipolygon": function(array) { "multipolygon": function(array) {
var polys = []; var polys = [];
var p = null; var p = null;
for(var i=0; i<array.length; ++i) { for(var i=0, len=array.length; i<len; ++i) {
try { try {
p = this.parseCoords["polygon"].apply(this, [array[i]]); p = this.parseCoords["polygon"].apply(this, [array[i]]);
} catch(err) { } catch(err) {
@@ -582,7 +582,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
*/ */
'multipoint': function(multipoint) { 'multipoint': function(multipoint) {
var array = []; var array = [];
for(var i=0; i<multipoint.components.length; ++i) { for(var i=0, len=multipoint.components.length; i<len; ++i) {
array.push(this.extract.point.apply(this, [multipoint.components[i]])); array.push(this.extract.point.apply(this, [multipoint.components[i]]));
} }
return array; return array;
@@ -601,7 +601,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
*/ */
'linestring': function(linestring) { 'linestring': function(linestring) {
var array = []; var array = [];
for(var i=0; i<linestring.components.length; ++i) { for(var i=0, len=linestring.components.length; i<len; ++i) {
array.push(this.extract.point.apply(this, [linestring.components[i]])); array.push(this.extract.point.apply(this, [linestring.components[i]]));
} }
return array; return array;
@@ -620,7 +620,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
*/ */
'multilinestring': function(multilinestring) { 'multilinestring': function(multilinestring) {
var array = []; var array = [];
for(var i=0; i<multilinestring.components.length; ++i) { for(var i=0, len=multilinestring.components.length; i<len; ++i) {
array.push(this.extract.linestring.apply(this, [multilinestring.components[i]])); array.push(this.extract.linestring.apply(this, [multilinestring.components[i]]));
} }
return array; return array;
@@ -638,7 +638,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
*/ */
'polygon': function(polygon) { 'polygon': function(polygon) {
var array = []; var array = [];
for(var i=0; i<polygon.components.length; ++i) { for(var i=0, len=polygon.components.length; i<len; ++i) {
array.push(this.extract.linestring.apply(this, [polygon.components[i]])); array.push(this.extract.linestring.apply(this, [polygon.components[i]]));
} }
return array; return array;
@@ -657,7 +657,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
*/ */
'multipolygon': function(multipolygon) { 'multipolygon': function(multipolygon) {
var array = []; var array = [];
for(var i=0; i<multipolygon.components.length; ++i) { for(var i=0, len=multipolygon.components.length; i<len; ++i) {
array.push(this.extract.polygon.apply(this, [multipolygon.components[i]])); array.push(this.extract.polygon.apply(this, [multipolygon.components[i]]));
} }
return array; return array;

6
lib/OpenLayers/Format/GeoRSS.js
View File

@@ -131,7 +131,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
var coords = OpenLayers.String.trim(line[0].firstChild.nodeValue).split(/\s+/); var coords = OpenLayers.String.trim(line[0].firstChild.nodeValue).split(/\s+/);
var components = []; var components = [];
var point; var point;
for (var i=0; i < coords.length; i+=2) { for (var i=0, len=coords.length; i<len; i+=2) {
point = new OpenLayers.Geometry.Point(parseFloat(coords[i+1]), point = new OpenLayers.Geometry.Point(parseFloat(coords[i+1]),
parseFloat(coords[i])); parseFloat(coords[i]));
components.push(point); components.push(point);
@@ -141,7 +141,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
var coords = OpenLayers.String.trim(polygon[0].firstChild.nodeValue).split(/\s+/); var coords = OpenLayers.String.trim(polygon[0].firstChild.nodeValue).split(/\s+/);
var components = []; var components = [];
var point; var point;
for (var i=0; i < coords.length; i+=2) { for (var i=0, len=coords.length; i<len; i+=2) {
point = new OpenLayers.Geometry.Point(parseFloat(coords[i+1]), point = new OpenLayers.Geometry.Point(parseFloat(coords[i+1]),
parseFloat(coords[i])); parseFloat(coords[i]));
components.push(point); components.push(point);
@@ -275,7 +275,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
var georss; var georss;
if(features instanceof Array) { if(features instanceof Array) {
georss = this.createElementNS(this.rssns, "rss"); georss = this.createElementNS(this.rssns, "rss");
for(var i=0; i < features.length; i++) { for(var i=0, len=features.length; i<len; i++) {
georss.appendChild(this.createFeatureXML(features[i])); georss.appendChild(this.createFeatureXML(features[i]));
} }
} else { } else {

2
lib/OpenLayers/Format/JSON.js
View File

@@ -266,7 +266,7 @@ OpenLayers.Format.JSON = OpenLayers.Class(OpenLayers.Format, {
var pieces = ['[']; var pieces = ['['];
this.level += 1; this.level += 1;
for(var i=0; i<array.length; ++i) { for(var i=0, len=array.length; i<len; ++i) {
// recursive calls need to allow for sub-classing // recursive calls need to allow for sub-classing
json = OpenLayers.Format.JSON.prototype.write.apply(this, json = OpenLayers.Format.JSON.prototype.write.apply(this,
[array[i], this.pretty]); [array[i], this.pretty]);

28
lib/OpenLayers/Format/KML.js
View File

@@ -167,7 +167,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
// Loop throught the following node types in this order and // Loop throught the following node types in this order and
// process the nodes found // process the nodes found
var types = ["Link", "NetworkLink", "Style", "StyleMap", "Placemark"]; var types = ["Link", "NetworkLink", "Style", "StyleMap", "Placemark"];
for(var i=0; i<types.length; ++i) { for(var i=0, len=types.length; i<len; ++i) {
var type = types[i]; var type = types[i];
var nodes = this.getElementsByTagNameNS(data, "*", type); var nodes = this.getElementsByTagNameNS(data, "*", type);
@@ -228,7 +228,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
var newOptions = OpenLayers.Util.extend({}, options); var newOptions = OpenLayers.Util.extend({}, options);
newOptions.depth++; newOptions.depth++;
for(var i=0; i < nodes.length; i++) { for(var i=0, len=nodes.length; i<len; i++) {
var href = this.parseProperty(nodes[i], "*", "href"); var href = this.parseProperty(nodes[i], "*", "href");
if(href && !this.fetched[href]) { if(href && !this.fetched[href]) {
this.fetched[href] = true; // prevent reloading the same urls this.fetched[href] = true; // prevent reloading the same urls
@@ -267,7 +267,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
* *
*/ */
parseStyles: function(nodes, options) { parseStyles: function(nodes, options) {
for(var i=0; i < nodes.length; i++) { for(var i=0, len=nodes.length; i<len; i++) {
var style = this.parseStyle(nodes[i]); var style = this.parseStyle(nodes[i]);
if(style) { if(style) {
styleName = (options.styleBaseUrl || "") + "#" + style.id; styleName = (options.styleBaseUrl || "") + "#" + style.id;
@@ -291,7 +291,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
var types = ["LineStyle", "PolyStyle", "IconStyle", "BalloonStyle"]; var types = ["LineStyle", "PolyStyle", "IconStyle", "BalloonStyle"];
var type, nodeList, geometry, parser; var type, nodeList, geometry, parser;
for(var i=0; i<types.length; ++i) { for(var i=0, len=types.length; i<len; ++i) {
type = types[i]; type = types[i];
styleTypeNode = this.getElementsByTagNameNS(node, styleTypeNode = this.getElementsByTagNameNS(node,
"*", type)[0]; "*", type)[0];
@@ -489,13 +489,13 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
// Only the default or "normal" part of the StyleMap is processed now // Only the default or "normal" part of the StyleMap is processed now
// To do the select or "highlight" bit, we'd need to change lots more // To do the select or "highlight" bit, we'd need to change lots more
for(var i=0; i < nodes.length; i++) { for(var i=0, len=nodes.length; i<len; i++) {
var node = nodes[i]; var node = nodes[i];
var pairs = this.getElementsByTagNameNS(node, "*", var pairs = this.getElementsByTagNameNS(node, "*",
"Pair"); "Pair");
var id = node.getAttribute("id"); var id = node.getAttribute("id");
for (var j=0; j<pairs.length; j++) { for (var j=0, jlen=pairs.length; j<jlen; j++) {
var pair = pairs[j]; var pair = pairs[j];
// Use the shortcut in the SLD format to quickly retrieve the // Use the shortcut in the SLD format to quickly retrieve the
// value of a node. Maybe it's good to have a method in // value of a node. Maybe it's good to have a method in
@@ -530,7 +530,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
*/ */
parseFeatures: function(nodes, options) { parseFeatures: function(nodes, options) {
var features = new Array(nodes.length); var features = new Array(nodes.length);
for(var i=0; i < nodes.length; i++) { for(var i=0, len=nodes.length; i<len; i++) {
var featureNode = nodes[i]; var featureNode = nodes[i];
var feature = this.parseFeature.apply(this,[featureNode]) ; var feature = this.parseFeature.apply(this,[featureNode]) ;
if(feature) { if(feature) {
@@ -584,7 +584,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
// only accept one geometry per feature - look for highest "order" // only accept one geometry per feature - look for highest "order"
var order = ["MultiGeometry", "Polygon", "LineString", "Point"]; var order = ["MultiGeometry", "Polygon", "LineString", "Point"];
var type, nodeList, geometry, parser; var type, nodeList, geometry, parser;
for(var i=0; i<order.length; ++i) { for(var i=0, len=order.length; i<len; ++i) {
type = order[i]; type = order[i];
this.internalns = node.namespaceURI ? this.internalns = node.namespaceURI ?
node.namespaceURI : this.kmlns; node.namespaceURI : this.kmlns;
@@ -778,7 +778,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
if(numRings > 0) { if(numRings > 0) {
// this assumes exterior ring first, inner rings after // this assumes exterior ring first, inner rings after
var ring; var ring;
for(var i=0; i<nodeList.length; ++i) { for(var i=0, len=nodeList.length; i<len; ++i) {
ring = this.parseGeometry.linestring.apply(this, ring = this.parseGeometry.linestring.apply(this,
[nodeList[i], true]); [nodeList[i], true]);
if(ring) { if(ring) {
@@ -806,7 +806,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
var child, parser; var child, parser;
var parts = []; var parts = [];
var children = node.childNodes; var children = node.childNodes;
for(var i=0; i<children.length; ++i ) { for(var i=0, len=children.length; i<len; ++i ) {
child = children[i]; child = children[i];
if(child.nodeType == 1) { if(child.nodeType == 1) {
var type = (child.prefix) ? var type = (child.prefix) ?
@@ -837,7 +837,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
// assume attribute nodes are type 1 children with a type 3 or 4 child // assume attribute nodes are type 1 children with a type 3 or 4 child
var child, grandchildren, grandchild; var child, grandchildren, grandchild;
var children = node.childNodes; var children = node.childNodes;
for(var i=0; i<children.length; ++i) { for(var i=0, len=children.length; i<len; ++i) {
child = children[i]; child = children[i];
if(child.nodeType == 1) { if(child.nodeType == 1) {
grandchildren = child.childNodes; grandchildren = child.childNodes;
@@ -909,7 +909,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
} }
var kml = this.createElementNS(this.kmlns, "kml"); var kml = this.createElementNS(this.kmlns, "kml");
var folder = this.createFolderXML(); var folder = this.createFolderXML();
for(var i=0; i<features.length; ++i) { for(var i=0, len=features.length; i<len; ++i) {
folder.appendChild(this.createPlacemarkXML(features[i])); folder.appendChild(this.createPlacemarkXML(features[i]));
} }
kml.appendChild(folder); kml.appendChild(folder);
@@ -1108,7 +1108,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
var kml = this.createElementNS(this.kmlns, "Polygon"); var kml = this.createElementNS(this.kmlns, "Polygon");
var rings = geometry.components; var rings = geometry.components;
var ringMember, ringGeom, type; var ringMember, ringGeom, type;
for(var i=0; i<rings.length; ++i) { for(var i=0, len=rings.length; i<len; ++i) {
type = (i==0) ? "outerBoundaryIs" : "innerBoundaryIs"; type = (i==0) ? "outerBoundaryIs" : "innerBoundaryIs";
ringMember = this.createElementNS(this.kmlns, type); ringMember = this.createElementNS(this.kmlns, type);
ringGeom = this.buildGeometry.linearring.apply(this, ringGeom = this.buildGeometry.linearring.apply(this,
@@ -1147,7 +1147,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
collection: function(geometry) { collection: function(geometry) {
var kml = this.createElementNS(this.kmlns, "MultiGeometry"); var kml = this.createElementNS(this.kmlns, "MultiGeometry");
var child; var child;
for(var i=0; i<geometry.components.length; ++i) { for(var i=0, len=geometry.components.length; i<len; ++i) {
child = this.buildGeometryNode.apply(this, child = this.buildGeometryNode.apply(this,
[geometry.components[i]]); [geometry.components[i]]);
if(child) { if(child) {

22
lib/OpenLayers/Format/SLD/v1.js
View File

@@ -115,7 +115,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
}; };
this.readChildNodes(node, layer); this.readChildNodes(node, layer);
// give each of the user styles this layer name // give each of the user styles this layer name
for(var i=0; i<layer.userStyles.length; ++i) { for(var i=0, len=layer.userStyles.length; i<len; ++i) {
layer.userStyles[i].layerName = layer.name; layer.userStyles[i].layerName = layer.name;
} }
sld.namedLayers[layer.name] = layer; sld.namedLayers[layer.name] = layer;
@@ -210,7 +210,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
"graphicName", "rotation", "graphicFormat" "graphicName", "rotation", "graphicFormat"
]; ];
var prop, value; var prop, value;
for(var i=0; i<properties.length; ++i) { for(var i=0, len=properties.length; i<len; ++i) {
prop = properties[i]; prop = properties[i];
value = graphic[prop]; value = graphic[prop];
if(value != undefined) { if(value != undefined) {
@@ -562,7 +562,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
// add in named styles // add in named styles
if(layer.namedStyles) { if(layer.namedStyles) {
for(var i=0; i<layer.namedStyles.length; ++i) { for(var i=0, len=layer.namedStyles.length; i<len; ++i) {
this.writeNode( this.writeNode(
node, "NamedStyle", layer.namedStyles[i] node, "NamedStyle", layer.namedStyles[i]
); );
@@ -571,7 +571,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
// add in user styles // add in user styles
if(layer.userStyles) { if(layer.userStyles) {
for(var i=0; i<layer.userStyles.length; ++i) { for(var i=0, len=layer.userStyles.length; i<len; ++i) {
this.writeNode( this.writeNode(
node, "UserStyle", layer.userStyles[i] node, "UserStyle", layer.userStyles[i]
); );
@@ -624,7 +624,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
// related to FeatureTypeStyle // related to FeatureTypeStyle
// add in rules // add in rules
for(var i=0; i<style.rules.length; ++i) { for(var i=0, len=style.rules.length; i<len; ++i) {
this.writeNode(node, "Rule", style.rules[i]); this.writeNode(node, "Rule", style.rules[i]);
} }
@@ -670,7 +670,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
// add in symbolizers (relies on geometry type keys) // add in symbolizers (relies on geometry type keys)
var types = OpenLayers.Style.SYMBOLIZER_PREFIXES; var types = OpenLayers.Style.SYMBOLIZER_PREFIXES;
var type, symbolizer; var type, symbolizer;
for(var i=0; i<types.length; ++i) { for(var i=0, len=types.length; i<len; ++i) {
type = types[i]; type = types[i];
symbolizer = rule.symbolizer[type]; symbolizer = rule.symbolizer[type];
if(symbolizer) { if(symbolizer) {
@@ -776,7 +776,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
var tokens = label.split("${"); var tokens = label.split("${");
node.appendChild(this.createTextNode(tokens[0])); node.appendChild(this.createTextNode(tokens[0]));
var item, last; var item, last;
for(var i=1; i<tokens.length; i++) { for(var i=1, len=tokens.length; i<len; i++) {
item = tokens[i]; item = tokens[i];
last = item.indexOf("}"); last = item.indexOf("}");
if(last > 0) { if(last > 0) {
@@ -902,7 +902,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
var node = this.createElementNSPlus("ogc:Filter"); var node = this.createElementNSPlus("ogc:Filter");
var sub = filter.CLASS_NAME.split(".").pop(); var sub = filter.CLASS_NAME.split(".").pop();
if(sub == "FeatureId") { if(sub == "FeatureId") {
for(var i=0; i<filter.fids.length; ++i) { for(var i=0, len=filter.fids.length; i<len; ++i) {
this.writeNode(node, "FeatureId", filter.fids[i]); this.writeNode(node, "FeatureId", filter.fids[i]);
} }
} else { } else {
@@ -918,7 +918,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
"And": function(filter) { "And": function(filter) {
var node = this.createElementNSPlus("ogc:And"); var node = this.createElementNSPlus("ogc:And");
var childFilter; var childFilter;
for(var i=0; i<filter.filters.length; ++i) { for(var i=0, len=filter.filters.length; i<len; ++i) {
childFilter = filter.filters[i]; childFilter = filter.filters[i];
this.writeNode( this.writeNode(
node, this.getFilterType(childFilter), childFilter node, this.getFilterType(childFilter), childFilter
@@ -929,7 +929,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
"Or": function(filter) { "Or": function(filter) {
var node = this.createElementNSPlus("ogc:Or"); var node = this.createElementNSPlus("ogc:Or");
var childFilter; var childFilter;
for(var i=0; i<filter.filters.length; ++i) { for(var i=0, len=filter.filters.length; i<len; ++i) {
childFilter = filter.filters[i]; childFilter = filter.filters[i];
this.writeNode( this.writeNode(
node, this.getFilterType(childFilter), childFilter node, this.getFilterType(childFilter), childFilter
@@ -1103,7 +1103,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
readChildNodes: function(node, obj) { readChildNodes: function(node, obj) {
var children = node.childNodes; var children = node.childNodes;
var child, group, reader, prefix, local; var child, group, reader, prefix, local;
for(var i=0; i<children.length; ++i) { for(var i=0, len=children.length; i<len; ++i) {
child = children[i]; child = children[i];
if(child.nodeType == 1) { if(child.nodeType == 1) {
prefix = this.getNamespacePrefix(child.namespaceURI); prefix = this.getNamespacePrefix(child.namespaceURI);

26
lib/OpenLayers/Format/WKT.js
View File

@@ -70,7 +70,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
} else if (features && } else if (features &&
type != "geometrycollection" && type != "geometrycollection" &&
typeof features == "object") { typeof features == "object") {
for (var i = 0; i < features.length; i++) { for (var i=0, len=features.length; i<len; i++) {
var component = features[i]; var component = features[i];
component.geometry.transform(this.externalProjection, component.geometry.transform(this.externalProjection,
this.internalProjection); this.internalProjection);
@@ -105,7 +105,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
if(isCollection) { if(isCollection) {
pieces.push('GEOMETRYCOLLECTION('); pieces.push('GEOMETRYCOLLECTION(');
} }
for(var i=0; i<collection.length; ++i) { for(var i=0, len=collection.length; i<len; ++i) {
if(isCollection && i>0) { if(isCollection && i>0) {
pieces.push(','); pieces.push(',');
} }
@@ -150,7 +150,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
*/ */
'multipoint': function(multipoint) { 'multipoint': function(multipoint) {
var array = []; var array = [];
for(var i=0; i<multipoint.components.length; ++i) { for(var i=0, len=multipoint.components.length; i<len; ++i) {
array.push(this.extract.point.apply(this, [multipoint.components[i]])); array.push(this.extract.point.apply(this, [multipoint.components[i]]));
} }
return array.join(','); return array.join(',');
@@ -164,7 +164,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
*/ */
'linestring': function(linestring) { 'linestring': function(linestring) {
var array = []; var array = [];
for(var i=0; i<linestring.components.length; ++i) { for(var i=0, len=linestring.components.length; i<len; ++i) {
array.push(this.extract.point.apply(this, [linestring.components[i]])); array.push(this.extract.point.apply(this, [linestring.components[i]]));
} }
return array.join(','); return array.join(',');
@@ -178,7 +178,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
*/ */
'multilinestring': function(multilinestring) { 'multilinestring': function(multilinestring) {
var array = []; var array = [];
for(var i=0; i<multilinestring.components.length; ++i) { for(var i=0, len=multilinestring.components.length; i<len; ++i) {
array.push('(' + array.push('(' +
this.extract.linestring.apply(this, [multilinestring.components[i]]) + this.extract.linestring.apply(this, [multilinestring.components[i]]) +
')'); ')');
@@ -193,7 +193,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
*/ */
'polygon': function(polygon) { 'polygon': function(polygon) {
var array = []; var array = [];
for(var i=0; i<polygon.components.length; ++i) { for(var i=0, len=polygon.components.length; i<len; ++i) {
array.push('(' + array.push('(' +
this.extract.linestring.apply(this, [polygon.components[i]]) + this.extract.linestring.apply(this, [polygon.components[i]]) +
')'); ')');
@@ -209,7 +209,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
*/ */
'multipolygon': function(multipolygon) { 'multipolygon': function(multipolygon) {
var array = []; var array = [];
for(var i=0; i<multipolygon.components.length; ++i) { for(var i=0, len=multipolygon.components.length; i<len; ++i) {
array.push('(' + array.push('(' +
this.extract.polygon.apply(this, [multipolygon.components[i]]) + this.extract.polygon.apply(this, [multipolygon.components[i]]) +
')'); ')');
@@ -246,7 +246,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
'multipoint': function(str) { 'multipoint': function(str) {
var points = OpenLayers.String.trim(str).split(','); var points = OpenLayers.String.trim(str).split(',');
var components = []; var components = [];
for(var i=0; i<points.length; ++i) { for(var i=0, len=points.length; i<len; ++i) {
components.push(this.parse.point.apply(this, [points[i]]).geometry); components.push(this.parse.point.apply(this, [points[i]]).geometry);
} }
return new OpenLayers.Feature.Vector( return new OpenLayers.Feature.Vector(
@@ -263,7 +263,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
'linestring': function(str) { 'linestring': function(str) {
var points = OpenLayers.String.trim(str).split(','); var points = OpenLayers.String.trim(str).split(',');
var components = []; var components = [];
for(var i=0; i<points.length; ++i) { for(var i=0, len=points.length; i<len; ++i) {
components.push(this.parse.point.apply(this, [points[i]]).geometry); components.push(this.parse.point.apply(this, [points[i]]).geometry);
} }
return new OpenLayers.Feature.Vector( return new OpenLayers.Feature.Vector(
@@ -281,7 +281,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
var line; var line;
var lines = OpenLayers.String.trim(str).split(this.regExes.parenComma); var lines = OpenLayers.String.trim(str).split(this.regExes.parenComma);
var components = []; var components = [];
for(var i=0; i<lines.length; ++i) { for(var i=0, len=lines.length; i<len; ++i) {
line = lines[i].replace(this.regExes.trimParens, '$1'); line = lines[i].replace(this.regExes.trimParens, '$1');
components.push(this.parse.linestring.apply(this, [line]).geometry); components.push(this.parse.linestring.apply(this, [line]).geometry);
} }
@@ -300,7 +300,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
var ring, linestring, linearring; var ring, linestring, linearring;
var rings = OpenLayers.String.trim(str).split(this.regExes.parenComma); var rings = OpenLayers.String.trim(str).split(this.regExes.parenComma);
var components = []; var components = [];
for(var i=0; i<rings.length; ++i) { for(var i=0, len=rings.length; i<len; ++i) {
ring = rings[i].replace(this.regExes.trimParens, '$1'); ring = rings[i].replace(this.regExes.trimParens, '$1');
linestring = this.parse.linestring.apply(this, [ring]).geometry; linestring = this.parse.linestring.apply(this, [ring]).geometry;
linearring = new OpenLayers.Geometry.LinearRing(linestring.components); linearring = new OpenLayers.Geometry.LinearRing(linestring.components);
@@ -321,7 +321,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
var polygon; var polygon;
var polygons = OpenLayers.String.trim(str).split(this.regExes.doubleParenComma); var polygons = OpenLayers.String.trim(str).split(this.regExes.doubleParenComma);
var components = []; var components = [];
for(var i=0; i<polygons.length; ++i) { for(var i=0, len=polygons.length; i<len; ++i) {
polygon = polygons[i].replace(this.regExes.trimParens, '$1'); polygon = polygons[i].replace(this.regExes.trimParens, '$1');
components.push(this.parse.polygon.apply(this, [polygon]).geometry); components.push(this.parse.polygon.apply(this, [polygon]).geometry);
} }
@@ -341,7 +341,7 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
str = str.replace(/,\s*([A-Za-z])/g, '|$1'); str = str.replace(/,\s*([A-Za-z])/g, '|$1');
var wktArray = OpenLayers.String.trim(str).split('|'); var wktArray = OpenLayers.String.trim(str).split('|');
var components = []; var components = [];
for(var i=0; i<wktArray.length; ++i) { for(var i=0, len=wktArray.length; i<len; ++i) {
components.push(OpenLayers.Format.WKT.prototype.read.apply(this,[wktArray[i]])); components.push(OpenLayers.Format.WKT.prototype.read.apply(this,[wktArray[i]]));
} }
return components; return components;

6
lib/OpenLayers/Format/WMC/v1.js
View File

@@ -119,7 +119,7 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
runChildNodes: function(obj, node) { runChildNodes: function(obj, node) {
var children = node.childNodes; var children = node.childNodes;
var childNode, processor, prefix, local; var childNode, processor, prefix, local;
for(var i=0; i<children.length; ++i) { for(var i=0, len=children.length; i<len; ++i) {
childNode = children[i]; childNode = children[i];
if(childNode.nodeType == 1) { if(childNode.nodeType == 1) {
prefix = this.getNamespacePrefix(childNode.namespaceURI); prefix = this.getNamespacePrefix(childNode.namespaceURI);
@@ -593,7 +593,7 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
var list = this.createElementDefaultNS("LayerList"); var list = this.createElementDefaultNS("LayerList");
var layer; var layer;
for(var i=0; i<context.layers.length; ++i) { for(var i=0, len=context.layers.length; i<len; ++i) {
layer = context.layers[i]; layer = context.layers[i];
if(layer instanceof OpenLayers.Layer.WMS) { if(layer instanceof OpenLayers.Layer.WMS) {
list.appendChild(this.write_wmc_Layer(layer)); list.appendChild(this.write_wmc_Layer(layer));
@@ -690,7 +690,7 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
"opacity", "displayInLayerSwitcher", "singleTile" "opacity", "displayInLayerSwitcher", "singleTile"
]; ];
var child; var child;
for(var i=0; i<properties.length; ++i) { for(var i=0, len=properties.length; i<len; ++i) {
child = this.createOLPropertyNode(layer, properties[i]); child = this.createOLPropertyNode(layer, properties[i]);
if(child) { if(child) {
node.appendChild(child); node.appendChild(child);

4
lib/OpenLayers/Format/XML.js
View File

@@ -201,7 +201,7 @@ OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, {
// brute force method // brute force method
var allNodes = node.getElementsByTagName("*"); var allNodes = node.getElementsByTagName("*");
var potentialNode, fullName; var potentialNode, fullName;
for(var i=0; i<allNodes.length; ++i) { for(var i=0, len=allNodes.length; i<len; ++i) {
potentialNode = allNodes[i]; potentialNode = allNodes[i];
fullName = (potentialNode.prefix) ? fullName = (potentialNode.prefix) ?
(potentialNode.prefix + ":" + name) : name; (potentialNode.prefix + ":" + name) : name;
@@ -234,7 +234,7 @@ OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, {
} else { } else {
var attributes = node.attributes; var attributes = node.attributes;
var potentialNode, fullName; var potentialNode, fullName;
for(var i=0; i<attributes.length; ++i) { for(var i=0, len=attributes.length; i<len; ++i) {
potentialNode = attributes[i]; potentialNode = attributes[i];
if(potentialNode.namespaceURI == uri) { if(potentialNode.namespaceURI == uri) {
fullName = (potentialNode.prefix) ? fullName = (potentialNode.prefix) ?

22
lib/OpenLayers/Geometry/Collection.js
View File

@@ -74,7 +74,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
*/ */
clone: function() { clone: function() {
var geometry = eval("new " + this.CLASS_NAME + "()"); var geometry = eval("new " + this.CLASS_NAME + "()");
for(var i=0; i<this.components.length; i++) { for(var i=0, len=this.components.length; i<len; i++) {
geometry.addComponent(this.components[i].clone()); geometry.addComponent(this.components[i].clone());
} }
@@ -93,7 +93,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
*/ */
getComponentsString: function(){ getComponentsString: function(){
var strings = []; var strings = [];
for(var i = 0; i < this.components.length; i++) { for(var i=0, len=this.components.length; i<len; i++) {
strings.push(this.components[i].toShortString()); strings.push(this.components[i].toShortString());
} }
return strings.join(","); return strings.join(",");
@@ -108,7 +108,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
this.bounds = null; this.bounds = null;
if ( this.components && this.components.length > 0) { if ( this.components && this.components.length > 0) {
this.setBounds(this.components[0].getBounds()); this.setBounds(this.components[0].getBounds());
for (var i = 1; i < this.components.length; i++) { for (var i=1, len=this.components.length; i<len; i++) {
this.extendBounds(this.components[i].getBounds()); this.extendBounds(this.components[i].getBounds());
} }
} }
@@ -125,7 +125,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
if(!(components instanceof Array)) { if(!(components instanceof Array)) {
components = [components]; components = [components];
} }
for(var i=0; i < components.length; i++) { for(var i=0, len=components.length; i<len; i++) {
this.addComponent(components[i]); this.addComponent(components[i]);
} }
}, },
@@ -209,7 +209,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
*/ */
getLength: function() { getLength: function() {
var length = 0.0; var length = 0.0;
for (var i = 0; i < this.components.length; i++) { for (var i=0, len=this.components.length; i<len; i++) {
length += this.components[i].getLength(); length += this.components[i].getLength();
} }
return length; return length;
@@ -225,7 +225,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
*/ */
getArea: function() { getArea: function() {
var area = 0.0; var area = 0.0;
for (var i = 0; i < this.components.length; i++) { for (var i=0, len=this.components.length; i<len; i++) {
area += this.components[i].getArea(); area += this.components[i].getArea();
} }
return area; return area;
@@ -240,7 +240,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
* y - {Float} The y-displacement (in map units) * y - {Float} The y-displacement (in map units)
*/ */
move: function(x, y) { move: function(x, y) {
for(var i = 0; i < this.components.length; i++) { for(var i=0, len=this.components.length; i<len; i++) {
this.components[i].move(x, y); this.components[i].move(x, y);
} }
}, },
@@ -255,7 +255,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
* origin - {<OpenLayers.Geometry.Point>} Center point for the rotation * origin - {<OpenLayers.Geometry.Point>} Center point for the rotation
*/ */
rotate: function(angle, origin) { rotate: function(angle, origin) {
for(var i=0; i<this.components.length; ++i) { for(var i=0, len=this.components.length; i<len; ++i) {
this.components[i].rotate(angle, origin); this.components[i].rotate(angle, origin);
} }
}, },
@@ -298,7 +298,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
(geometry.components.length != this.components.length)) { (geometry.components.length != this.components.length)) {
equivalent = false; equivalent = false;
} else { } else {
for(var i=0; i<this.components.length; ++i) { for(var i=0, len=this.components.length; i<len; ++i) {
if(!this.components[i].equals(geometry.components[i])) { if(!this.components[i].equals(geometry.components[i])) {
equivalent = false; equivalent = false;
break; break;
@@ -321,7 +321,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
*/ */
transform: function(source, dest) { transform: function(source, dest) {
if (source && dest) { if (source && dest) {
for (var i = 0; i < this.components.length; i++) { for (var i=0, len=this.components.length; i<len; i++) {
var component = this.components[i]; var component = this.components[i];
component.transform(source, dest); component.transform(source, dest);
} }
@@ -341,7 +341,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
*/ */
intersects: function(geometry) { intersects: function(geometry) {
var intersect = false; var intersect = false;
for(var i=0; i<this.components.length; ++ i) { for(var i=0, len=this.components.length; i<len; ++ i) {
intersect = geometry.intersects(this.components[i]); intersect = geometry.intersects(this.components[i]);
if(intersect) { if(intersect) {
break; break;

2
lib/OpenLayers/Geometry/Curve.js
View File

@@ -45,7 +45,7 @@ OpenLayers.Geometry.Curve = OpenLayers.Class(OpenLayers.Geometry.MultiPoint, {
getLength: function() { getLength: function() {
var length = 0.0; var length = 0.0;
if ( this.components && (this.components.length > 1)) { if ( this.components && (this.components.length > 1)) {
for(var i=1; i < this.components.length; i++) { for(var i=1, len=this.components.length; i<len; i++) {
length += this.components[i-1].distanceTo(this.components[i]); length += this.components[i-1].distanceTo(this.components[i]);
} }
} }

4
lib/OpenLayers/Geometry/LineString.js
View File

@@ -78,13 +78,13 @@ OpenLayers.Geometry.LineString = OpenLayers.Class(OpenLayers.Geometry.Curve, {
var seg1, seg1x1, seg1x2, seg1y1, seg1y2, var seg1, seg1x1, seg1x2, seg1y1, seg1y2,
seg2, seg2y1, seg2y2; seg2, seg2y1, seg2y2;
// sweep right // sweep right
outer: for(var i=0; i<segs1.length; ++i) { outer: for(var i=0, len=segs1.length; i<len; ++i) {
seg1 = segs1[i]; seg1 = segs1[i];
seg1x1 = seg1.x1; seg1x1 = seg1.x1;
seg1x2 = seg1.x2; seg1x2 = seg1.x2;
seg1y1 = seg1.y1; seg1y1 = seg1.y1;
seg1y2 = seg1.y2; seg1y2 = seg1.y2;
inner: for(var j=0; j<segs2.length; ++j) { inner: for(var j=0, jlen=segs2.length; j<jlen; ++j) {
seg2 = segs2[j]; seg2 = segs2[j];
if(seg2.x1 > seg1x2) { if(seg2.x1 > seg1x2) {
// seg1 still left of seg2 // seg1 still left of seg2

12
lib/OpenLayers/Geometry/LinearRing.js
View File

@@ -116,7 +116,7 @@ OpenLayers.Geometry.LinearRing = OpenLayers.Class(
* y - {Float} The y-displacement (in map units) * y - {Float} The y-displacement (in map units)
*/ */
move: function(x, y) { move: function(x, y) {
for(var i = 0; i < this.components.length - 1; i++) { for(var i = 0, len=this.components.length; i<len - 1; i++) {
this.components[i].move(x, y); this.components[i].move(x, y);
} }
}, },
@@ -131,7 +131,7 @@ OpenLayers.Geometry.LinearRing = OpenLayers.Class(
* origin - {<OpenLayers.Geometry.Point>} Center point for the rotation * origin - {<OpenLayers.Geometry.Point>} Center point for the rotation
*/ */
rotate: function(angle, origin) { rotate: function(angle, origin) {
for(var i=0; i<this.components.length - 1; ++i) { for(var i=0, len=this.components.length; i<len - 1; ++i) {
this.components[i].rotate(angle, origin); this.components[i].rotate(angle, origin);
} }
}, },
@@ -150,7 +150,7 @@ OpenLayers.Geometry.LinearRing = OpenLayers.Class(
* ratio - {Float} Optional x:y ratio for resizing. Default ratio is 1. * ratio - {Float} Optional x:y ratio for resizing. Default ratio is 1.
*/ */
resize: function(scale, origin, ratio) { resize: function(scale, origin, ratio) {
for(var i=0; i<this.components.length - 1; ++i) { for(var i=0, len=this.components.length; i<len - 1; ++i) {
this.components[i].resize(scale, origin, ratio); this.components[i].resize(scale, origin, ratio);
} }
}, },
@@ -168,7 +168,7 @@ OpenLayers.Geometry.LinearRing = OpenLayers.Class(
*/ */
transform: function(source, dest) { transform: function(source, dest) {
if (source && dest) { if (source && dest) {
for (var i = 0; i < this.components.length - 1; i++) { for (var i=0, len=this.components.length; i<len - 1; i++) {
var component = this.components[i]; var component = this.components[i];
component.transform(source, dest); component.transform(source, dest);
} }
@@ -188,7 +188,7 @@ OpenLayers.Geometry.LinearRing = OpenLayers.Class(
var area = 0.0; var area = 0.0;
if ( this.components && (this.components.length > 2)) { if ( this.components && (this.components.length > 2)) {
var sum = 0.0; var sum = 0.0;
for (var i = 0; i < this.components.length - 1; i++) { for (var i=0, len=this.components.length; i<len - 1; i++) {
var b = this.components[i]; var b = this.components[i];
var c = this.components[i+1]; var c = this.components[i+1];
sum += (b.x + c.x) * (c.y - b.y); sum += (b.x + c.x) * (c.y - b.y);
@@ -309,7 +309,7 @@ OpenLayers.Geometry.LinearRing = OpenLayers.Class(
); );
} else { } else {
// check for component intersections // check for component intersections
for(var i=0; i<geometry.components.length; ++ i) { for(var i=0, len=geometry.components.length; i<len; ++ i) {
intersect = geometry.components[i].intersects(this); intersect = geometry.components[i].intersects(this);
if(intersect) { if(intersect) {
break; break;

12
lib/OpenLayers/Geometry/Polygon.js
View File

@@ -52,7 +52,7 @@ OpenLayers.Geometry.Polygon = OpenLayers.Class(
var area = 0.0; var area = 0.0;
if ( this.components && (this.components.length > 0)) { if ( this.components && (this.components.length > 0)) {
area += Math.abs(this.components[0].getArea()); area += Math.abs(this.components[0].getArea());
for (var i = 1; i < this.components.length; i++) { for (var i=1, len=this.components.length; i<len; i++) {
area -= Math.abs(this.components[i].getArea()); area -= Math.abs(this.components[i].getArea());
} }
} }
@@ -112,13 +112,13 @@ OpenLayers.Geometry.Polygon = OpenLayers.Class(
*/ */
intersects: function(geometry) { intersects: function(geometry) {
var intersect = false; var intersect = false;
var i; var i, len;
if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") { if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
intersect = this.containsPoint(geometry); intersect = this.containsPoint(geometry);
} else if(geometry.CLASS_NAME == "OpenLayers.Geometry.LineString" || } else if(geometry.CLASS_NAME == "OpenLayers.Geometry.LineString" ||
geometry.CLASS_NAME == "OpenLayers.Geometry.LinearRing") { geometry.CLASS_NAME == "OpenLayers.Geometry.LinearRing") {
// check if rings/linestrings intersect // check if rings/linestrings intersect
for(i=0; i<this.components.length; ++i) { for(i=0, len=this.components.length; i<len; ++i) {
intersect = geometry.intersects(this.components[i]); intersect = geometry.intersects(this.components[i]);
if(intersect) { if(intersect) {
break; break;
@@ -126,7 +126,7 @@ OpenLayers.Geometry.Polygon = OpenLayers.Class(
} }
if(!intersect) { if(!intersect) {
// check if this poly contains points of the ring/linestring // check if this poly contains points of the ring/linestring
for(i=0; i<geometry.components.length; ++i) { for(i=0, len=geometry.components.length; i<len; ++i) {
intersect = this.containsPoint(geometry.components[i]); intersect = this.containsPoint(geometry.components[i]);
if(intersect) { if(intersect) {
break; break;
@@ -134,7 +134,7 @@ OpenLayers.Geometry.Polygon = OpenLayers.Class(
} }
} }
} else { } else {
for(i=0; i<geometry.components.length; ++ i) { for(i=0, len=geometry.components.length; i<len; ++ i) {
intersect = this.intersects(geometry.components[i]); intersect = this.intersects(geometry.components[i]);
if(intersect) { if(intersect) {
break; break;
@@ -145,7 +145,7 @@ OpenLayers.Geometry.Polygon = OpenLayers.Class(
if(!intersect && geometry.CLASS_NAME == "OpenLayers.Geometry.Polygon") { if(!intersect && geometry.CLASS_NAME == "OpenLayers.Geometry.Polygon") {
// exterior ring points will be contained in the other geometry // exterior ring points will be contained in the other geometry
var ring = this.components[0]; var ring = this.components[0];
for(i=0; i<ring.components.length; ++i) { for(i=0, len=ring.components.length; i<len; ++i) {
intersect = geometry.containsPoint(ring.components[i]); intersect = geometry.containsPoint(ring.components[i]);
if(intersect) { if(intersect) {
break; break;

4
lib/OpenLayers/Handler.js
View File

@@ -156,7 +156,7 @@ OpenLayers.Handler = OpenLayers.Class({
} }
// register for event handlers defined on this class. // register for event handlers defined on this class.
var events = OpenLayers.Events.prototype.BROWSER_EVENTS; var events = OpenLayers.Events.prototype.BROWSER_EVENTS;
for (var i = 0; i < events.length; i++) { for (var i=0, len=events.length; i<len; i++) {
if (this[events[i]]) { if (this[events[i]]) {
this.register(events[i], this[events[i]]); this.register(events[i], this[events[i]]);
} }
@@ -178,7 +178,7 @@ OpenLayers.Handler = OpenLayers.Class({
} }
// unregister event handlers defined on this class. // unregister event handlers defined on this class.
var events = OpenLayers.Events.prototype.BROWSER_EVENTS; var events = OpenLayers.Events.prototype.BROWSER_EVENTS;
for (var i = 0; i < events.length; i++) { for (var i=0, len=events.length; i<len; i++) {
if (this[events[i]]) { if (this[events[i]]) {
this.unregister(events[i], this[events[i]]); this.unregister(events[i], this[events[i]]);
} }

4
lib/OpenLayers/Handler/Keyboard.js
View File

@@ -70,7 +70,7 @@ OpenLayers.Handler.Keyboard = OpenLayers.Class(OpenLayers.Handler, {
*/ */
activate: function() { activate: function() {
if (OpenLayers.Handler.prototype.activate.apply(this, arguments)) { if (OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
for (var i = 0; i < this.KEY_EVENTS.length; i++) { for (var i=0, len=this.KEY_EVENTS.length; i<len; i++) {
OpenLayers.Event.observe( OpenLayers.Event.observe(
window, this.KEY_EVENTS[i], this.eventListener); window, this.KEY_EVENTS[i], this.eventListener);
} }
@@ -86,7 +86,7 @@ OpenLayers.Handler.Keyboard = OpenLayers.Class(OpenLayers.Handler, {
deactivate: function() { deactivate: function() {
var deactivated = false; var deactivated = false;
if (OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) { if (OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
for (var i = 0; i < this.KEY_EVENTS.length; i++) { for (var i=0, len=this.KEY_EVENTS.length; i<len; i++) {
OpenLayers.Event.stopObserving( OpenLayers.Event.stopObserving(
window, this.KEY_EVENTS[i], this.eventListener); window, this.KEY_EVENTS[i], this.eventListener);
} }

2
lib/OpenLayers/Handler/MouseWheel.js
View File

@@ -103,7 +103,7 @@ OpenLayers.Handler.MouseWheel = OpenLayers.Class(OpenLayers.Handler, {
} }
if (!overLayerDiv) { if (!overLayerDiv) {
for(var i=0; i < this.map.layers.length; i++) { for(var i=0, len=this.map.layers.length; i<len; i++) {
// Are we in the layer div? Note that we have two cases // Are we in the layer div? Note that we have two cases
// here: one is to catch EventPane layers, which have a // here: one is to catch EventPane layers, which have a
// pane above the layer (layer.pane) // pane above the layer (layer.pane)

12
lib/OpenLayers/Layer.js
View File

@@ -682,7 +682,7 @@ OpenLayers.Layer = OpenLayers.Class({
// 'options' array or from the map. // 'options' array or from the map.
// //
var confProps = {}; var confProps = {};
for(var i=0; i < props.length; i++) { for(var i=0, len=props.length; i<len; i++) {
var property = props[i]; var property = props[i];
confProps[property] = this.options[property] || this.map[property]; confProps[property] = this.options[property] || this.map[property];
} }
@@ -715,7 +715,7 @@ OpenLayers.Layer = OpenLayers.Class({
//preset levels //preset levels
if (confProps.scales != null) { if (confProps.scales != null) {
confProps.resolutions = []; confProps.resolutions = [];
for(var i = 0; i < confProps.scales.length; i++) { for(var i=0, len=confProps.scales.length; i<len; i++) {
var scale = confProps.scales[i]; var scale = confProps.scales[i];
confProps.resolutions[i] = confProps.resolutions[i] =
OpenLayers.Util.getResolutionFromScale(scale, OpenLayers.Util.getResolutionFromScale(scale,
@@ -801,7 +801,7 @@ OpenLayers.Layer = OpenLayers.Class({
this.minResolution = confProps.resolutions[lastIndex]; this.minResolution = confProps.resolutions[lastIndex];
this.scales = []; this.scales = [];
for(var i = 0; i < confProps.resolutions.length; i++) { for(var i=0, len=confProps.resolutions.length; i<len; i++) {
this.scales[i] = this.scales[i] =
OpenLayers.Util.getScaleFromResolution(confProps.resolutions[i], OpenLayers.Util.getScaleFromResolution(confProps.resolutions[i],
confProps.units); confProps.units);
@@ -924,7 +924,7 @@ OpenLayers.Layer = OpenLayers.Class({
var highRes = this.resolutions[lowZoom]; var highRes = this.resolutions[lowZoom];
var lowRes = this.resolutions[highZoom]; var lowRes = this.resolutions[highZoom];
var res; var res;
for(var i=0; i<this.resolutions.length; ++i) { for(var i=0, len=this.resolutions.length; i<len; ++i) {
res = this.resolutions[i]; res = this.resolutions[i];
if(res >= resolution) { if(res >= resolution) {
highRes = res; highRes = res;
@@ -945,7 +945,7 @@ OpenLayers.Layer = OpenLayers.Class({
} else { } else {
var diff; var diff;
var minDiff = Number.POSITIVE_INFINITY; var minDiff = Number.POSITIVE_INFINITY;
for(var i=0; i < this.resolutions.length; i++) { for(var i=0, len=this.resolutions.length; i<len; i++) {
if (closest) { if (closest) {
diff = Math.abs(this.resolutions[i] - resolution); diff = Math.abs(this.resolutions[i] - resolution);
if (diff > minDiff) { if (diff > minDiff) {
@@ -1030,7 +1030,7 @@ OpenLayers.Layer = OpenLayers.Class({
setOpacity: function(opacity) { setOpacity: function(opacity) {
if (opacity != this.opacity) { if (opacity != this.opacity) {
this.opacity = opacity; this.opacity = opacity;
for(var i=0; i<this.div.childNodes.length; ++i) { for(var i=0, len=this.div.childNodes.length; i<len; ++i) {
var element = this.div.childNodes[i].firstChild; var element = this.div.childNodes[i].firstChild;
OpenLayers.Util.modifyDOMElement(element, null, null, null, OpenLayers.Util.modifyDOMElement(element, null, null, null,
null, null, null, opacity); null, null, null, opacity);

2
lib/OpenLayers/Layer/FixedZoomLevels.js
View File

@@ -78,7 +78,7 @@ OpenLayers.Layer.FixedZoomLevels = OpenLayers.Class({
var props = new Array('minZoomLevel', 'maxZoomLevel', 'numZoomLevels'); var props = new Array('minZoomLevel', 'maxZoomLevel', 'numZoomLevels');
for(var i=0; i < props.length; i++) { for(var i=0, len=props.length; i<len; i++) {
var property = props[i]; var property = props[i];
this[property] = (this.options[property] != null) this[property] = (this.options[property] != null)
? this.options[property] ? this.options[property]

6
lib/OpenLayers/Layer/GeoRSS.js
View File

@@ -163,7 +163,7 @@ OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
var format = new OpenLayers.Format.GeoRSS(options); var format = new OpenLayers.Format.GeoRSS(options);
var features = format.read(doc); var features = format.read(doc);
for (var i = 0; i < features.length; i++) { for (var i=0, len=features.length; i<len; i++) {
var data = {}; var data = {};
var feature = features[i]; var feature = features[i];
@@ -230,14 +230,14 @@ OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
markerClick: function(evt) { markerClick: function(evt) {
var sameMarkerClicked = (this == this.layer.selectedFeature); var sameMarkerClicked = (this == this.layer.selectedFeature);
this.layer.selectedFeature = (!sameMarkerClicked) ? this : null; this.layer.selectedFeature = (!sameMarkerClicked) ? this : null;
for(var i=0; i < this.layer.map.popups.length; i++) { for(var i=0, len=this.layer.map.popups.length; i<len; i++) {
this.layer.map.removePopup(this.layer.map.popups[i]); this.layer.map.removePopup(this.layer.map.popups[i]);
} }
if (!sameMarkerClicked) { if (!sameMarkerClicked) {
var popup = this.createPopup(); var popup = this.createPopup();
OpenLayers.Event.observe(popup.div, "click", OpenLayers.Event.observe(popup.div, "click",
OpenLayers.Function.bind(function() { OpenLayers.Function.bind(function() {
for(var i=0; i < this.layer.map.popups.length; i++) { for(var i=0, len=this.layer.map.popups.length; i<len; i++) {
this.layer.map.removePopup(this.layer.map.popups[i]); this.layer.map.removePopup(this.layer.map.popups[i]);
} }
}, this) }, this)

10
lib/OpenLayers/Layer/Grid.js
View File

@@ -101,9 +101,9 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
*/ */
clearGrid:function() { clearGrid:function() {
if (this.grid) { if (this.grid) {
for(var iRow=0; iRow < this.grid.length; iRow++) { for(var iRow=0, len=this.grid.length; iRow<len; iRow++) {
var row = this.grid[iRow]; var row = this.grid[iRow];
for(var iCol=0; iCol < row.length; iCol++) { for(var iCol=0, clen=row.length; iCol<clen; iCol++) {
var tile = row[iCol]; var tile = row[iCol];
this.removeTileMonitoringHooks(tile); this.removeTileMonitoringHooks(tile);
tile.destroy(); tile.destroy();
@@ -494,7 +494,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
} }
// now we go through and draw the tiles in forward order // now we go through and draw the tiles in forward order
for(var i=0; i < tileQueue.length; i++) { for(var i=0, len=tileQueue.length; i<len; i++) {
var tile = tileQueue[i]; var tile = tileQueue[i];
tile.draw(); tile.draw();
//mark tile as unqueued for the next time (since tiles are reused) //mark tile as unqueued for the next time (since tiles are reused)
@@ -613,7 +613,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
var row = (prepend) ? grid.pop() : grid.shift(); var row = (prepend) ? grid.pop() : grid.shift();
for (var i=0; i < modelRow.length; i++) { for (var i=0, len=modelRow.length; i<len; i++) {
var modelTile = modelRow[i]; var modelTile = modelRow[i];
var bounds = modelTile.bounds.clone(); var bounds = modelTile.bounds.clone();
var position = modelTile.position.clone(); var position = modelTile.position.clone();
@@ -643,7 +643,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
var resolution = this.map.getResolution(); var resolution = this.map.getResolution();
var deltaLon = resolution * deltaX; var deltaLon = resolution * deltaX;
for (var i=0; i<this.grid.length; i++) { for (var i=0, len=this.grid.length; i<len; i++) {
var row = this.grid[i]; var row = this.grid[i];
var modelTileIndex = (prepend) ? 0 : (row.length - 1); var modelTileIndex = (prepend) ? 0 : (row.length - 1);
var modelTile = row[modelTileIndex]; var modelTile = row[modelTileIndex];

2
lib/OpenLayers/Layer/HTTPRequest.js
View File

@@ -160,7 +160,7 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
*/ */
selectUrl: function(paramString, urls) { selectUrl: function(paramString, urls) {
var product = 1; var product = 1;
for (var i = 0; i < paramString.length; i++) { for (var i=0, len=paramString.length; i<len; i++) {
product *= paramString.charCodeAt(i) * this.URL_HASH_FACTOR; product *= paramString.charCodeAt(i) * this.URL_HASH_FACTOR;
product -= Math.floor(product); product -= Math.floor(product);
} }

6
lib/OpenLayers/Layer/Markers.js
View File

@@ -69,7 +69,7 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
setOpacity: function(opacity) { setOpacity: function(opacity) {
if (opacity != this.opacity) { if (opacity != this.opacity) {
this.opacity = opacity; this.opacity = opacity;
for (var i = 0; i < this.markers.length; i++) { for (var i=0, len=this.markers.length; i<len; i++) {
this.markers[i].setOpacity(this.opacity); this.markers[i].setOpacity(this.opacity);
} }
} }
@@ -87,7 +87,7 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
OpenLayers.Layer.prototype.moveTo.apply(this, arguments); OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
if (zoomChanged || !this.drawn) { if (zoomChanged || !this.drawn) {
for(var i=0; i < this.markers.length; i++) { for(var i=0, len=this.markers.length; i<len; i++) {
this.drawMarker(this.markers[i]); this.drawMarker(this.markers[i]);
} }
this.drawn = true; this.drawn = true;
@@ -176,7 +176,7 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
if ( this.markers && (this.markers.length > 0)) { if ( this.markers && (this.markers.length > 0)) {
var maxExtent = new OpenLayers.Bounds(); var maxExtent = new OpenLayers.Bounds();
for(var i=0; i < this.markers.length; i++) { for(var i=0, len=this.markers.length; i<len; i++) {
var marker = this.markers[i]; var marker = this.markers[i];
maxExtent.extend(marker.lonlat); maxExtent.extend(marker.lonlat);
} }

2
lib/OpenLayers/Layer/PointTrack.js
View File

@@ -58,7 +58,7 @@ OpenLayers.Layer.PointTrack = OpenLayers.Class(OpenLayers.Layer.Vector, {
var lines = new Array(pointFeatures.length-1); var lines = new Array(pointFeatures.length-1);
var pointFeature, startPoint, endPoint; var pointFeature, startPoint, endPoint;
for(var i = 0; i < pointFeatures.length; i++) { for(var i=0, len=pointFeatures.length; i<len; i++) {
pointFeature = pointFeatures[i]; pointFeature = pointFeatures[i];
endPoint = pointFeature.geometry; endPoint = pointFeature.geometry;

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

@@ -157,7 +157,7 @@ OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
var parser = new OpenLayers.Format.Text(options); var parser = new OpenLayers.Format.Text(options);
features = parser.read(text); features = parser.read(text);
for (var i = 0; i < features.length; i++) { for (var i=0, len=features.length; i<len; i++) {
var data = {}; var data = {};
var feature = features[i]; var feature = features[i];
var location; var location;
@@ -237,7 +237,7 @@ OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
markerClick: function(evt) { markerClick: function(evt) {
var sameMarkerClicked = (this == this.layer.selectedFeature); var sameMarkerClicked = (this == this.layer.selectedFeature);
this.layer.selectedFeature = (!sameMarkerClicked) ? this : null; this.layer.selectedFeature = (!sameMarkerClicked) ? this : null;
for(var i=0; i < this.layer.map.popups.length; i++) { for(var i=0, len=this.layer.map.popups.length; i<len; i++) {
this.layer.map.removePopup(this.layer.map.popups[i]); this.layer.map.removePopup(this.layer.map.popups[i]);
} }
if (!sameMarkerClicked) { if (!sameMarkerClicked) {

13
lib/OpenLayers/Layer/Vector.js
View File

@@ -219,7 +219,7 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
* and assigns the first one whose "supported()" function returns true. * and assigns the first one whose "supported()" function returns true.
*/ */
assignRenderer: function() { assignRenderer: function() {
for (var i = 0; i < this.renderers.length; i++) { for (var i=0, len=this.renderers.length; i<this.renderers.length; i++) {
var rendererClass = OpenLayers.Renderer[this.renderers[i]]; var rendererClass = OpenLayers.Renderer[this.renderers[i]];
if (rendererClass && rendererClass.prototype.supported()) { if (rendererClass && rendererClass.prototype.supported()) {
this.renderer = new rendererClass(this.div); this.renderer = new rendererClass(this.div);
@@ -308,9 +308,8 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
if (!this.drawn || zoomChanged) { if (!this.drawn || zoomChanged) {
this.drawn = true; this.drawn = true;
for(var i = 0; i < this.features.length; i++) { for(var i=0, len=this.features.length; i<len; i++) {
var feature = this.features[i]; this.drawFeature(this.features[i]);
this.drawFeature(feature);
} }
} }
}, },
@@ -330,7 +329,7 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
var notify = !options || !options.silent; var notify = !options || !options.silent;
for (var i = 0; i < features.length; i++) { for (var i=0, len=features.length; i<len; i++) {
var feature = features[i]; var feature = features[i];
if (this.geometryType && if (this.geometryType &&
@@ -517,7 +516,7 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
getFeatureById: function(featureId) { getFeatureById: function(featureId) {
//TBD - would it be more efficient to use a hash for this.features? //TBD - would it be more efficient to use a hash for this.features?
var feature = null; var feature = null;
for(var i=0; i<this.features.length; ++i) { for(var i=0, len=this.features.length; i<len; ++i) {
if(this.features[i].id == featureId) { if(this.features[i].id == featureId) {
feature = this.features[i]; feature = this.features[i];
break; break;
@@ -578,7 +577,7 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
var maxExtent = null; var maxExtent = null;
if( this.features && (this.features.length > 0)){ if( this.features && (this.features.length > 0)){
var maxExtent = this.features[0].geometry.getBounds(); var maxExtent = this.features[0].geometry.getBounds();
for(var i=0; i < this.features.length; i++){ for(var i=0, len=this.features.length; i<len; i++){
maxExtent.extend(this.features[i].geometry.getBounds()); maxExtent.extend(this.features[i].geometry.getBounds());
} }
} }

24
lib/OpenLayers/Map.js
View File

@@ -456,7 +456,7 @@ OpenLayers.Map = OpenLayers.Class({
// check existing links for equivalent url // check existing links for equivalent url
var addNode = true; var addNode = true;
var nodes = document.getElementsByTagName('link'); var nodes = document.getElementsByTagName('link');
for(var i=0; i<nodes.length; ++i) { for(var i=0, len=nodes.length; i<len; ++i) {
if(OpenLayers.Util.isEquivalentUrl(nodes.item(i).href, if(OpenLayers.Util.isEquivalentUrl(nodes.item(i).href,
this.theme)) { this.theme)) {
addNode = false; addNode = false;
@@ -488,7 +488,7 @@ OpenLayers.Map = OpenLayers.Class({
} }
} }
for(var i=0; i < this.controls.length; i++) { for(var i=0, len=this.controls.length; i<len; i++) {
this.addControlToMap(this.controls[i]); this.addControlToMap(this.controls[i]);
} }
@@ -741,7 +741,7 @@ OpenLayers.Map = OpenLayers.Class({
*/ */
getLayer: function(id) { getLayer: function(id) {
var foundLayer = null; var foundLayer = null;
for (var i = 0; i < this.layers.length; i++) { for (var i=0, len=this.layers.length; i<len; i++) {
var layer = this.layers[i]; var layer = this.layers[i];
if (layer.id == id) { if (layer.id == id) {
foundLayer = layer; foundLayer = layer;
@@ -769,7 +769,7 @@ OpenLayers.Map = OpenLayers.Class({
* Reset each layer's z-index based on layer's array index * Reset each layer's z-index based on layer's array index
*/ */
resetLayersZIndex: function() { resetLayersZIndex: function() {
for (var i = 0; i < this.layers.length; i++) { for (var i=0, len=this.layers.length; i<len; i++) {
var layer = this.layers[i]; var layer = this.layers[i];
this.setLayerZIndex(layer, i); this.setLayerZIndex(layer, i);
} }
@@ -782,7 +782,7 @@ OpenLayers.Map = OpenLayers.Class({
* layer - {<OpenLayers.Layer>} * layer - {<OpenLayers.Layer>}
*/ */
addLayer: function (layer) { addLayer: function (layer) {
for(var i=0; i < this.layers.length; i++) { for(var i=0, len=this.layers.length; i <len; i++) {
if (this.layers[i] == layer) { if (this.layers[i] == layer) {
var msg = OpenLayers.i18n('layerAlreadyAdded', var msg = OpenLayers.i18n('layerAlreadyAdded',
{'layerName':layer.name}); {'layerName':layer.name});
@@ -826,7 +826,7 @@ OpenLayers.Map = OpenLayers.Class({
* layers - {Array(<OpenLayers.Layer>)} * layers - {Array(<OpenLayers.Layer>)}
*/ */
addLayers: function (layers) { addLayers: function (layers) {
for (var i = 0; i < layers.length; i++) { for (var i=0, len=layers.length; i<len; i++) {
this.addLayer(layers[i]); this.addLayer(layers[i]);
} }
}, },
@@ -877,7 +877,7 @@ OpenLayers.Map = OpenLayers.Class({
if(this.baseLayer == layer) { if(this.baseLayer == layer) {
this.baseLayer = null; this.baseLayer = null;
if(setNewBaseLayer) { if(setNewBaseLayer) {
for(var i=0; i < this.layers.length; i++) { for(var i=0, len=this.layers.length; i<len; i++) {
var iLayer = this.layers[i]; var iLayer = this.layers[i];
if (iLayer.isBaseLayer) { if (iLayer.isBaseLayer) {
this.setBaseLayer(iLayer); this.setBaseLayer(iLayer);
@@ -938,7 +938,7 @@ OpenLayers.Map = OpenLayers.Class({
if (base != idx) { if (base != idx) {
this.layers.splice(base, 1); this.layers.splice(base, 1);
this.layers.splice(idx, 0, layer); this.layers.splice(idx, 0, layer);
for (var i = 0; i < this.layers.length; i++) { for (var i=0, len=this.layers.length; i<len; i++) {
this.setLayerZIndex(this.layers[i], i); this.setLayerZIndex(this.layers[i], i);
} }
this.events.triggerEvent("changelayer", { this.events.triggerEvent("changelayer", {
@@ -1088,7 +1088,7 @@ OpenLayers.Map = OpenLayers.Class({
*/ */
getControl: function (id) { getControl: function (id) {
var returnControl = null; var returnControl = null;
for(var i=0; i < this.controls.length; i++) { for(var i=0, len=this.controls.length; i<len; i++) {
var control = this.controls[i]; var control = this.controls[i];
if (control.id == id) { if (control.id == id) {
returnControl = control; returnControl = control;
@@ -1215,7 +1215,7 @@ OpenLayers.Map = OpenLayers.Class({
this.size = newSize; this.size = newSize;
//notify layers of mapresize //notify layers of mapresize
for(var i=0; i < this.layers.length; i++) { for(var i=0, len=this.layers.length; i<len; i++) {
this.layers[i].onMapResize(); this.layers[i].onMapResize();
} }
@@ -1541,7 +1541,7 @@ OpenLayers.Map = OpenLayers.Class({
bounds = this.baseLayer.getExtent(); bounds = this.baseLayer.getExtent();
for (var i = 0; i < this.layers.length; i++) { for (var i=0, len=this.layers.length; i<len; i++) {
var layer = this.layers[i]; var layer = this.layers[i];
if (!layer.isBaseLayer) { if (!layer.isBaseLayer) {
var inRange = layer.calculateInRange(); var inRange = layer.calculateInRange();
@@ -1566,7 +1566,7 @@ OpenLayers.Map = OpenLayers.Class({
if (zoomChanged) { if (zoomChanged) {
//redraw popups //redraw popups
for (var i = 0; i < this.popups.length; i++) { for (var i=0, len=this.popups.length; i<len; i++) {
this.popups[i].updatePosition(); this.popups[i].updatePosition();
} }
} }

2
lib/OpenLayers/Renderer.js
View File

@@ -194,7 +194,7 @@ OpenLayers.Renderer = OpenLayers.Class({
if(!(features instanceof Array)) { if(!(features instanceof Array)) {
features = [features]; features = [features];
} }
for(var i=0; i<features.length; ++i) { for(var i=0, len=features.length; i<len; ++i) {
this.eraseGeometry(features[i].geometry); this.eraseGeometry(features[i].geometry);
} }
}, },

4
lib/OpenLayers/Renderer/Elements.js
View File

@@ -129,7 +129,7 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
(className == "OpenLayers.Geometry.MultiPoint") || (className == "OpenLayers.Geometry.MultiPoint") ||
(className == "OpenLayers.Geometry.MultiLineString") || (className == "OpenLayers.Geometry.MultiLineString") ||
(className == "OpenLayers.Geometry.MultiPolygon")) { (className == "OpenLayers.Geometry.MultiPolygon")) {
for (var i = 0; i < geometry.components.length; i++) { for (var i = 0, len=geometry.components.length; i<len; i++) {
this.drawGeometry(geometry.components[i], style, featureId); this.drawGeometry(geometry.components[i], style, featureId);
} }
return; return;
@@ -334,7 +334,7 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
(geometry.CLASS_NAME == "OpenLayers.Geometry.MultiLineString") || (geometry.CLASS_NAME == "OpenLayers.Geometry.MultiLineString") ||
(geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPolygon") || (geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPolygon") ||
(geometry.CLASS_NAME == "OpenLayers.Geometry.Collection")) { (geometry.CLASS_NAME == "OpenLayers.Geometry.Collection")) {
for (var i = 0; i < geometry.components.length; i++) { for (var i=0, len=geometry.components.length; i<len; i++) {
this.eraseGeometry(geometry.components[i]); this.eraseGeometry(geometry.components[i]);
} }
} else { } else {

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

@@ -389,10 +389,10 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
drawPolygon: function(node, geometry) { drawPolygon: function(node, geometry) {
var d = ""; var d = "";
var draw = true; var draw = true;
for (var j = 0; j < geometry.components.length; j++) { for (var j=0, len=geometry.components.length; j<len; j++) {
var linearRing = geometry.components[j]; var linearRing = geometry.components[j];
d += " M"; d += " M";
for (var i = 0; i < linearRing.components.length; i++) { for (var i=0, ilen=linearRing.components.length; i<ilen; i++) {
var component = this.getShortString(linearRing.components[i]); var component = this.getShortString(linearRing.components[i]);
if (component) { if (component) {
d += " " + component; d += " " + component;
@@ -449,7 +449,7 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
// create the svg path string representation // create the svg path string representation
var d = null; var d = null;
var draw = true; var draw = true;
for (var i = 0; i < geometry.components.length; i++) { for (var i=0, len=geometry.components.length; i<len; i++) {
if ((i%3) == 0 && (i/3) == 0) { if ((i%3) == 0 && (i/3) == 0) {
var component = this.getShortString(geometry.components[i]); var component = this.getShortString(geometry.components[i]);
if (!component) { draw = false; } if (!component) { draw = false; }
@@ -480,7 +480,7 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
*/ */
getComponentsString: function(components) { getComponentsString: function(components) {
var strings = []; var strings = [];
for(var i = 0; i < components.length; i++) { for(var i=0, len=components.length; i<len; i++) {
var component = this.getShortString(components[i]); var component = this.getShortString(components[i]);
if (component) { if (component) {
strings.push(component); strings.push(component);

8
lib/OpenLayers/Renderer/VML.js
View File

@@ -627,12 +627,12 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
var resolution = this.getResolution(); var resolution = this.getResolution();
var path = []; var path = [];
var linearRing, i, comp, x, y; var linearRing, i, j, len, ilen, comp, x, y;
for (var j = 0; j < geometry.components.length; j++) { for (j = 0, len=geometry.components.length; j<len; j++) {
linearRing = geometry.components[j]; linearRing = geometry.components[j];
path.push("m"); path.push("m");
for (i = 0; i < linearRing.components.length; i++) { for (i=0, ilen=linearRing.components.length; i<ilen; i++) {
comp = linearRing.components[i]; comp = linearRing.components[i];
x = comp.x / resolution; x = comp.x / resolution;
y = comp.y / resolution; y = comp.y / resolution;
@@ -679,7 +679,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
var path = []; var path = [];
var comp, x, y; var comp, x, y;
for (var i = 0; i < geometry.components.length; i++) { for (var i=0, len=geometry.components.length; i<len; i++) {
comp = geometry.components[i]; comp = geometry.components[i];
x = comp.x / resolution; x = comp.x / resolution;
y = comp.y / resolution; y = comp.y / resolution;

10
lib/OpenLayers/Style.js
View File

@@ -107,7 +107,7 @@ OpenLayers.Style = OpenLayers.Class({
* nullify references to prevent circular references and memory leaks * nullify references to prevent circular references and memory leaks
*/ */
destroy: function() { destroy: function() {
for (var i=0; i<this.rules.length; i++) { for (var i=0, len=this.rules.length; i<len; i++) {
this.rules[i].destroy(); this.rules[i].destroy();
this.rules[i] = null; this.rules[i] = null;
} }
@@ -135,7 +135,7 @@ OpenLayers.Style = OpenLayers.Class({
var rule, context; var rule, context;
var elseRules = []; var elseRules = [];
var appliedRules = false; var appliedRules = false;
for(var i=0; i<rules.length; i++) { for(var i=0, len=rules.length; i<len; i++) {
rule = rules[i]; rule = rules[i];
// does the rule apply? // does the rule apply?
var applies = rule.evaluate(feature); var applies = rule.evaluate(feature);
@@ -153,7 +153,7 @@ OpenLayers.Style = OpenLayers.Class({
// if no other rules apply, apply the rules with else filters // if no other rules apply, apply the rules with else filters
if(appliedRules == false && elseRules.length > 0) { if(appliedRules == false && elseRules.length > 0) {
appliedRules = true; appliedRules = true;
for(var i=0; i<elseRules.length; i++) { for(var i=0, len=elseRules.length; i<len; i++) {
this.applySymbolizer(elseRules[i], style, feature); this.applySymbolizer(elseRules[i], style, feature);
} }
} }
@@ -233,7 +233,7 @@ OpenLayers.Style = OpenLayers.Class({
// walk through all rules to check for properties in their symbolizer // walk through all rules to check for properties in their symbolizer
var rules = this.rules; var rules = this.rules;
var symbolizer, value; var symbolizer, value;
for (var i=0; i<rules.length; i++) { for (var i=0, len=rules.length; i<len; i++) {
var symbolizer = rules[i].symbolizer; var symbolizer = rules[i].symbolizer;
for (var key in symbolizer) { for (var key in symbolizer) {
value = symbolizer[key]; value = symbolizer[key];
@@ -310,7 +310,7 @@ OpenLayers.Style = OpenLayers.Class({
*/ */
getSymbolizerPrefix: function(geometry) { getSymbolizerPrefix: function(geometry) {
var prefixes = OpenLayers.Style.SYMBOLIZER_PREFIXES; var prefixes = OpenLayers.Style.SYMBOLIZER_PREFIXES;
for (var i=0; i<prefixes.length; i++) { for (var i=0, len=prefixes.length; i<len; i++) {
if (geometry.CLASS_NAME.indexOf(prefixes[i]) != -1) { if (geometry.CLASS_NAME.indexOf(prefixes[i]) != -1) {
return prefixes[i]; return prefixes[i];
} }

14
lib/OpenLayers/Util.js
View File

@@ -15,7 +15,7 @@ OpenLayers.Util = {};
OpenLayers.Util.getElement = function() { OpenLayers.Util.getElement = function() {
var elements = []; var elements = [];
for (var i = 0; i < arguments.length; i++) { for (var i=0, len=arguments.length; i<len; i++) {
var element = arguments[i]; var element = arguments[i];
if (typeof element == 'string') { if (typeof element == 'string') {
element = document.getElementById(element); element = document.getElementById(element);
@@ -135,7 +135,7 @@ OpenLayers.Util.clearArray = function(array) {
*/ */
OpenLayers.Util.indexOf = function(array, obj) { OpenLayers.Util.indexOf = function(array, obj) {
for(var i=0; i < array.length; i++) { for(var i=0, len=array.length; i<len; i++) {
if (array[i] == obj) { if (array[i] == obj) {
return i; return i;
} }
@@ -595,7 +595,7 @@ OpenLayers.Util.getParameterString = function(params) {
if (typeof value == 'object' && value.constructor == Array) { if (typeof value == 'object' && value.constructor == Array) {
/* value is an array; encode items and separate with "," */ /* value is an array; encode items and separate with "," */
var encodedItemArray = []; var encodedItemArray = [];
for (var itemIndex=0; itemIndex<value.length; itemIndex++) { for (var itemIndex=0, len=value.length; itemIndex<len; itemIndex++) {
encodedItemArray.push(encodeURIComponent(value[itemIndex])); encodedItemArray.push(encodeURIComponent(value[itemIndex]));
} }
encodedValue = encodedItemArray.join(","); encodedValue = encodedItemArray.join(",");
@@ -646,7 +646,7 @@ OpenLayers.Util.getImagesLocation = function() {
OpenLayers.Util.Try = function() { OpenLayers.Util.Try = function() {
var returnValue = null; var returnValue = null;
for (var i = 0; i < arguments.length; i++) { for (var i=0, len=arguments.length; i<len; i++) {
var lambda = arguments[i]; var lambda = arguments[i];
try { try {
returnValue = lambda(); returnValue = lambda();
@@ -695,7 +695,7 @@ OpenLayers.Util.getNodes=function(p, tagName) {
*/ */
OpenLayers.Util._getNodes=function(nodes, tagName) { OpenLayers.Util._getNodes=function(nodes, tagName) {
var retArray = []; var retArray = [];
for (var i=0;i<nodes.length;i++) { for (var i=0, len=nodes.length; i<len; i++) {
if (nodes[i].nodeName==tagName) { if (nodes[i].nodeName==tagName) {
retArray.push(nodes[i]); retArray.push(nodes[i]);
} }
@@ -871,7 +871,7 @@ OpenLayers.Util.getParameters = function(url) {
var parameters = {}; var parameters = {};
var pairs = paramsString.split(/[&;]/); var pairs = paramsString.split(/[&;]/);
for(var i = 0; i < pairs.length; ++i) { for(var i=0, len=pairs.length; i<len; ++i) {
var keyValue = pairs[i].split('='); var keyValue = pairs[i].split('=');
if (keyValue[0]) { if (keyValue[0]) {
var key = decodeURIComponent(keyValue[0]); var key = decodeURIComponent(keyValue[0]);
@@ -879,7 +879,7 @@ OpenLayers.Util.getParameters = function(url) {
//decode individual values //decode individual values
value = value.split(","); value = value.split(",");
for(var j=0; j < value.length; j++) { for(var j=0, jlen=value.length; j<jlen; j++) {
value[j] = decodeURIComponent(value[j]); value[j] = decodeURIComponent(value[j]);
} }