--- a/myway/myway_timeliness_calculate.php
+++ b/myway/myway_timeliness_calculate.php
@@ -30,7 +30,7 @@
 //collect all observation not in delta
 $query = "select * from myway_observations INNER JOIN myway_stops
 ON myway_observations.myway_stop=myway_stops.myway_stop INNER JOIN myway_routes
-ON myway_observations.myway_route=myway_routes.myway_route
+ON myway_observations.myway_route=myway_routes.myway_route 
  WHERE observation_id NOT IN
 (
 SELECT  observation_id
@@ -51,95 +51,118 @@
     //var_dump($obsv);
     echo "<h3>Observation {$obsv['observation_id']}:</h1>
 <small>{$obsv['myway_stop']} @ {$obsv['time']} on {$obsv['myway_route']}</small><br>";
-    if ($obsv["stop_code"] == "") {
-        echo "error, stop '{$obsv['myway_stop']}' unknown";
-        continue;
-    }
-    if ($obsv["route_full_name"] == "") {
-        echo "error, route '{$obsv['myway_route']}' unknown";
-        continue;
-    }
     // convert timestamp into time of day and date
 // timezones from http://www.postgresql.org/docs/8.0/static/datetime-keywords.html
     $time = date("H:i:s", strtotime($obsv['time']));
     $time_tz = date("H:i:s", strtotime($obsv['time'])) . " AESST";
-    $search_time = date("H:i:s", strtotime($obsv['time']) - (30 * 60)); // 30 minutes margin
+    $search_time = date("H:i:s", strtotime($obsv['time']) - (60 * 60)); // 30 minutes margin
     $date = date("c", strtotime($obsv['time']));
     $timing_period = service_period(strtotime($date));
-    $potentialStops = getStopsByStopCode($obsv["stop_code"], $obsv["stop_street"]);
+    
+    // little hack for public holidays nolonger active; weekdays and 900+ route numbers don't make sense
+    if ($timing_period == "weekday" && preg_match('/9../',$obsv["route_short_name"]))  {
+        echo "Potential public holiday detected, trying Sunday timetable.<br>";
+        
+        $timing_period = "sunday";
+    }
+    
+    if (isset($obsv["stop_id"]) && $obsv["stop_id"] != "" && $obsv["stop_id"] != "*") {
+    $potentialStops = Array(getStop($obsv["stop_id"]));
+    } else {
+        echo "No stop_id recorded for this stop_name, potential stops are a bus station<br>";
+        $potentialStops = getStops("",  trim(str_replace(Array("Arrival","Arrivals","Arrive Platform 3 Set down only.","Arrive","Set Down Only"), "", $obsv["myway_stop"])));
+    }
     //:get myway_stops records
     //:search by starts with stopcode and starts with street if street is not null
     //no result, skip and display error
     if (sizeof($potentialStops) < 1) {
-        echo "error, potential stops for stopcode {$obsv["stop_code"]} street {$obsv["stop_street"]} unknown";
+        echo "error, potential stops for stopid {$obsv["stop_id"]} unknown";
         continue;
     }
     //print out stops
     echo "Matched stops: ";
-    foreach ($potentialStops as $potentialStop)
-        echo $potentialStop['stop_code'] . " ";
+    foreach ($potentialStops as $potentialStop) {
+        echo $potentialStop['stop_id'] . " " . $potentialStop['stop_name'] . " ";
+    }
     echo "<br>";
     //:get myway_route record
     //no result, skip and display error
     //print out route
-    $potentialRoute = getRouteByFullName($obsv["route_full_name"]);
-    if ($potentialRoute["route_short_name"] == "") {
-        echo "error, route '{$obsv["route_full_name"]}' unknown";
+    $potentialRoutes = getRoutesByShortName($obsv["route_short_name"]);
+    if (sizeof($potentialRoutes) < 1) {
+        echo "error, route '{$obsv["myway_route"]}' unknown";
         continue;
     }
-    echo "Matched route: {$potentialRoute['route_short_name']}{$potentialRoute['route_long_name']} {$timing_period}<br>";
     $timeDeltas = Array();
-    foreach ($potentialStops as $potentialStop) {
-        $stopRoutes = getStopRoutes($potentialStop['stop_id'], $timing_period);
-        $foundRoute = Array();
-        foreach ($stopRoutes as $stopRoute) {
-            //Check if this route stops at each stop
-            if ($stopRoute['route_short_name'] . $stopRoute['route_long_name'] == $obsv["route_full_name"]) {
-                echo "Matching route {$stopRoute['route_id']} found at {$potentialStop['stop_code']}<br>";
-                $foundRoute = $stopRoute;
-                //if does get tripstoptimes for this route
-                $trips = getStopTrips($potentialStop['stop_id'], $timing_period, $search_time);
-                foreach ($trips as $trip) {
-                    //echo $trip['route_id']." ".$stopRoute['route_id'].";";
-                    if ($trip['route_id'] == $stopRoute['route_id']) {
-                        $timedTrip = getTimeInterpolatedTripAtStop($trip['trip_id'], $trip['stop_sequence']);
-                        $actual_time = strtotime($time);
-                        $trip_time = strtotime($timedTrip['arrival_time']);
-                        $timeDiff = $actual_time - $trip_time;
-                        //work out time delta, put into array with index of delta
-                        $timeDeltas[] = Array(
-                            "timeDiff" => $timeDiff,
-                            "stop_code" => $potentialStop['stop_code'],
-                            "stop_sequence" => $timedTrip['stop_sequence']
-                        );
-                        echo "Found trip {$trip['trip_id']} at stop {$potentialStop['stop_code']} (#{$potentialStop['stop_id']}, sequence #{$trip['stop_sequence']})<br>";
-                        echo "Arriving at {$timedTrip['arrival_time']}, difference of " . round($timeDiff / 60, 2) . " minutes<br>";
+    foreach ($potentialRoutes as $potentialRoute) {
+        echo "Matched route: {$potentialRoute['route_id']} {$potentialRoute['route_short_name']}{$potentialRoute['route_long_name']} {$timing_period}<br>";
+        foreach ($potentialStops as $potentialStop) {
+            $stopRoutes = getStopRoutes($potentialStop['stop_id'], $timing_period);
+            $foundRoute = Array();
+            foreach ($stopRoutes as $stopRoute) {
+                //Check if this route stops at each stop
+                if ($stopRoute['route_id'] == $potentialRoute['route_id']) {
+                    echo "Matching route {$stopRoute['route_id']} found at stop #{$potentialStop['stop_id']}<br>";
+                    $foundRoute = $stopRoute;
+                    //if does get tripstoptimes for this route
+                    $trips = getStopTrips($potentialStop['stop_id'], $timing_period, $search_time, 10, $potentialRoute['route_short_name']);
+                    foreach ($trips as $trip) {
+                        //echo $trip['route_id']." ".$stopRoute['route_id'].";";
+                        if ($trip['route_id'] == $stopRoute['route_id']) {
+                            $timedTrip = getTripAtStop($trip['trip_id'], $trip['stop_sequence']);
+                            $actual_time = strtotime($time);
+                            $trip_time = strtotime($timedTrip['arrival_time']);
+                            $timeDiff = $actual_time - $trip_time;
+                            //work out time delta, put into array with index of delta
+                            $timeDeltas[] = Array(
+                                "timeDiff" => $timeDiff,
+                                "stop_id" => $potentialStop['stop_id'],
+                                "stop_sequence" => $trip['stop_sequence'],
+                                "route_name" => "{$trip['route_short_name']} {$trip['trip_headsign']}",
+                                "route_id" => $trip['route_id']
+                            );
+                            echo "Found trip {$trip['trip_id']} at stop {$potentialStop['stop_id']} (#{$potentialStop['stop_name']}, sequence #{$trip['stop_sequence']})<br>";
+                            echo "Arriving at {$timedTrip['arrival_time']}, difference of " . round($timeDiff / 60, 2) . " minutes<br>";
+                        } else {
+                            echo "{$trip['route_id']} != {$stopRoute['route_id']}<br>";
+                        }
                     }
+                    if (sizeof($timeDeltas) == 0) echo "Error, no trips found.<bR>";
+                    break; // because have found route
                 }
-                break; // because have found route
+            }
+            if (sizeof($foundRoute) < 1) {
+                //print out that stops/does not stop
+                echo "No matching routes found at {$potentialStop['stop_id']}<br>";
+                //var_dump($stopRoutes);
+                flush();
             }
         }
-        if (sizeof($foundRoute) < 1) {
-            //print out that stops/does not stop
-            echo "No matching routes found at {$potentialStop['stop_code']}<br>";
-            var_dump($stopRoutes);
-            flush();
-        }
     }
+    
     //   lowest delta is recorded delta
     usort($timeDeltas, "abssort");
     $lowestDelta = $timeDeltas[0]["timeDiff"];
     if (sizeof($timeDeltas) != 0) {
+        if (abs($lowestDelta) > 9999) {
+             echo "Difference of " . round($lowestDelta / 60, 2) . " minutes is too high. Will not record this observation<br>";
+        } else {
         echo "Lowest difference of " . round($lowestDelta / 60, 2) . " minutes will be recorded for this observation<br>";
+        
         $observation_id = $obsv['observation_id'];
-        $route_full_name = $obsv['route_full_name'];
-        $stop_code = $timeDeltas[0]["stop_code"];
+        
+        $route_name = $timeDeltas[0]["route_name"];
+        $route_id = $timeDeltas[0]["route_id"];
+        $stop_id = $timeDeltas[0]["stop_id"];
+        $myway_stop = $obsv["myway_stop"];
         $stop_sequence = $timeDeltas[0]["stop_sequence"];
-        $stmt = $conn->prepare("insert into myway_timingdeltas (observation_id, route_full_name, stop_code, timing_delta, time, date, timing_period, stop_sequence)
-				      values (:observation_id, :route_full_name, :stop_code, :timing_delta, :time, :date, :timing_period, :stop_sequence)");
+        $stmt = $conn->prepare("insert into myway_timingdeltas (observation_id, route_id, stop_id, timing_delta, time, date, timing_period, stop_sequence,myway_stop,route_name)
+				      values (:observation_id, :route_id, :stop_id, :timing_delta, :time, :date, :timing_period, :stop_sequence,:myway_stop,:route_name)");
         $stmt->bindParam(':observation_id', $observation_id);
-        $stmt->bindParam(':route_full_name', $route_full_name);
-        $stmt->bindParam(':stop_code', $stop_code);
+        $stmt->bindParam(':route_id', $route_id);
+        $stmt->bindParam(':route_name', $route_name);
+        $stmt->bindParam(':stop_id', $stop_id);
+        $stmt->bindParam(':myway_stop', $myway_stop);
         $stmt->bindParam(':timing_delta', $lowestDelta);
         $stmt->bindParam(':time', $time_tz);
         $stmt->bindParam(':date', $date);
@@ -152,6 +175,8 @@
         }
         var_dump($conn->errorInfo());
         flush();
+       
+        }
     }
     flush();
 }