firebug-cvs

[David M. D. <do...@us...>]

Update of /cvsroot/firebug/firebug/web/gmaps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14006/gmaps

Modified Files:
	db_render_xml.php geocodeinfo_rfs.xsl 
Log Message:
Added more images for web app.

Index: db_render_xml.php
===================================================================
RCS file: /cvsroot/firebug/firebug/web/gmaps/db_render_xml.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** db_render_xml.php	9 Jun 2005 03:53:08 -0000	1.8
--- db_render_xml.php	9 Jun 2005 18:55:27 -0000	1.9
***************
*** 16,35 ****
  
  
!   $images=array(14 => 'http://localhost/firebug/images/greenman.png',
! 	      17 => 'http://localhost/firebug/images/redman.png',
  		23 => 'http://localhost/firebug/images/greenman.png',
! 		24 => 'http://localhost/firebug/images/greenman.png',
! 		25 => 'http://localhost/firebug/images/greenman.png',
! 	      28 => 'http://localhost/firebug/images/greenman.png'); 
! 
!   $icons=array(14 => 'http://localhost/firebug/images/sensor.png',
! 	       17 => 'http://localhost/firebug/images/sensor.png',
! 	       23 => 'http://localhost/firebug/images/sensor.png',
! 	       24 => 'http://localhost/firebug/images/sensor.png',
! 	       25 => 'http://localhost/firebug/images/sensor.png',
! 	       28 => 'http://localhost/firebug/images/sesnor.png'); 
  
  
  
  
  function emit_gps_location($id, $lat, $long, $icon, $image, $title, $address) {
--- 16,41 ----
  
  
! /** TODO: In the future, the images and motes need
!  *  to be associated according to the state of
!  *  mote or environmental conditions around the mote.
!  *  These are hardwired for now for conducting a demo
!  *  at Richmond Field Station.
!  */
!   $images=array(14 => 'http://localhost/firebug/images/redengine.png',
! 	        17 => 'http://localhost/firebug/images/redman.png',
  		23 => 'http://localhost/firebug/images/greenman.png',
! 		24 => 'http://localhost/firebug/images/yellowsensor.png',
! 		25 => 'http://localhost/firebug/images/redsensor.png',
! 	        28 => 'http://localhost/firebug/images/greensensor.png'); 
  
+   $icons=array(14 => 'http://localhost/firebug/images/redengine.png',
+ 	       17 => 'http://localhost/firebug/images/greenman.png',
+ 	       23 => 'http://localhost/firebug/images/redman.png',
+ 	       24 => 'http://localhost/firebug/images/yellowsensor.png',
+ 	       25 => 'http://localhost/firebug/images/redsensor.png',
+ 	       28 => 'http://localhost/firebug/images/greensensor.png'); 
  
  
+   $global_id = 0;
  
  function emit_gps_location($id, $lat, $long, $icon, $image, $title, $address) {
***************
*** 68,72 ****
    $tblname = "gga_l";
  
!   global $ids, $images, $icons;
  
    $dbh = connect_postgres($dbname);
--- 74,78 ----
    $tblname = "gga_l";
  
!   global $ids, $images, $icons, $global_id;
  
    $dbh = connect_postgres($dbname);
***************
*** 123,126 ****
--- 129,135 ----
  	   $longmin=$value;
  	   break;
+          case "nodeid":
+ 	   $nodeid=$value;
+ 	   break;
            default:
  	    $disp[$key]=$value;
***************
*** 130,139 ****
       $lat = $latdeg + (float)($latmin/60.0);
       $long = $longdeg + ($longmin/60.0);
!      $image = $images[14];
!      $icon = $icons[14];
       $id = $ids[$i];
!      $title = 'Foo Bar';
!      $address = '<line>Dave and Karthik</line>';
       emit_gps_location($id,$lat,$long,$image,$icon,$title,$address);
     }
  
--- 139,149 ----
       $lat = $latdeg + (float)($latmin/60.0);
       $long = $longdeg + ($longmin/60.0);
!      $image = $images[$nodeid];
!      $icon = $icons[$nodeid];
       $id = $ids[$i];
!      $title = "Firebug sensor $nodeid";
!      $address = "<line>Firebug sensor $nodeid</line>";
       emit_gps_location($id,$lat,$long,$image,$icon,$title,$address);
+      $global_id = $i;
     }
  
***************
*** 157,164 ****
    print_from_database();
  
!   $icon = $images[14];
!   $id = $ids[2];
!   $lat = 37.9177;
!   $long = 122.332;
    $address = "<line>Here be spiders...</line>\n<line>Building 454, Room 1</line>";
    $image = "/firebug/images/spider.png";
--- 167,174 ----
    print_from_database();
  
! $icon = "/firebug/images/teardrop.png";//$images[14];
!   $id = $ids[7];
!   $lat = 37.918128; 
!   $long = 122.33185;
    $address = "<line>Here be spiders...</line>\n<line>Building 454, Room 1</line>";
    $image = "/firebug/images/spider.png";
***************
*** 167,170 ****
--- 177,182 ----
    emit_gps_location($id,$lat,$long,$icon,$image,'Nick\'s office',$address);
  
+ //$address = '<line>Dave and Karthik</line>';
+ 
    print("</overlay>\n");
    print("</page>\n");

Index: geocodeinfo_rfs.xsl
===================================================================
RCS file: /cvsroot/firebug/firebug/web/gmaps/geocodeinfo_rfs.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** geocodeinfo_rfs.xsl	8 Jun 2005 22:29:42 -0000	1.2
--- geocodeinfo_rfs.xsl	9 Jun 2005 18:55:27 -0000	1.3
***************
*** 31,35 ****
      </xsl:variable>
  
!     <div style="font-weight: bold">FireBug  --- personnel</div>
  
      <div>
--- 31,35 ----
      </xsl:variable>
  
!     <div style="font-weight: bold">Project FireBug</div>
  
      <div>