Mercurial > hg > batmud > gmap2

changeset 5:903f9077f971 gmap2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
marker list, some initial marker json stuff
author jeskko
date Mon, 21 Sep 2009 12:47:20 +0000
parents 99287d4dae6b
children a78412afe8eb
files css/mapstyle.css index.html js/markers.js json/priv.php json/pub.php
diffstat 5 files changed, 57 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/css/mapstyle.css	Fri May 29 02:05:34 2009 +0000
+++ b/css/mapstyle.css	Mon Sep 21 12:47:20 2009 +0000
@@ -10,7 +10,7 @@
 	bottom: 0px;
 	height: 1.5em;
 	left: 0px;
-	right: 300px;
+	right: 0px;
 	padding-top: 0.25em;
 	padding-left: 0.25em;
 	margin: 0px;
@@ -23,7 +23,7 @@
 	position: absolute;
 	right: 0px;
 	top: 3em;
-	bottom: 0px;
+	bottom: 1.5em;
 	width: 290px;	
 	padding: 0px;
 	margin: 0px;
@@ -35,6 +35,7 @@
 	height: 100%;
 	padding: 0px;
 	margin: 0px;
+	overflow: auto;
 }
 
 #sidecoll {
--- a/index.html	Fri May 29 02:05:34 2009 +0000
+++ b/index.html	Mon Sep 21 12:47:20 2009 +0000
@@ -3,7 +3,7 @@
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:v="urn:schemas-microsoft-com:vml">
  <head>
   <link rel="stylesheet" href="css/mapstyle.css" type="text/css"/>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
--- a/js/markers.js	Fri May 29 02:05:34 2009 +0000
+++ b/js/markers.js	Mon Sep 21 12:47:20 2009 +0000
@@ -1,33 +1,38 @@
 // $Id$
+var mgr = new GMarkerManager(map);
+var areas=[];
+var tlane=[];
+var gmarkers=[];
+var mi=0;
+var bi=0;
+var builtin_type= [];
+var builtin_cont= [];
+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[i]=point;
+  gmarkers[mi]=point;
   if (sidebar=="builtin") { 
     builtin_type[bi]=type;
     builtin_cont[bi]=continent;
-    side_builtin_html += '<span id="marker'+bi+'"><a href="javascript:myclick(' + i + ')">' + name + '</a><br></span>';
+    side_builtin_html += '<span id="marker'+bi+'"><a href="javascript:myclick(' + mi + ')">' + name + '</a><br></span>';
     bi++;
   }
-  if (sidebar=="private") side_private_html += '<a href="javascript:myclick(' + i + ')">' + name + '</a><br>';
-  if (sidebar=="public") side_public_html += '<a href="javascript:myclick(' + i + ')">' + name + '</a><br>';
+  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>';
 
-  i++;
+  mi++;
   return marker;
 }
 
-var mgr = new GMarkerManager(map);
-var areas=[];
-var tlane=[];
-var gmarkers=[];
-var i;
-var bi;
-var builtin_type= [];
-var builtin_cont= [];
-var side_builtin_html;
-
 GDownloadUrl("markers.xml", function(data,responseCode) {
   var xml = GXml.parse(data);
   var markers = xml.documentElement.getElementsByTagName("marker");
@@ -53,6 +58,7 @@
   mgr.addMarkers(areas["ferry"],4,11);
   mgr.addMarkers(areas["city"],4,11);
   mgr.refresh();
+  document.getElementById("sidecontent").innerHTML=side_builtin_html;
 });
 
 GDownloadUrl("tradelane.xml", function(data,responseCode) {
@@ -67,7 +73,7 @@
     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,"builtin");
+    var marker=createMarker(p,name,html,icons[type],type,continent,"tradelane");
     if (areas[type]==undefined) areas[type]=[];
     areas[type].push(marker);    
   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/priv.php	Mon Sep 21 12:47:20 2009 +0000
@@ -0,0 +1,21 @@
+<?php
+session_start();
+if (session_is_registered("user"))
+{
+  require("db_credentials.php");
+
+  $db=mysql_connect($db_host,$db_name,$db_passwd) or die ("MySQL error");
+  mysql_select_db($db_database,$db) or die ("MySQL error");
+
+  $username=$_SESSION["user"];
+  
+  $result=mysql_query("select id from users where login='$username'",$db);
+  $data=@mysql_fetch_assoc($result);
+  $id=$data["id"];
+
+  $result=mysql_query("select markers.*,users.login from markers left join users on markers.ownerid=users.id where public=0 and ownerid=$id",$db);
+  while ($data=@mysql_fetch_assoc($result))
+    $res[]=$data;
+  echo json_encode($res);
+}
+?>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json/pub.php	Mon Sep 21 12:47:20 2009 +0000
@@ -0,0 +1,10 @@
+<?php
+require("db_credentials.php");
+
+$db=mysql_connect($db_host,$db_name,$db_passwd) or die ("MySQL error");
+mysql_select_db($db_database,$db) or die ("MySQL error");
+$result=mysql_query("select markers.*,users.login from markers left join users on markers.ownerid=users.id where public=1",$db);
+while ($data=@mysql_fetch_assoc($result))
+  $res[]=$data;
+echo json_encode($res);
+?>