Changeset 56

Timestamp:

04/14/10 08:50:14 (2 years ago)

Author:

brian

Message:

Added summary view to webtracker of all routes. Modified database tables to take a range in a where clause as a value argument to do a WHERE x IN (y1, y2, yx) clause.

Files:

• application/webtracker/controller/user.php (modified) (4 diffs)
• application/webtracker/model/database/trip.php (modified) (2 diffs)
• application/webtracker/model/database/user.php (modified) (1 diff)
• application/webtracker/view/html/user/trip-details.phtml (modified) (1 diff)
• libraries/Nickel_Core/Controller.php (modified) (1 diff)
• libraries/Nickel_Core/Database/Querybuilder/All.php (modified) (1 diff)
• libraries/Nickel_Core/Database/Table.php (modified) (4 diffs)

application/webtracker/controller/user.php

@@ -46 +46 @@
          $trip = $tripModel->getById($this->_helper->getParam('trip', 0));
          
-         $mintime = $this->_helper->getParam('mintime', 0);
-         $maxtime = $this->_helper->getParam('maxtime', 0);
-
-         if ($trip === null || $trip->user != $user->id) {
+         if (count($trip) == 0) {
              nickelException ('No such trip!', 'bad-route'); die();
          }
          
+         $mintime = $this->_helper->getParam('mintime', 0);
+         $maxtime = $this->_helper->getParam('maxtime', 0);
+         
          $this->_view->user = $user;
          $this->_view->trip = $trip;
+         $this->_view->tripraw = $this->_helper->getParam('trip', 0);
          $this->_view->mintime = $mintime;
          $this->_view->maxtime = $maxtime;
+         $this->_view->nospeed = $this->_helper->getParam('nospeed', 'false');
     }
+    
+    
+    function summaryAction() {
+         
+         $userModel = $this->_helper->model('Database_User');
+         $tripModel = $this->_helper->model('Database_Trip');
+         
+         $username = $this->_helper->getParam('username', false);
+         
+         if ($username === false) {
+             nickelException ('No such user!', 'bad-route'); die();
+         }
+         
+         $user = $userModel->getByUser($username);
+         
+         if ($user === null) {
+             nickelException ('No such user!', 'bad-route'); die();
+         }
+         
+         $lowspeedTrips = $user->getLowspeedTrips();
+
+         $url = array('module' => 'webtracker', 
+                      'controller' => 'user', 
+                      'action' => 'tripDetails', 
+                      'username' => $username, 
+                      'trip' => implode(',', $lowspeedTrips), 
+                      'nospeed' => 'true');
+         
+         $this->redirect($url);
+    }
+
     
     function tripDetailsAjaxAction() {
@@ -79 +112 @@
         }
 
-        $trip = $tripModel->getById($this->_helper->getParam('trip', 0));
-        $mintime = $this->_helper->getParam('mintime', 0);
-        $maxtime = $this->_helper->getParam('maxtime', 0);
-
-        if ($trip === null || $trip->user != $user->id) {
-             // TODO:  JSON error
-             nickelException ('No such trip!', 'bad-route'); die();
-        }
-        
-        $nelat = $this->_helper->getParam('nelat', false);
-        $nelng = $this->_helper->getParam('nelng', false);
-        $swlat = $this->_helper->getParam('swlat', false);
-        $swlng = $this->_helper->getParam('swlng', false);
-        $latdif = $nelat-$swlat;
-        $lngdif = $nelng-$swlng;
-        $latdif7 = abs($latdif / 7);
-        $lngdif7 = abs($lngdif / 7);
-        
-        $data = $trip->getPointsByBounds($swlat - $latdif7, $swlng - $lngdif7, $nelat + $latdif7, $nelng + $lngdif7, 160, $mintime, $maxtime);
-        
-        if(!isset($data[0])) {
-            $dataOutput['segments'] = array();
-
-            ob_end_clean();
-            echo(json_encode($dataOutput));
-            die();
-        }
-        
-        $mintime = $data[0]['time'];
-        $maxtime = $data[count($data)-1]['time'];
-        $timeThatCountsAsAPause = (($maxtime - $mintime) / count($data)) * 4;
-        if ($timeThatCountsAsAPause < 60) $timeThatCountsAsAPause = 80;
+        $trips = explode(',', $this->_helper->getParam('trip', 0));
         
         $dataOutput = array();
@@ -117 +119 @@
         $markers = array();
         
-        $pointsPerMarker = ((int)count($data))/5;
-        
-        foreach ($data as $index => $point) {
-            if (count($segment) != 0 && $segment[count($segment)-1]['time'] < $point['time'] - $timeThatCountsAsAPause) {
-                $segments[] = $segment;
-                $segment = array();
+        foreach ($trips as $tripid) {
+           
+            $trip = $tripModel->getById($tripid);
+            $mintime = $this->_helper->getParam('mintime', 0);
+            $maxtime = $this->_helper->getParam('maxtime', 0);
+
+            if ($trip === null || $trip->user != $user->id) {
+                 // TODO:  JSON error
+                 nickelException ('No such trip!', 'bad-route'); die();
             }
-            $segment[] = $point;
-            if ($index % $pointsPerMarker == 0 || $index == count($data) - 1) {
-                $markers[] = array($point, $this->_helper->url(array('module'=>'webtracker','controller'=>'index','action'=>'generateMarkerSpeed','speed'=>$point['speed'],'time'=>$point['time'])));
+
+            $nelat = $this->_helper->getParam('nelat', false);
+            $nelng = $this->_helper->getParam('nelng', false);
+            $swlat = $this->_helper->getParam('swlat', false);
+            $swlng = $this->_helper->getParam('swlng', false);
+            $latdif = $nelat-$swlat;
+            $lngdif = $nelng-$swlng;
+            $latdif7 = abs($latdif / 7);
+            $lngdif7 = abs($lngdif / 7);
+
+            $data = $trip->getPointsByBounds($swlat - $latdif7, $swlng - $lngdif7, $nelat + $latdif7, $nelng + $lngdif7, 160, $mintime, $maxtime);
+
+            if(!isset($data[0])) {
+                continue;
             }
+
+            $mintime = $data[0]['time'];
+            $maxtime = $data[count($data)-1]['time'];
+            $timeThatCountsAsAPause = (($maxtime - $mintime) / count($data)) * 4;
+            if ($timeThatCountsAsAPause < 60) $timeThatCountsAsAPause = 80;
+
+            $pointsPerMarker = ((int)count($data))/5;
+
+            foreach ($data as $index => $point) {
+                if (count($segment) != 0 && $segment[count($segment)-1]['time'] < $point['time'] - $timeThatCountsAsAPause) {
+                    $segments[] = $segment;
+                    $segment = array();
+                }
+                $segment[] = $point;
+                
+                if ($this->_helper->getParam('nospeed', 'false') == 'false') {
+                    if ($index % $pointsPerMarker == 0 || $index == count($data) - 1) {
+                        $markers[] = array($point, $this->_helper->url(array('module'=>'webtracker','controller'=>'index','action'=>'generateMarkerSpeed','speed'=>$point['speed'],'time'=>$point['time'])));
+                    }
+                }
+            }
+
+            $segments[] = $segment;
         }
-        
-        $segments[] = $segment;
-        
+
         $dataOutput['segments'] = $segments;
         $dataOutput['markers'] = $markers;
-        
+
         ob_end_clean();
         echo(json_encode($dataOutput));
@@ -140 +177 @@
          
     }
+    
+    
 }

application/webtracker/model/database/trip.php

@@ -4 +4 @@
 
     public function __construct() {
-        parent::__construct('webtracker_trip', 'id', 'Webtracker_Model_Database_Trip_Row');
+        parent::__construct('webtracker_trip', 'id', 'Webtracker_Model_Database_Trip_Row', 'Webtracker_Model_Database_Trip_Resultset');
     }
     
@@ -10 +10 @@
         return $this->aggregate('distance', 'sum', array('date' => $day, 'user' => $user));
     }
+}
+
+class Webtracker_Model_Database_Trip_Resultset extends Database_Resultset {
     
-
+    public function getGoogleMapsBoundsString() {
+        $minlat = false;
+        $minlng = false;
+        $maxlat = false;
+        $maxlng = false;
+        
+        foreach ($this as $row) {
+            $bounds = $row->getGoogleMapsBounds();
+            if ($minlat === false || (float)$minlat > (float)$bounds['minlat']) $minlat = $bounds['minlat'];
+            if ($minlng === false || (float)$minlng > (float)$bounds['minlng']) $minlng = $bounds['minlng'];
+            if ($maxlat === false || (float)$maxlat < (float)$bounds['maxlat']) $maxlat = $bounds['maxlat'];
+            if ($maxlng === false || (float)$maxlng < (float)$bounds['maxlng']) $maxlng = $bounds['maxlng'];
+        }
+        
+        return 'new GLatLngBounds(new GLatLng('.$minlat.', '.$minlng.'), new GLatLng('.$maxlat.', '.$maxlng.'))';
+    }
 }
 
 class Webtracker_Model_Database_Trip_Row extends Database_Row {
     
+    public function getGoogleMapsBounds() {
+         // This code sucks, and only works when you're only on one specific quadrent of the world for the entire trip.
+            $pointModel = $this->_helper->model('Database_Point');
+
+            $aggregateBounds = $this->_db->queryFetchRow($pointModel->select(array(
+                    'min(lat)' => 'minlat',
+                    'min(lon)' => 'minlng',
+                    'max(lat)' => 'maxlat',
+                    'max(lon)' => 'maxlng',
+                ))->where(array('trip' => $this->id)));
+        
+            return $aggregateBounds;
+    }
+    
     public function getGoogleMapsBoundsString() {
-        // This code sucks, and only works when you're only on one specific quadrent of the world for the entire trip.
-        $pointModel = $this->_helper->model('Database_Point');
-        
-        $aggregateBounds = $this->_db->queryFetchRow($pointModel->select(array(
-                'min(lat)' => 'minlat',
-                'min(lon)' => 'minlng',
-                'max(lat)' => 'maxlat',
-                'max(lon)' => 'maxlng',
-            ))->where(array('trip' => $this->id)));
+       
+        $aggregateBounds = $this->getGoogleMapsBounds();
         
         return 'new GLatLngBounds(new GLatLng('.$aggregateBounds['minlat'].', '.$aggregateBounds['minlng'].'), new GLatLng('.$aggregateBounds['maxlat'].', '.$aggregateBounds['maxlng'].'))';

application/webtracker/model/database/user.php

@@ -4 +4 @@
 
     public function __construct() {
-        parent::__construct('webtracker_user', 'id');
+        parent::__construct('webtracker_user', 'id', 'Webtracker_Model_Database_User_Row');
     }
 
 }
+
+
+class Webtracker_Model_Database_User_Row extends Database_Row {
+   
+    
+    public function getLowspeedTrips() {
+        $tripModel = $this->_helper->model('Database_Trip');
+        $pointModel = $this->_helper->model('Database_Point');
+
+        $tripsSlow = array();
+        
+        $trips = $tripModel->fetchAll(array('user = ?' => $this->id));
+        foreach ($trips as $trip) {
+            if ($pointModel->aggregate('id', 'count', array('trip' => $trip->id, 'speed > 40')) == 0) {
+                $tripsSlow[] = $trip->id;
+            }
+        }
+        
+        return $tripsSlow;
+    }
+ 
+    
+    public function getGoogleMapsBoundsString() {
+        // This code sucks, and only works when you're only on one specific quadrent of the world for the entire trip.
+        $pointModel = $this->_helper->model('Database_Point');
+
+        $aggregateBounds = $this->_db->queryFetchRow($pointModel->select(array(
+                'min(lat)' => 'minlat',
+                'min(lon)' => 'minlng',
+                'max(lat)' => 'maxlat',
+                'max(lon)' => 'maxlng',
+            ))->where(array('trip' => $this->id)));
+
+        return 'new GLatLngBounds(new GLatLng('.$aggregateBounds['minlat'].', '.$aggregateBounds['minlng'].'), new GLatLng('.$aggregateBounds['maxlat'].', '.$aggregateBounds['maxlng'].'))';
+    }
+
+}
+

application/webtracker/view/html/user/trip-details.phtml

@@ -10 +10 @@
         <?php echo $this->addElement(new Element_AjaxGoogleMaps('map', '', 
             array(
-                'overlayService' => array('module'=>'webtracker','controller'=>'user','action'=>'tripDetailsAjax','username'=>$this->user->user,'trip'=>$this->trip->id,'mintime'=>$this->mintime,'maxtime'=>$this->maxtime),
+                'overlayService' => array('module'=>'webtracker','controller'=>'user','action'=>'tripDetailsAjax','username'=>$this->user->user,'trip'=>$this->tripraw,'mintime'=>$this->mintime,'maxtime'=>$this->maxtime,'nospeed'=>$this->nospeed),
                 'initialLocation' => $this->trip->getGoogleMapsBoundsString(),
                 'initialMode' => 'G_NORMAL_MAP'

libraries/Nickel_Core/Controller.php

@@ -61 +61 @@
      */
     public function redirect($uri) {
-        header ('Location: '.$this->_helper->baseUrl().$uri);
+        header ('Location: '.$this->_helper->url($uri));
+        die();
     }
     

libraries/Nickel_Core/Database/Querybuilder/All.php

@@ -112 +112 @@
                     $this->_clauses['WHERE'][] = ' '.$value.' ';
                 } else {
-                    $id = ':pdoval'.count($this->_values);
-                    $this->_values[$id] = $value;
                     if (strpos($key, '?') === false) {
                         //array('column', 'value')
-                        $this->_clauses['WHERE'][] = ' '.$key.' = '.$id.' ';
+                        if (is_array($value)) {
+                            //array('column', array('value1', 'value2', 'value3'))
+                            $inclause = array();
+                            foreach ($value as $v) {
+                                $id = ':pdoval'.count($this->_values);
+                                $this->_values[$id] = $v;
+                                $inclause[] = $id;
+                            }
+                            if (count($inclause) == 0) {
+                                $this->_clauses['WHERE'][] = ' FALSE ';
+                            } else {
+                                $this->_clauses['WHERE'][] = ' '.$key.' IN ('.implode(',', $inclause).') ';
+                            }
+                        } else {
+                            $id = ':pdoval'.count($this->_values);
+                            $this->_values[$id] = $value;
+                            $this->_clauses['WHERE'][] = ' '.$key.' = '.$id.' ';
+                        }
                     } else {
                         //array('column = ?', 'value')
+                        $id = ':pdoval'.count($this->_values);
+                        $this->_values[$id] = $value;
                         $this->_clauses['WHERE'][] = ' '.str_replace('?', $id, $key).' ';
                     }

libraries/Nickel_Core/Database/Table.php

@@ -6 +6 @@
     public $_primaryKey;
     public $_rowClass;
+    public $_resultSetClass;
     public $_helper;
     public $_db;
     
-    public function __construct($table = '', $primaryKey = '', $rowClass = '') {
+    public function __construct($table = '', $primaryKey = '', $rowClass = '', $resultSetClass = '') {
         global $nickelGlobals;
         
@@ -16 +17 @@
         $this->_primaryKey = $primaryKey;
         $this->_rowClass = $rowClass;
+        $this->_resultSetClass = $resultSetClass;
         $this->_db = new Database();
     }
@@ -47 +49 @@
      */
     public function _createResultSet($array) {
-        return new Database_Resultset($this, $array);
+        if ($this->_resultSetClass == '') {
+            return new Database_Resultset($this, $array);
+        } else {
+            return new $this->_resultSetClass($this, $array);
+        }
     }
     
@@ -118 +124 @@
         $query = $this->_db->queryBuilder()
             ->select($this->_table)
-            ->where($column, $value);
+            ->where(array($column => $value));
         
         return $this->_createResultSet($this->_db->queryFetchAll($query));