Changeset 98

Timestamp:

18/01/07 06:09:59 (5 years ago)

Author:

nigel

Message:

Fixed graphing routine
Added rain graph
Cleaned up unused methods

File:

• openweather/openweather.module (modified) (7 diffs)

openweather/openweather.module

@@ -209 +209 @@
 
 /**
+ * Gets (and caches) the latest readings
+ */
+function openweather_get_latest($nid){
+  static $cache = array();
+  if (array_key_exists($nid,$cache))
+    return $cache[$nid];
+  else {
+    $data = db_query("SELECT * FROM {openweather_readings} WHERE nid = $nid ORDER BY `timestamp` DESC LIMIT 1");
+    $data = db_fetch_object($data);
+    $cache[$nid] = $data;
+    return $data;
+  }
+}
+
+
+/**
   * Summary table of weather station feed
   */
 function openweather_summary($nid){
-  $data = db_query("SELECT * FROM {openweather_readings} WHERE nid = $nid ORDER BY `timestamp` DESC LIMIT 1");
-  $data = db_fetch_object($data);
+  $data = openweather_get_latest($nid);
 
   $output .= "<table>";
-  $output .= "<tr><th>Temperature</th><td>$data->temp_out dec C</td><th>Humidity</th><td>$data->rel_hum_out %</td></tr>";
-  $output .= "<tr><th>Wind speed</th><td>$data->windspeed kMh</td><th>Wind direction</th><td>".openweather_to_direction($data->wind_angle)."($data->wind_angle)</td></tr>";
+  $output .= "<tr><th>Temperature</th><td>$data->temp_out &#176;C</td><th>Humidity</th><td>$data->rel_hum_out %</td></tr>";
+  $output .= "<tr><th>Wind speed</th><td>$data->windspeed kmh</td><th>Wind direction</th><td>".openweather_to_direction($data->wind_angle)."($data->wind_angle &#176;)</td></tr>";
   $output .= "<tr><th>Relative pressure</th><td>$data->rel_pressure</td><th>Timestamp</th><td>$data->timestamp</td></tr>";
   $output .= "</table>";
@@ -257 +272 @@
   $nid = arg(1);
   $node = node_load($nid);
-  $results = openweather_get_values($node);
   drupal_set_header('Content-Type: text/csv; charset=utf-8');
   drupal_set_header('Content-Disposition: attachment; filename="openweather.csv";');
-  print "Time, Value\n";
-  foreach($results as $row){
-    print '"'.$row->timestamp.'",'.$row->value."\n";
+  print "Time, temp_out, rel_hum_out, windspeed, wind_angle, wind_chill, rain_1h, rel_pressure, dewpoint\n";
+  
+  $results = db_query("SELECT * FROM {openweather_readings} WHERE nid = %d ORDER BY timestamp DESC", $node->nid);
+  while ($row = db_fetch_object($results)){
+    print "$row->timestamp, $row->temp_out, $row->rel_hum_out, $row->windspeed, $row->wind_angle, $row->wind_chill, $row->rain_1h, $row->rel_pressure, $row->dewpoint\n";
   }
 }
@@ -288 +304 @@
 }
 
-/**
-  * Average usage over $days, from midday before the last reading
-  * @param values - object with date and value
-  * @param days - the number of days to average over
-  * @param count - the number of entries to calculate
-  */
-function openweather_extrapolate($values, $days, $count){
-  $return = array();
-
-  $last = reset($values);
-  $row = $last;
-  $target = strtotime($row->timestamp); // Set the first target
-  $value = $row->value; // We know what the first reading is!
-
-  for ($i = 0 ; $i < $count ; $i++){
-    // Increment target, and store old value
-    $oldValue = $value;
-    $oldTarget = $target;
-    $target -= $days*60*60*24;
-
-    while ( !($row === false) && strtotime($row->timestamp) > $target){
-      $last = $row;
-      $row = next($values);
-    }
-    if ($row === false) {
-      break;
-    } else {
-      $timeBetween = (strtotime( $last->timestamp ) - strtotime( $row->timestamp ));
-      $timeToTarget = $target - strtotime( $row->timestamp );
-      $value = $row->value + (($last->value - $row->value)/$timeBetween*$timeToTarget);
-      $entry = new StdClass();
-      $entry->from = date("d/m/Y H:i", $target);
-      $entry->to = date("d/m/Y H:i", $oldTarget);
-      $entry->value = $oldValue - $value;
-      $return[$i] = $entry;
-    }
-  }
-
-  return $return;
-}
-
-
-/**
-  * Draw a CSS/HTML graph
-  */
-/*
-function openweather_graph($entries){
-  if (count($entries) == 0)
-    return "No entries";
-  $height = 200;
-  $width = 500;
-  $output = '<div style="background: white; border: 1px solid; position: relative; width: '.$width.'px; height:'.$height.'px">';
-
-  $w = floor($width/count($entries));
-  $offset = ($width-($w*count($entries)))/2;
-  $i = 0;
-  
-  $max = 0;
-  foreach ($entries as $e){
-    if ($e->value > $max)
-      $max = $e->value;
-  }
-
-  foreach ($entries as $e){
-    $output .= "<div title='".$e->from." to ".$e->to." value: ".sprintf("%1.2f",$e->value)."' style='width:${w}px; height:".floor($e->value/$max*$height)."px; bottom: 0px; position: absolute; right:".($i*$w+$offset)."px; background: grey; border: solid 1px;'>".round($e->value)."</div>\n";
-    $i++;
-  }
-  $output .= '</div>';
-  return $output;
-}
-*/
 function openweather_xmlrpc(){
   return array(
@@ -396 +341 @@
   }
 }
-
 
 /**
@@ -439 +383 @@
     break;
 
+  case 'rain_1h':
+    $title = t("Rainfall in previous hour");
+    $autoScale = false;
+    $units = 'mm';
+    $decimals = 1;
+    break;
+
   default:
     return;
   }
 
-  $r = db_query("SELECT time(`timestamp`) AS `timevalue`, unix_timestamp(`timestamp`) as `utimestamp`, $type FROM {openweather_readings} WHERE nid = $nid ORDER BY `timestamp` DESC LIMIT 144" );
+  $data = openweather_get_latest($nid);
+
+  $r = db_query("SELECT time(`timestamp`) AS `timevalue`, unix_timestamp(`timestamp`) as `utimestamp`, $type FROM {openweather_readings} WHERE nid = $nid AND unix_timestamp(timestamp) > ".(strtotime($data->timestamp)-24*60*60)." ORDER BY `timestamp` DESC LIMIT 500" );
 
   drupal_set_header('Content-Type: image/png');
@@ -459 +412 @@
   $g->y_data = array( $type=>array() );
   $minY = null;
+  $count = 0;
   while ($e = db_fetch_object($r)) {
+    $count++;
     $g->x_data = array_merge($g->x_data, array($e->timevalue=>$e->utimestamp));
     $g->y_data[$type][] = $e->$type;
-    //echo $e->$type.",".$e->timevalue.",".$e->utimestamp."<br>";
     if ($minY == null || $e->$type < $minY) $minY = $e->$type;
   }
@@ -472 +426 @@
 
   if ($autoScale) $g->parameter['y_min_left'] = $minY;
+
+  $g->parameter['x_axis_text'] = $count/12;
   
   $g->draw();