From: root <root@ip-10-130-15-226.ap-southeast-1.compute.internal>
Date: Sat, 13 Aug 2011 10:46:41 +0000
Subject: Show points not lines where appropriate
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=7d6150c2b91533c414410315d1debcc58a929b33
---
Show points not lines where appropriate
---


--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -31,7 +31,8 @@
 
 function isDebugServer()
 {
-	return !isset($_SERVER['SERVER_NAME']) || $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "10.1.0.4" || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" ;
+	return isset($_SERVER['SERVER_NAME']) && ( $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "10.1.0.4" || $_SERVER['SERVER_NAME'] == 
+"localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1") ;
 }
 
 include_once ("common-geo.inc.php");

--- a/labs/myway_timeliness_route.php
+++ b/labs/myway_timeliness_route.php
@@ -34,6 +34,10 @@
                 tickFormatter: yformatter
             },
             grid: { hoverable: true, clickable: true, labelMargin: 32   },
+series: {
+      lines: { show: false },
+      points: { show: true }
+    }
     };
     
     var plot = $.plot(placeholder, data, options);
@@ -118,3 +122,4 @@
     });
 
 </script> 
+

--- a/labs/myway_timeliness_stop.json.php
+++ b/labs/myway_timeliness_stop.json.php
@@ -29,3 +29,4 @@
     else echo "[".implode(",",$points)."]";
 ?>
 }
+

--- a/labs/myway_timeliness_stop.php
+++ b/labs/myway_timeliness_stop.php
@@ -40,6 +40,10 @@
                 tickFormatter: yformatter
             },
             grid: { hoverable: true, clickable: true, labelMargin: 32   },
+ series: {
+      lines: { show: false },
+      points: { show: true }
+    }
     };
 
     var plot = $.plot(placeholder, data, options);
@@ -129,3 +133,4 @@
     });
 
 </script> 
+