Mercurial > hg > batmud > gmap2

changeset 46:905ff7d86a1f gmap2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author ccr@tnsp.org
date Sat, 08 Jan 2011 21:14:07 +0200
parents 2dd1b89b5080
children 5a5d8bbbcc67
files css/mapstyle1.css markers.js
diffstat 2 files changed, 17 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/css/mapstyle1.css	Sat Jan 08 20:59:55 2011 +0200
+++ b/css/mapstyle1.css	Sat Jan 08 21:14:07 2011 +0200
@@ -154,4 +154,4 @@
 	text-decoration: none;
 	color: black;
 	padding: 6px;
-}
\ No newline at end of file
+}
--- a/markers.js	Sat Jan 08 20:59:55 2011 +0200
+++ b/markers.js	Sat Jan 08 21:14:07 2011 +0200
@@ -8,7 +8,6 @@
 var builtin_type = [];
 var builtin_cont = [];
 var side_builtin_html = "";
-var continents = ['Laenor', 'Lucentium', 'Furnachia', 'Desolathya', 'Rothikgen'];
 
 function myclick(i) {
   b = gmarkers[i];
@@ -24,7 +23,7 @@
   if (sidebar == "builtin") { 
     builtin_type[bi] = type;
     builtin_cont[bi] = continent;
-    side_builtin_html += '<span id="marker'+bi+'"><a href="javascript:myclick(' + mi + ')">' + name + '</a><br></span>';
+    side_builtin_html += '<div class="'+continent+'" id="marker'+bi+'"><a href="javascript:myclick(' + mi + ')">' + name + '</a></div>';
     bi++;
   }
   if (sidebar == "private") side_private_html += '<a href="javascript:myclick(' + mi + ')">' + name + '</a><br>';
@@ -37,20 +36,22 @@
 GDownloadUrl("markers.xml", function(data,responseCode) {
   var xml = GXml.parse(data);
   var markers = xml.documentElement.getElementsByTagName("marker");
-  for (var j = 0; j< markers.length; j++) {
+
+  for (var j = 0; j < markers.length; j++) {
     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");
-    if (type=="") type="default";
-    if (name.indexOf('FERRY')==0) type="ferry";
+    if (type == "") type = "default";
+    if (name.indexOf('FERRY') == 0) type = "ferry";
     var continent=markers[j].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]=[];
+    var marker = createMarker(p, name, html, icons[type], type, continent, "builtin");
+    if (areas[type] == undefined) areas[type] = [];
     areas[type].push(marker);    
   }
+
   mgr.addMarkers(areas["default"],7,11);
   mgr.addMarkers(areas["pcity"],7,11);
   mgr.addMarkers(areas["guild"],6,11);
@@ -60,25 +61,27 @@
   mgr.addMarkers(areas["fort"],4,11);
   mgr.refresh();
 
-  document.getElementById("sidecontent").innerHTML=side_builtin_html;
+  document.getElementById("sidecontent").innerHTML = side_builtin_html;
 });
 
 GDownloadUrl("tradelane.xml", function(data,responseCode) {
   var xml = GXml.parse(data);
   var markers = xml.documentElement.getElementsByTagName("marker");
-  for (var j = 0; j< markers.length; j++) {
+
+  for (var j = 0; j < markers.length; j++) {
     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");
-    if (type == "") type="default";
+    if (type == "") type = "default";
     var continent = markers[j].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");
+    var marker = createMarker(p, name, html, icons[type], type, continent, "tradelane");
     if (areas[type] == undefined) areas[type] = [];
     areas[type].push(marker);    
   }
+
   mgr.addMarkers(areas["tradelane"],5,11);
   mgr.refresh();
 });
@@ -100,7 +103,7 @@
 
 var str = "";
 for (var i = 0; i < continents.length; i++) {
-	c = continents[i];
+	c = continents[i][0];
 	str += "<span id=\"sp"+c+"\"><a href=\"javascript:toggleVisContinent('"+c+"')\">"+c+"</a></span>\n";
 	if (i == 2)
 		str += "<br /><br />\n";
@@ -108,7 +111,7 @@
 document.getElementById("controls").innerHTML = str;
 
 for (var i = 0; i < continents.length; i++) {
-	setVisContinent(continents[i], true);
+	setVisContinent(continents[i][0], true);
 }