Mercurial > hg > batmud > gmap2

changeset 91:e4a37528f1a7 gmap2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert line ends via dos2unix.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 16 Oct 2011 02:20:37 +0300
parents a45bf2b79256
children 45907866e3a9
files map.js markers.js
diffstat 2 files changed, 248 insertions(+), 248 deletions(-) [+]
line wrap: on
line diff
--- a/map.js	Sun Oct 16 02:14:37 2011 +0300
+++ b/map.js	Sun Oct 16 02:20:37 2011 +0300
@@ -1,66 +1,66 @@
-// $Id: map.js 2404 2009-12-24 20:01:32Z jeskko $
-var markertypes = [
-  ["Guilds",    "guild"],
-  ["PCities",   "pcity"],
-  ["Forts",     "fort"],
-  ["Shrines",   "shrine"],
-  ["Areas",     "default"],
-];
-
-var map = new GMap2(document.getElementById("map"),{draggableCursor: 'crosshair', draggingCursor: 'pointer'});
-map.enableContinuousZoom();
-map.enableScrollWheelZoom();
-map.addControl(new GLargeMapControl3D());
-
-var copyright = new GCopyright(1,
-	new GLatLngBounds(new GLatLng(-90, -180), 
-	new GLatLng(90, 180)),
-	0, "Map data by BAT ry, Ooga, Ggr, Slobber and Jeskko");
-
-var cc = new GCopyrightCollection('BatMUD');
-cc.addCopyright(copyright);
-
-var tl = [new GTileLayer(cc, 2, 10),
-	  new GTileLayer(cc, 2, 10)];
-
-tl[0].getTileUrl = function(a,b) { return "tiles/"+(b)+"/"+a.y+"/"+a.x+".png"; }
-tl[1].getTileUrl = function(a,b) { return "overlay.php?x="+a.x+"&y="+a.y+"&zoom="+(b); }
-
-var custommap = new GMapType(tl, new GMercatorProjection(12),"BatMud", {errorMessage:"No data available"});
-map.addMapType(custommap);
-var proj = map.getCurrentMapType().getProjection();
-map.setCenter(proj.fromPixelToLatLng(new GPoint(8556,8664), 6), 3, custommap);
-
-
-function checkCoords(cx, cy, cxmin, cymin, cxmax, cymax, cname) {
-  if (cx > cxmin && cx < cxmax && cy > cymin && cy < cymax) {
-    return {x: cx + cxmin, y: cy + cymin, name: cname};
-  } else {
-    return null;
-  }
-}
-
-google.maps.Event.addListener(map, "mousemove", function(point) {
-  var p = proj.fromLatLngToPixel(point,7);
-  tx = Math.round((p.x-16383)/2)-1;
-  ty = Math.round((p.y-16383)/2)-1;
-
-  xx = tx;
-  yy = ty;
-  cont = "Deep Sea";
-  
-  for (i = 0; i < continents.length; i++) {
-    var c = continents[i];
-    if (c != null && tx > c[1] && tx < c[3] && ty > c[2] && ty < c[4]) {
-      cont = c[0];
-      xx = tx - c[1];
-      yy = ty - c[2];
-      break;
-    }
-  }
-
-  document.getElementById("xcoord").innerHTML = xx;
-  document.getElementById("ycoord").innerHTML = yy;
-  document.getElementById("continent").innerHTML = cont;
-});
-
+// $Id: map.js 2404 2009-12-24 20:01:32Z jeskko $
+var markertypes = [
+  ["Guilds",    "guild"],
+  ["PCities",   "pcity"],
+  ["Forts",     "fort"],
+  ["Shrines",   "shrine"],
+  ["Areas",     "default"],
+];
+
+var map = new GMap2(document.getElementById("map"),{draggableCursor: 'crosshair', draggingCursor: 'pointer'});
+map.enableContinuousZoom();
+map.enableScrollWheelZoom();
+map.addControl(new GLargeMapControl3D());
+
+var copyright = new GCopyright(1,
+	new GLatLngBounds(new GLatLng(-90, -180), 
+	new GLatLng(90, 180)),
+	0, "Map data by BAT ry, Ooga, Ggr, Slobber and Jeskko");
+
+var cc = new GCopyrightCollection('BatMUD');
+cc.addCopyright(copyright);
+
+var tl = [new GTileLayer(cc, 2, 10),
+	  new GTileLayer(cc, 2, 10)];
+
+tl[0].getTileUrl = function(a,b) { return "tiles/"+(b)+"/"+a.y+"/"+a.x+".png"; }
+tl[1].getTileUrl = function(a,b) { return "overlay.php?x="+a.x+"&y="+a.y+"&zoom="+(b); }
+
+var custommap = new GMapType(tl, new GMercatorProjection(12),"BatMud", {errorMessage:"No data available"});
+map.addMapType(custommap);
+var proj = map.getCurrentMapType().getProjection();
+map.setCenter(proj.fromPixelToLatLng(new GPoint(8556,8664), 6), 3, custommap);
+
+
+function checkCoords(cx, cy, cxmin, cymin, cxmax, cymax, cname) {
+  if (cx > cxmin && cx < cxmax && cy > cymin && cy < cymax) {
+    return {x: cx + cxmin, y: cy + cymin, name: cname};
+  } else {
+    return null;
+  }
+}
+
+google.maps.Event.addListener(map, "mousemove", function(point) {
+  var p = proj.fromLatLngToPixel(point,7);
+  tx = Math.round((p.x-16383)/2)-1;
+  ty = Math.round((p.y-16383)/2)-1;
+
+  xx = tx;
+  yy = ty;
+  cont = "Deep Sea";
+  
+  for (i = 0; i < continents.length; i++) {
+    var c = continents[i];
+    if (c != null && tx > c[1] && tx < c[3] && ty > c[2] && ty < c[4]) {
+      cont = c[0];
+      xx = tx - c[1];
+      yy = ty - c[2];
+      break;
+    }
+  }
+
+  document.getElementById("xcoord").innerHTML = xx;
+  document.getElementById("ycoord").innerHTML = yy;
+  document.getElementById("continent").innerHTML = cont;
+});
+
--- a/markers.js	Sun Oct 16 02:14:37 2011 +0300
+++ b/markers.js	Sun Oct 16 02:20:37 2011 +0300
@@ -1,193 +1,193 @@
-// $Id: markers.js 2284 2009-09-21 12:47:20Z jeskko $
-var mgr = new GMarkerManager(map);
-var areas = [];
-var tlane = [];
-var gmarkers = [];
-var mi = 0;
-var bi = 0;
-var builtin_data = [];
-var side_builtin_html = "";
-
-function myclick(i) {
-  b = gmarkers[i];
-  map.panTo(b);
-}
-
-function createMarker(point,name,html,icon,type,continent,sidebar) {
-  var marker = new GMarker(point,{icon:icon});
-  GEvent.addListener(marker,"click",function() {
-    marker.openInfoWindowHtml("<div style=\"color:#000;\">"+html+"</div>");
-  });
-  gmarkers[mi] = point;
-  if (sidebar == "builtin") { 
-    builtin_data[bi] = new Array(2);
-    builtin_data[bi][0] = type;
-    builtin_data[bi][1] = continent;
-    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>';
-  if (sidebar == "public") side_public_html += '<a href="javascript:myclick(' + mi + ')">' + name + '</a><br>';
-
-  mi++;
-  return marker;
-}
-
-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++) {
-    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";
-    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] = [];
-    areas[type].push(marker);    
-  }
-
-  mgr.addMarkers(areas["default"], 7, 11);
-  mgr.addMarkers(areas["guild"],   6, 11);
-  mgr.addMarkers(areas["shrine"],  7, 11);
-  mgr.addMarkers(areas["ferry"],   4, 11);
-  mgr.addMarkers(areas["city"],    4, 11);
-
-  mgr.addMarkers(areas["pcity"],   8, 11);
-  mgr.addMarkers(areas["fort"],    8, 11);
-  mgr.refresh();
-
-  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++) {
-    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";
-    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");
-    if (areas[type] == undefined) areas[type] = [];
-    areas[type].push(marker);
-  }
-
-  mgr.addMarkers(areas["tradelane"], 5, 11);
-  mgr.refresh();
-});
-
-
-GDownloadUrl("troverlay.xml", function(data,responseCode) {
-  var xml = GXml.parse(data);
-  var lines = xml.documentElement.getElementsByTagName("line");
-
-  for (var j = 0; j < lines.length; j++) {
-    var coords = [];
-    var points = lines[j].getElementsByTagName("point");
-    for (var i = 0; i < points.length; i++) {
-      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 poly = new GPolyline(coords, "#ffffff", 1, 0.7);
-    map.addOverlay(poly);
-  }
-});
-
-
-
-var visStates = [];
-
-function setVisState(c, show) {
-  visStates[c] = show;
-  document.getElementById("sp" + c).style.background = show ? "white" : "red";
-}
-
-function updateVisible()
-{
-  for (var i = 0; i < builtin_data.length; i++) {
+// $Id: markers.js 2284 2009-09-21 12:47:20Z jeskko $
+var mgr = new GMarkerManager(map);
+var areas = [];
+var tlane = [];
+var gmarkers = [];
+var mi = 0;
+var bi = 0;
+var builtin_data = [];
+var side_builtin_html = "";
+
+function myclick(i) {
+  b = gmarkers[i];
+  map.panTo(b);
+}
+
+function createMarker(point,name,html,icon,type,continent,sidebar) {
+  var marker = new GMarker(point,{icon:icon});
+  GEvent.addListener(marker,"click",function() {
+    marker.openInfoWindowHtml("<div style=\"color:#000;\">"+html+"</div>");
+  });
+  gmarkers[mi] = point;
+  if (sidebar == "builtin") { 
+    builtin_data[bi] = new Array(2);
+    builtin_data[bi][0] = type;
+    builtin_data[bi][1] = continent;
+    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>';
+  if (sidebar == "public") side_public_html += '<a href="javascript:myclick(' + mi + ')">' + name + '</a><br>';
+
+  mi++;
+  return marker;
+}
+
+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++) {
+    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";
+    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] = [];
+    areas[type].push(marker);    
+  }
+
+  mgr.addMarkers(areas["default"], 7, 11);
+  mgr.addMarkers(areas["guild"],   6, 11);
+  mgr.addMarkers(areas["shrine"],  7, 11);
+  mgr.addMarkers(areas["ferry"],   4, 11);
+  mgr.addMarkers(areas["city"],    4, 11);
+
+  mgr.addMarkers(areas["pcity"],   8, 11);
+  mgr.addMarkers(areas["fort"],    8, 11);
+  mgr.refresh();
+
+  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++) {
+    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";
+    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");
+    if (areas[type] == undefined) areas[type] = [];
+    areas[type].push(marker);
+  }
+
+  mgr.addMarkers(areas["tradelane"], 5, 11);
+  mgr.refresh();
+});
+
+
+GDownloadUrl("troverlay.xml", function(data,responseCode) {
+  var xml = GXml.parse(data);
+  var lines = xml.documentElement.getElementsByTagName("line");
+
+  for (var j = 0; j < lines.length; j++) {
+    var coords = [];
+    var points = lines[j].getElementsByTagName("point");
+    for (var i = 0; i < points.length; i++) {
+      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 poly = new GPolyline(coords, "#ffffff", 1, 0.7);
+    map.addOverlay(poly);
+  }
+});
+
+
+
+var visStates = [];
+
+function setVisState(c, show) {
+  visStates[c] = show;
+  document.getElementById("sp" + c).style.background = show ? "white" : "red";
+}
+
+function updateVisible()
+{
+  for (var i = 0; i < builtin_data.length; i++) {
     var show = visStates[builtin_data[i][0]] && visStates[builtin_data[i][1]];
     document.getElementById("marker" + i).style.display = show ? "block" : "none";
   }
-}
-
-function setVisContinent(c, show) {
-  setVisState(c, show);
-  if (c == "all_c") {
-    for (var i = 0; i < continents.length; i++) {
-      var q = continents[i];
-      if (q != null)
-        setVisState(q[0], show);
-    }
-  }
+}
+
+function setVisContinent(c, show) {
+  setVisState(c, show);
+  if (c == "all_c") {
+    for (var i = 0; i < continents.length; i++) {
+      var q = continents[i];
+      if (q != null)
+        setVisState(q[0], show);
+    }
+  }
 }
-
-function setVisType(c, show) {
-  setVisState(c, show);
-  if (c == "all_t") {
-    for (var i = 0; i < markertypes.length; i++) {
-      var q = markertypes[i];
-      if (q != null)
-        setVisState(q[1], show);
-    }
-  }
-}
-
+
+function setVisType(c, show) {
+  setVisState(c, show);
+  if (c == "all_t") {
+    for (var i = 0; i < markertypes.length; i++) {
+      var q = markertypes[i];
+      if (q != null)
+        setVisState(q[1], show);
+    }
+  }
+}
+
 function toggleVisContinent(c) {
-  setVisContinent(c, !visStates[c]);
-  updateVisible();
+  setVisContinent(c, !visStates[c]);
+  updateVisible();
 }
-
-function toggleVisType(c) {
-  setVisType(c, !visStates[c]);
-  updateVisible();
+
+function toggleVisType(c) {
+  setVisType(c, !visStates[c]);
+  updateVisible();
 }
-
-
-// Print elements
-var str = "";
-var n = 0;
-for (var i = 0; i < continents.length; i++) {
-  var q = continents[i];
-  if (q != null) {
+
+
+// Print elements
+var str = "";
+var n = 0;
+for (var i = 0; i < continents.length; i++) {
+  var q = continents[i];
+  if (q != null) {
     var c = q[0];
-    str += "<span id=\"sp"+c+"\"><a href=\"javascript:toggleVisContinent('"+c+"')\">"+c+"</a></span>\n";
-    if (n == 2) str += "<br />\n";
-    n++;
-  }
+    str += "<span id=\"sp"+c+"\"><a href=\"javascript:toggleVisContinent('"+c+"')\">"+c+"</a></span>\n";
+    if (n == 2) str += "<br />\n";
+    n++;
+  }
 }	
-
-str += "<span id=\"spall_c\"><a href=\"javascript:toggleVisContinent('all_c')\">All</a></span>\n";
-
-str += "<br /><br />\n";
-
-n = 0;
-for (var i = 0; i < markertypes.length; i++) {
-  var q = markertypes[i];
-  if (q != null) {
+
+str += "<span id=\"spall_c\"><a href=\"javascript:toggleVisContinent('all_c')\">All</a></span>\n";
+
+str += "<br /><br />\n";
+
+n = 0;
+for (var i = 0; i < markertypes.length; i++) {
+  var q = markertypes[i];
+  if (q != null) {
     var c = q[1];
-    str += "<span id=\"sp"+c+"\"><a href=\"javascript:toggleVisType('"+c+"')\">"+markertypes[i][0]+"</a></span>\n";
-    if (n == 2) str += "<br />\n";
-    n++;
-  }
+    str += "<span id=\"sp"+c+"\"><a href=\"javascript:toggleVisType('"+c+"')\">"+markertypes[i][0]+"</a></span>\n";
+    if (n == 2) str += "<br />\n";
+    n++;
+  }
 }	
-
-str += "<span id=\"spall_t\"><a href=\"javascript:toggleVisType('all_t')\">All</a></span>\n";
-
-document.getElementById("controls").innerHTML = str;
-
-setVisContinent("all_c", true);
-setVisType("all_t", true);
-updateVisible();
+
+str += "<span id=\"spall_t\"><a href=\"javascript:toggleVisType('all_t')\">All</a></span>\n";
+
+document.getElementById("controls").innerHTML = str;
+
+setVisContinent("all_c", true);
+setVisType("all_t", true);
+updateVisible();