Mercurial > hg > batmud > gmap2

changeset 108:2da133cb76d6 gmap2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 07 May 2013 21:20:31 +0300
parents f7710a39f6c8
children 9e0b9c708a9d
files markers.js
diffstat 1 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/markers.js	Tue May 07 21:18:32 2013 +0300
+++ b/markers.js	Tue May 07 21:20:31 2013 +0300
@@ -46,16 +46,16 @@
   var xml = GXml.parse(data);
   var markers = xml.documentElement.getElementsByTagName("marker");
 
-  for (var j = 0; j < markers.length; j++)
+  for (var nid = 0; nid < markers.length; nid++)
   {
-    var name = markers[j].getAttribute("name");
-    var html = markers[j].getAttribute("html");
-    var x = markers[j].getAttribute("x");
-    var y = markers[j].getAttribute("y");
-    var type = markers[j].getAttribute("type");
+    var name = markers[nid].getAttribute("name");
+    var html = markers[nid].getAttribute("html");
+    var x = markers[nid].getAttribute("x");
+    var y = markers[nid].getAttribute("y");
+    var type = markers[nid].getAttribute("type");
     if (type == "") type = "default";
     if (name.indexOf('FERRY') == 0) type = "ferry";
-    var continent = markers[j].getAttribute("continent");
+    var continent = markers[nid].getAttribute("continent");
     var p = proj.fromPixelToLatLng(new GPoint(x*2+1,y*2+1),7);
     var marker = createMarker(p, name, html, icons[type], type, continent, "builtin");
     if (areas[type] == undefined) areas[type] = [];
@@ -81,15 +81,15 @@
   var xml = GXml.parse(data);
   var markers = xml.documentElement.getElementsByTagName("marker");
 
-  for (var j = 0; j < markers.length; j++)
+  for (var id = 0; id < markers.length; id++)
   {
-    var name = markers[j].getAttribute("name");
-    var html = markers[j].getAttribute("html");
-    var x = markers[j].getAttribute("x");
-    var y = markers[j].getAttribute("y");
-    var type = markers[j].getAttribute("type");
+    var name = markers[id].getAttribute("name");
+    var html = markers[id].getAttribute("html");
+    var x = markers[id].getAttribute("x");
+    var y = markers[id].getAttribute("y");
+    var type = markers[id].getAttribute("type");
     if (type == "") type = "default";
-    var continent = markers[j].getAttribute("continent");
+    var continent = markers[id].getAttribute("continent");
     var p = proj.fromPixelToLatLng(new GPoint(x*2+1,y*2+1),7);
     var marker = createMarker(p, name, html, icons[type], type, continent, "tradelane");
     if (areas[type] == undefined) areas[type] = [];
@@ -109,17 +109,17 @@
   var lines = xml.documentElement.getElementsByTagName("line");
 
   // Go through array of line elements
-  for (var j = 0; j < lines.length; j++)
+  for (var nid = 0; nid < lines.length; nid++)
   {
     var coords = [];
-    var points = lines[j].getElementsByTagName("point");
+    var points = lines[nid].getElementsByTagName("point");
 
     // Create polyline points
-    for (var i = 0; i < points.length; i++)
+    for (var npt = 0; npt < points.length; npt++)
     {
-      var x = points[i].getAttribute("x");
-      var y = points[i].getAttribute("y");
-      coords.push(proj.fromPixelToLatLng(new GPoint(x*2+1, y*2+1), 7));
+      var x = points[npt].getAttribute("x");
+      var y = points[npt].getAttribute("y");
+      coords.push(proj.fromPixelToLatLng(new GPoint(x*2 + 1, y*2 + 1), 7));
     }
 
     // Create new polyline and add it to map overlay