From 57347ffab50aa1901793b2083443882de16d3413 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Mon, 31 May 2010 13:25:38 +0100
Subject: [PATCH 01/23] Accepts old UUIDs in the URL

---
 predict/ajax.php   |  2 +-
 predict/index.php  | 16 ++++++++++------
 predict/js/pred.js |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/predict/ajax.php b/predict/ajax.php
index 9bd9e1d..2dc9921 100644
--- a/predict/ajax.php
+++ b/predict/ajax.php
@@ -6,7 +6,7 @@ $action = $_GET['action'];
 switch($action) {
 case "getCSV":
     $uuid = $_GET['uuid'];
-    $fh = fopen("preds/".$uuid."/flight_path.csv", "r");
+    $fh = fopen("preds/".$uuid."/flight_path.csv", "r") or die("No CSV for UUID");
     $data = array();
     while (!feof($fh)) {
         $line = trim(fgets($fh));
diff --git a/predict/index.php b/predict/index.php
index b45972b..13b2731 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -21,7 +21,7 @@ google.load("jqueryui", "1.8.1");
 <script type="text/javascript">
 
 var ajaxEventHandle;
-var running_uuid = '<?php echo ( isset($_GET['uuid'])? $_GET['uuid'] : "0" ); ?>';
+var current_uuid = '<?php echo ( isset($_GET['uuid'])? $_GET['uuid'] : "0" ); ?>';
 
 var map;
 var map_items = [];
@@ -49,18 +49,22 @@ function initialize() {
                 appendDebug("The server rejected the submitted form data");
             } else {
                 appendDebug("The server accepted the form data");
-                running_uuid = data_split[1];
-                appendDebug("The server gave us uuid:<br>" + running_uuid);
+                // update the global current_uuid variable
+                current_uuid = data_split[1];
+                appendDebug("The server gave us uuid:<br>" + current_uuid);
                 appendDebug("Starting to poll for progress JSON");
-                handlePred(running_uuid);
+                handlePred(current_uuid);
             }
         }
     });
     //$("#input_form").draggable({containment: '#map_canvas'});
-    // if ( running_uuid != 0 ) handlePred(running_uuid);
+    if ( current_uuid != '0' ) {
+        appendDebug("Got an old UUID to plot:<br>" + current_uuid);
+        appendDebug("Trying to get flight path from server...");
+        getCSV(current_uuid);
+    }
     $("#debuginfo").hide();
     $("#showHideDebug").click(function() {
-        // $("#debuginfo").show("slide", { direction: "down" }, 500);
         toggleDebugWindow();
     });
 }
diff --git a/predict/js/pred.js b/predict/js/pred.js
index 0612c9f..07ddabc 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -77,7 +77,7 @@ function processProgress(progress) {
                 // stop polling for JSON
                 clearInterval(ajaxEventHandle);
                 // parse the data
-                getCSV(running_uuid);
+                getCSV(current_uuid);
             } else if ( progress['pred_running'] != true ) {
                 $("#prediction_status").html("Waiting for predictor to run...");
                 appendDebug("Server says: predictor not yet running...");
@@ -188,8 +188,8 @@ function parseCSV(lines) {
 }
 
 function clearMapItems() {
+    if(map_items.length > 0) {
     appendDebug("Clearing previous map trace");
-    if(map_items) {
         for(i in map_items) {
             map_items[i].setMap(null);
         }

From 1aa1ca8d4ca3789b0eb3512b6f9ce3316c035ac9 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Mon, 31 May 2010 14:11:18 +0100
Subject: [PATCH 02/23] Made getModelByUUID PHP function

---
 predict/ajax.php     | 20 ++++++++++++++++++++
 predict/css/pred.css | 26 ++++++++++++++++++++------
 predict/index.php    | 15 ++++++++++-----
 3 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/predict/ajax.php b/predict/ajax.php
index 2dc9921..8ba5e4a 100644
--- a/predict/ajax.php
+++ b/predict/ajax.php
@@ -25,6 +25,26 @@ case "JSONexists":
     }
     break;
 
+case "getModelByUUID":
+    $uuid = ( isset($_GET['uuid']) ? $_GET['uuid'] : false );
+    if( !uuid ) die ("No uuid given to getModelByUUID");
+    // make a new model
+    $pred_model = array();
+    if ( !file_exists("preds/".$uuid."/scenario.ini") ) {
+        $pred_model['valid'] = false;
+    } else {
+        // populate the array, JSON encode it and return
+        $pred_model = parse_ini_file("preds/".$uuid."/scenario.ini");
+        if ( verifyModel($pred_model) ){
+            $pred_model['valid'] == true;
+        } else {
+            $pred_model['valid'] == false;
+        }
+        $pred_model['uuid'] = $uuid;
+    }
+    echo json_encode($pred_model);
+    break;
+
 case "submitForm":
     $software_available = array("gfs", "gfs_hd");
 
diff --git a/predict/css/pred.css b/predict/css/pred.css
index 71d75d1..77b2f93 100644
--- a/predict/css/pred.css
+++ b/predict/css/pred.css
@@ -8,10 +8,7 @@ body {
 	margin: 0; padding: 0;
 }
 
-a:link { text-decoration: underline; color: #333 }
-a:active { text-decoration: underline; color: #333; }
-a:hover { text-decoration: underline; color: #333; }
-a:visited { text-decoration: underline; color: #333; }
+a { text-decoration: underline; color: #333; cursor: pointer; }
 
 /* The whoppping map in the centre */
 #map_canvas { width: 100%; height: 100%; }
@@ -75,11 +72,28 @@ a:visited { text-decoration: underline; color: #333; }
 }
 
 #input_form {
-    right: 0; bottom: 0;
     border-right: none;
     border-bottom: none;
-    width: 400px;
     height:350px;
+    width: 400px;
+    padding: 5px;
+}
+
+#scenario_info {
+    border-right: none;
+    height:100px;
+    width: 400px;
+    padding: 5px;
+    top: -115px;
+    overflow: hidden;
+}
+
+
+#bottom_right {
+    right: 0;
+    bottom: 0;
+    width: 400px;
+    padding: 0px;
 }
 
 td.right-td {
diff --git a/predict/index.php b/predict/index.php
index 13b2731..ad18887 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -79,7 +79,7 @@ function initialize() {
 
 <div id="scenario_template" class="box">
 <h1>Debug Window - 
-<a href='#'><span id="showHideDebug">Show</span></a></span>
+<a><span id="showHideDebug">Show</span></a></span>
 </h1>
 <span id="debuginfo">No Messages</span>
 </div>
@@ -91,7 +91,12 @@ function initialize() {
 <div id="prediction_status"></div>
 </div>
 
-<div id="input_form" class="box"> 
+<div id="bottom_right" class="box">
+<div id="scenario_info" class="box">
+info on scenario
+</div>
+
+<div id="input_form"> 
 <form action="" id="modelForm" name="modelForm">
 <table>
 	<tr>
@@ -161,8 +166,8 @@ function initialize() {
     <tr>
         <td>Landing prediction software: <td>
         <select id="software" name="software">
-            <option value="gfs" selected="selected">GFS (faster, less accurate)</option>
-            <option value="gfs_hd">GFS HD (slower, more accurate)</option>
+            <option value="gfs" selected="selected">GFS</option>
+            <option value="gfs_hd">GFS HD</option>
         </select>
 	<tr>
                 <td>
@@ -171,7 +176,7 @@ function initialize() {
 	</tr>
 </table>
 </form>
-</div>
+</div></div>
 
 
 </body>

From d3ace2f023fa0af1c4be15191d3c8fdf9c3320fc Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Mon, 31 May 2010 16:33:52 +0100
Subject: [PATCH 03/23] Moved window controls, autoscrolling debug window
 limited in height

---
 predict/ajax.php     |  6 +++---
 predict/css/pred.css | 18 +++++++-----------
 predict/index.php    | 32 ++++++++++++++++++++------------
 predict/js/pred.js   | 40 ++++++++++++++++++++++++++++++++++------
 4 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/predict/ajax.php b/predict/ajax.php
index 8ba5e4a..263ad04 100644
--- a/predict/ajax.php
+++ b/predict/ajax.php
@@ -3,6 +3,8 @@ require_once("includes/functions.inc.php");
 
 $action = $_GET['action'];
 
+$software_available = array("gfs", "gfs_hd");
+
 switch($action) {
 case "getCSV":
     $uuid = $_GET['uuid'];
@@ -35,7 +37,7 @@ case "getModelByUUID":
     } else {
         // populate the array, JSON encode it and return
         $pred_model = parse_ini_file("preds/".$uuid."/scenario.ini");
-        if ( verifyModel($pred_model) ){
+        if ( verifyModel($pred_model, $software_available) ){
             $pred_model['valid'] == true;
         } else {
             $pred_model['valid'] == false;
@@ -46,8 +48,6 @@ case "getModelByUUID":
     break;
 
 case "submitForm":
-    $software_available = array("gfs", "gfs_hd");
-
     $pred_model = array();
 
     if ( isset($_POST['submit'])) {
diff --git a/predict/css/pred.css b/predict/css/pred.css
index 77b2f93..7891b21 100644
--- a/predict/css/pred.css
+++ b/predict/css/pred.css
@@ -69,6 +69,8 @@ a { text-decoration: underline; color: #333; cursor: pointer; }
 	left: 0; bottom: 0; 
 	border-left: none;
 	border-bottom: none;
+        max-height: 400px;
+        overflow: scroll;
 }
 
 #input_form {
@@ -77,25 +79,19 @@ a { text-decoration: underline; color: #333; cursor: pointer; }
     height:350px;
     width: 400px;
     padding: 5px;
+    bottom: 0; right: 0;
 }
 
 #scenario_info {
+    position: absolute;
+    top: 25px;
+    right: 0px;
     border-right: none;
-    height:100px;
+    height:70px;
     width: 400px;
-    padding: 5px;
-    top: -115px;
-    overflow: hidden;
 }
 
 
-#bottom_right {
-    right: 0;
-    bottom: 0;
-    width: 400px;
-    padding: 0px;
-}
-
 td.right-td {
 	text-align: right;
 }
diff --git a/predict/index.php b/predict/index.php
index ad18887..00b1e96 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -57,15 +57,24 @@ function initialize() {
             }
         }
     });
-    //$("#input_form").draggable({containment: '#map_canvas'});
+    $("#input_form").draggable({containment: '#map_canvas'});
     if ( current_uuid != '0' ) {
         appendDebug("Got an old UUID to plot:<br>" + current_uuid);
+        appendDebug("Trying to populate form with scenario data");
+        populateFormByUUID(current_uuid);
         appendDebug("Trying to get flight path from server...");
         getCSV(current_uuid);
     }
-    $("#debuginfo").hide();
+    $("#scenario_template").hide();
     $("#showHideDebug").click(function() {
-        toggleDebugWindow();
+        toggleWindow("scenario_template", "showHideDebug", "Show Debug", "Hide Debug");
+    });
+    $("#showHideDebug_status").click(function() {
+        toggleWindow("scenario_template", "showHideDebug", "Show Debug", "Hide Debug");
+    });
+    $("#showHideForm").click(function() {
+        toggleWindow("input_form", "showHideForm", "Show Launch Card",
+            "Hide Launch Card");
     });
 }
 
@@ -78,9 +87,7 @@ function initialize() {
 <div id="map_canvas" style="width:100%; height:100%"></div>
 
 <div id="scenario_template" class="box">
-<h1>Debug Window - 
-<a><span id="showHideDebug">Show</span></a></span>
-</h1>
+<h1>Debug Window</h1>
 <span id="debuginfo">No Messages</span>
 </div>
 
@@ -88,15 +95,17 @@ function initialize() {
 <div id="prediction_progress"></div>
 <div id="prediction_percent"></div>
 <br>
-<div id="prediction_status"></div>
+<span id="prediction_status"></span><br>
+<a><span id="showHideDebug_status">Toggle Debug</span></a></span>
 </div>
 
-<div id="bottom_right" class="box">
 <div id="scenario_info" class="box">
-info on scenario
+<h1>Scenario Information</h1>
+<a><span id="showHideDebug">Show Debug</span></a></span> | 
+<a><span id="showHideForm">Hide Launch Card</span></a></span>
 </div>
 
-<div id="input_form"> 
+<div id="input_form" class="box"> 
 <form action="" id="modelForm" name="modelForm">
 <table>
 	<tr>
@@ -176,8 +185,7 @@ info on scenario
 	</tr>
 </table>
 </form>
-</div></div>
-
+</div>
 
 </body>
 </html>
diff --git a/predict/js/pred.js b/predict/js/pred.js
index 07ddabc..aeb6602 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -21,9 +21,22 @@ function predSub() {
     $("#status_message").fadeIn(250);
 }
 
+function populateFormByUUID(pred_uuid) {
+    $.get("ajax.php", { "action":"getModelByUUID", "uuid":pred_uuid }, function(data) {
+        if ( !data.valid ) {
+            appendDebug("Populating form by UUID failed");
+            appendDebug("The server said the model it made was invalid");
+        } else {
+            // we're good to go, populate the form
+            alert(data);
+        }
+    }, 'json');
+}
+
 function handlePred(pred_uuid) {
     $("#prediction_status").html("Searching for wind data...");
     $("#input_form").hide("slide", { direction: "down" }, 500);
+    $("#scenario_info").hide("slide", { direction: "up" }, 500);
     $("#map_canvas").fadeTo(1000, 0.2);
     // ajax to poll for progress
     ajaxEventHandle = setInterval("getJSONProgress('"+pred_uuid+"')", 2000);
@@ -70,6 +83,9 @@ function processProgress(progress) {
                 $("#prediction_percent").html("");
                 // bring the input form back up
                 $("#input_form").show("slide", { direction: "down" }, 500);
+                $("#scenario_info").show("slide", { direction: "up" }, 500);
+                toggleWindow("scenario_template", "showHideDebug", "Show Debug",
+                        "Hide Debug", "hide");
                 // un-fade the map canvas
                 $("#map_canvas").fadeTo(1500, 1);
                 appendDebug("Server says: the predictor finished running.");
@@ -205,16 +221,28 @@ function appendDebug(appendage, clear) {
     } else {
         $("#debuginfo").html("");
     }
+    // keep the debug window scrolled to bottom
+    $("#scenario_template").animate({scrollTop: $('#scenario_template')[0].scrollHeight});
 }
 
-function toggleDebugWindow() {
-        if( $("#debuginfo").css('display') != "none" ){
-                $("#debuginfo").hide("slide", { direction: "down" }, 500);
-                $("#showHideDebug").html("Show");
+function toggleWindow(window_name, linker, onhide, onshow, force) {
+    if ( force == null ) {
+        if( $("#"+window_name).css('display') != "none" ){
+            $("#"+window_name+"").hide("slide", { direction: "down" }, 500);
+            $("#"+linker).html(onhide);
         } else {
-                $("#debuginfo").show("slide", { direction: "down" }, 500);
-                $("#showHideDebug").html("Hide");
+            $("#"+window_name).show("slide", { direction: "down" }, 500);
+            $("#"+linker).html(onshow);
         }
+    } else if ( force == "hide" ) {
+        $("#"+window_name+"").hide("slide", { direction: "down" }, 500);
+        $("#"+linker).html(onhide);
+    } else if ( force == "show") {
+        $("#"+window_name).show("slide", { direction: "down" }, 500);
+        $("#"+linker).html(onshow);
+    } else {
+        appendDebug("toggleWindow force parameter unrecognised");
+    }
 }
 
 // launch site dropdown switcher

From 2ffc36d4eabd6ca25c72214418f9382a7520195f Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Mon, 31 May 2010 16:40:36 +0100
Subject: [PATCH 04/23] Made a function for scrolling div to bottom

---
 predict/js/pred.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/predict/js/pred.js b/predict/js/pred.js
index aeb6602..80dd5b5 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -222,7 +222,11 @@ function appendDebug(appendage, clear) {
         $("#debuginfo").html("");
     }
     // keep the debug window scrolled to bottom
-    $("#scenario_template").animate({scrollTop: $('#scenario_template')[0].scrollHeight});
+    scrollToBottom("scenario_template");
+    }
+
+function scrollToBottom(div_id) {
+    $("#"+div_id).animate({scrollTop: $("#"+div_id)[0].scrollHeight});
 }
 
 function toggleWindow(window_name, linker, onhide, onshow, force) {

From 29d519535ed8d729834fe7595f7f1ab3e4784859 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Mon, 31 May 2010 23:46:11 +0100
Subject: [PATCH 05/23] Added scale to map closes #30

---
 predict/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/predict/index.php b/predict/index.php
index 00b1e96..952113a 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -34,6 +34,8 @@ function initialize() {
     var latlng = new google.maps.LatLng(52, 0);
     var myOptions = {
       zoom: 8,
+      scaleControl: true,
+      scaleControlOptions: { position: google.maps.ControlPosition.BOTTOM_LEFT } ,
       center: latlng,
       mapTypeId: google.maps.MapTypeId.ROADMAP
     };

From 3d2af0121c6e913b0986c551aec2726d5bd5294f Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Tue, 1 Jun 2010 20:00:21 +0100
Subject: [PATCH 06/23] Map is terrain view by default closes #31

---
 predict/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/predict/index.php b/predict/index.php
index 952113a..4c45b14 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -36,11 +36,11 @@ function initialize() {
       zoom: 8,
       scaleControl: true,
       scaleControlOptions: { position: google.maps.ControlPosition.BOTTOM_LEFT } ,
+      mapTypeId: google.maps.MapTypeId.TERRAIN,
       center: latlng,
-      mapTypeId: google.maps.MapTypeId.ROADMAP
     };
     map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);
-    // submit the form here
+    // attach form submit event handler to launch card
     $("#modelForm").ajaxForm({
         url: 'ajax.php?action=submitForm',
         type: 'POST',

From e30fce5879ed34f28888ac9a9e5cc55d78ed172f Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Thu, 3 Jun 2010 15:48:43 +0100
Subject: [PATCH 07/23] Auto pan to new launch location after prediction run
 closes #25

---
 predict/js/pred.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/predict/js/pred.js b/predict/js/pred.js
index 80dd5b5..0dc4786 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -86,6 +86,8 @@ function processProgress(progress) {
                 $("#scenario_info").show("slide", { direction: "up" }, 500);
                 toggleWindow("scenario_template", "showHideDebug", "Show Debug",
                         "Hide Debug", "hide");
+                // move map to new location
+                // map.panTo(
                 // un-fade the map canvas
                 $("#map_canvas").fadeTo(1500, 1);
                 appendDebug("Server says: the predictor finished running.");
@@ -199,6 +201,9 @@ function parseCSV(lines) {
     map_items.push(pop_marker);
     map_items.push(path_polyline);
 
+    // pan to the new position
+    map.panTo(launch_pt);
+
     return true;
 
 }

From 6e62e5b81647a4ea77855b212e4ea4b553851a45 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Thu, 3 Jun 2010 17:05:07 +0100
Subject: [PATCH 08/23] User selection of lat/lon deltas closes #19

---
 predict/css/pred.css               |  2 +-
 predict/includes/functions.inc.php | 17 ++++++++++++-----
 predict/index.php                  | 17 ++++++++++++++++-
 predict/js/pred.js                 | 21 ++++++++++++++++++---
 4 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/predict/css/pred.css b/predict/css/pred.css
index 7891b21..fdd4c9e 100644
--- a/predict/css/pred.css
+++ b/predict/css/pred.css
@@ -76,7 +76,7 @@ a { text-decoration: underline; color: #333; cursor: pointer; }
 #input_form {
     border-right: none;
     border-bottom: none;
-    height:350px;
+    height:370px;
     width: 400px;
     padding: 5px;
     bottom: 0; right: 0;
diff --git a/predict/includes/functions.inc.php b/predict/includes/functions.inc.php
index 69ad273..b179897 100644
--- a/predict/includes/functions.inc.php
+++ b/predict/includes/functions.inc.php
@@ -25,6 +25,9 @@ function createModel($post_array) {
     $pred_model['burst'] = $post_array['burst'];
     $pred_model['float'] = $post_array['float_time'];
 
+    $pred_model['delta_lat'] = $post_array['delta_lat'];
+    $pred_model['delta_lon'] = $post_array['delta_lon'];
+
     $pred_model['wind_error'] = 0;
 
     $pred_model['software'] = $post_array['software'];
@@ -55,10 +58,10 @@ function verifyModel($pred_model, $software_available) {
     foreach($pred_model as $idx => $value) {
         if ($idx == "software") {
             if (!in_array($value, $software_available)) return false;
-        } else {
-            if (!is_numeric($value)) {
-                return false;
-            }
+        } else if ($idx == "delta_lat" || $idx == "delta_lon") {
+            if ( $value < 1 || $value > 10 ) return false;
+        } else if (!is_numeric($value)) {
+            return false;
         }
     }
     return true;
@@ -77,7 +80,11 @@ function runPred($pred_model) {
 
     // use `at` to automatically background the task
     $ph = popen("at now", "w");
-    fwrite($ph, "cd /var/www/hab/predict/ && ./predict.py -v --latdelta=3 --londelta=3 -p1 -f5 -t ".$pred_model['timestamp']." --lat=".$predictor_lat." --lon=".$predictor_lon." " . $use_hd . $pred_model['uuid']);
+    fwrite($ph, "cd /var/www/hab/predict/ && ./predict.py -v --latdelta="
+        .$pred_model['delta_lat']." --londelta=".$pred_model['delta_lon']
+        ." -p1 -f5 -t ".$pred_model['timestamp']
+        ." --lat=".$predictor_lat." --lon=".$predictor_lon." " . $use_hd
+        . $pred_model['uuid']);
     fclose($ph);
 
 }
diff --git a/predict/index.php b/predict/index.php
index 4c45b14..034055c 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -103,6 +103,7 @@ function initialize() {
 
 <div id="scenario_info" class="box">
 <h1>Scenario Information</h1>
+<span id="from_launch_lat">
 <a><span id="showHideDebug">Show Debug</span></a></span> | 
 <a><span id="showHideForm">Hide Launch Card</span></a></span>
 </div>
@@ -175,11 +176,25 @@ function initialize() {
         <td><input id="float" type="text" name="float_time" value="0"></td>
     </tr>
     <tr>
-        <td>Landing prediction software: <td>
+        <td>Landing prediction software: </td><td>
         <select id="software" name="software">
             <option value="gfs" selected="selected">GFS</option>
             <option value="gfs_hd">GFS HD</option>
+        </select></td></tr>
+        <tr><td>Lat/Lon Deltas: </td>
+        <td>Lat: 
+        <select id="delta_lat" name="delta_lat">
+            <option value="3" selected="selected">3</option>
+            <option value="5">5</option>
+            <option value="10">10</option>
+        </select>&nbsp;Lon: 
+        <select id="delta_lon" name="delta_lon">
+            <option value="3" selected="selected">3</option>
+            <option value="5">5</option>
+            <option value="10">10</option>
         </select>
+        </td>
+        </tr>
 	<tr>
                 <td>
                 </td>
diff --git a/predict/js/pred.js b/predict/js/pred.js
index 0dc4786..7aa6d14 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -37,10 +37,10 @@ function handlePred(pred_uuid) {
     $("#prediction_status").html("Searching for wind data...");
     $("#input_form").hide("slide", { direction: "down" }, 500);
     $("#scenario_info").hide("slide", { direction: "up" }, 500);
+    // disable user control of the map canvas
     $("#map_canvas").fadeTo(1000, 0.2);
     // ajax to poll for progress
     ajaxEventHandle = setInterval("getJSONProgress('"+pred_uuid+"')", 2000);
-    //getCSV(pred_uuid);
 }
 
 function getCSV(pred_uuid) {
@@ -86,8 +86,6 @@ function processProgress(progress) {
                 $("#scenario_info").show("slide", { direction: "up" }, 500);
                 toggleWindow("scenario_template", "showHideDebug", "Show Debug",
                         "Hide Debug", "hide");
-                // move map to new location
-                // map.panTo(
                 // un-fade the map canvas
                 $("#map_canvas").fadeTo(1500, 1);
                 appendDebug("Server says: the predictor finished running.");
@@ -203,11 +201,28 @@ function parseCSV(lines) {
 
     // pan to the new position
     map.panTo(launch_pt);
+    map.setZoom(8);
 
     return true;
 
 }
 
+function enableMap(map, state) {
+    if ( state != false && state != true) {
+        appendDebug("Unrecognised map state");
+    } else if (state == false) {
+        map.draggable = false;
+        map.disableDoubleClickZoom = true;
+        map.scrollwheel = false;
+        map.navigationControl = false;
+    } else if (state == true ) {
+        map.draggable = true;
+        map.disableDoubleClickZoom = false;
+        map.scrollwheel = false;
+        map.navigationControl = true;
+    }
+}
+
 function clearMapItems() {
     if(map_items.length > 0) {
     appendDebug("Clearing previous map trace");

From 8209d2dbbec838bf0149695a32f01b99a5141b31 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Thu, 3 Jun 2010 19:49:06 +0100
Subject: [PATCH 09/23] Click to set launch location, auto pan to new, new
 icons

---
 predict/css/pred.css               |   5 ++-
 predict/images/balloon-sm.png      | Bin 0 -> 575 bytes
 predict/images/marker-sm-black.png | Bin 0 -> 432 bytes
 predict/images/target-1-sm.png     | Bin 0 -> 521 bytes
 predict/images/target-8-sm.png     | Bin 0 -> 557 bytes
 predict/index.php                  |  26 ++++++++++--
 predict/js/pred.js                 |  61 +++++++++++++++++++++++++----
 7 files changed, 79 insertions(+), 13 deletions(-)
 create mode 100644 predict/images/balloon-sm.png
 create mode 100644 predict/images/marker-sm-black.png
 create mode 100644 predict/images/target-1-sm.png
 create mode 100644 predict/images/target-8-sm.png

diff --git a/predict/css/pred.css b/predict/css/pred.css
index fdd4c9e..2973fce 100644
--- a/predict/css/pred.css
+++ b/predict/css/pred.css
@@ -11,7 +11,10 @@ body {
 a { text-decoration: underline; color: #333; cursor: pointer; }
 
 /* The whoppping map in the centre */
-#map_canvas { width: 100%; height: 100%; }
+#map_canvas {
+    width: 100%;
+    height: 100%;
+}
 
 #status_message{
     position: absolute;
diff --git a/predict/images/balloon-sm.png b/predict/images/balloon-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..a75e18c3aae0e039231ff0d615ca73e73a682d5b
GIT binary patch
literal 575
zcmV-F0>J%=P)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igV$
z5+V-0EYqF<00F;AL_t(2&ux%BXj4%Dg}?Xmqn0-PAt|&4t?r^##7)sj6hw;Hh@*(;
zCO9ex1wpWA!Ntv?#e%ES;81Gur-jl;OA|v(j71^7C$(u`l6&*+eb+%7QuM&tzHd0k
zVrT3VCr@2HbM{=atE)Ti{3sWvo=-mgl+C30PomeZ-+Y-~$(d|^%@n?t&Cm6USxT>%
z^B0Ei{6i-%UwO2g$(z+&$>a*(OmVGjTzA8GUe&yPw-5{t9ykqP|K+<!lF1w4a1;Q`
zvIqi0RW#VFHrTswzjg6a@-{#iAko`<{NSO(ySBFKL?RIYj4}91{i*NMKQM5#DfIRA
zcS@<yT4UQbT5Cd~5CB0C;QKzd9qMcf#lmODbsTo@X~VL>vLFb;7-P^{69fUZTJ?K#
zgXei4=I7s6j4>#sk+Ojh0x1PbDLP{9<a4>#t)oS1`qj8)Lo60UDMeif>Oumrw74iI
zCZ3G}gtl)jeJL)qcf^K=hK?k>num}Ar8OJB)_M5g{;g7}nA#x#Dw|oI?MWm?dgAdm
z-}l+9RCqEz_IU2i%;+}MDj=nBmp`VbZLDLi<3wLfP2QcGow?V_{08=C;H8r$bPfOj
N002ovPDHLkV1n#70=NJG

literal 0
HcmV?d00001

diff --git a/predict/images/marker-sm-black.png b/predict/images/marker-sm-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..34f4e0e1ebb7eeaa8fd016d94b180c423523d8b1
GIT binary patch
literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq000aC000aK0ssI2*%!;O00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RV1_Kf$5C~#;IsgCw8FWQhbVF}#
zZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0Ub$1K~xyijnOg6gD@Dz@wcf%r(|%5
zj?JD$boT&#ryRjU1e^pNdWo(DZ{bp013iLhq`}oCf*lIqxB6V*55MQM@B6lG^E^Ku
zkFM+9?>7KQDf2upiXw`lAPB&F-}k*zic*@UDIy|bmSv1FrBvVd-g_8^K`9l-vDVrc
zGmhgpj>Z_RbsWb^sbLt-jIrnQSrkRnG=z}P=d-RW=lpiNEz8oj?d5Vg0|2G8EK5Sj
z{eG|Ox@}wMT#_W$>-F_|P16Kn7$V{?A%p+`01!g_(uf#_A%O!UQp$OropYRXL=-{@
zArO&s?wqsMN-3eLD#n=B+Iw%UHO3fYthL^Itu>{zs;WZ-|Co%iEX#hFX_`_>|1eKS
aZutU1^}sQ9yS48C0000<MNUMnLSTYl&ac$~

literal 0
HcmV?d00001

diff --git a/predict/images/target-1-sm.png b/predict/images/target-1-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..7418dce39f14fe86c3797373b4676fe1bbe7d622
GIT binary patch
literal 521
zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RV1_Kf;H2k<0;{X5wn@L1LR2b6*
z!8=GBaU2Km@9%$JPJ)jL5_?INUVPx0=n#v=LN%xr0;1BP2<jjTiffmSExMF0LP2os
zQ0UaHg|?JdL=aJs_=wSf4~!So%AJo(Jd^wN^C1A}2(_b>?<#s8JbW1zo-Wz6yqg!9
zjlY-17j~SzudrFduO&<-_Mc6J+P?J%^|3nD-~70&yfNsw(JITHzA893%j~R5vGurb
zs<rcbq(QG0oe}22E>Nt4C{)klAT4lk)T^MdAqIn?krtn-;i=9XZ6!*i$o;VdPkV&Q
zXJ2z=zz+@lzDQTRF(Com6a;=Q1M{D8W1QmZ_afwvZ;2Z<1WtD9iWJK#fq4m1WWwPI
z?6WhNriJU{G>S9laJ(J{m_*u0Z(%P5H?hw=(2d*r8raoUp#B%Ib6LJlCCNZOE2%F1
z^P9Khl5tLW{)EM=K60aNxYGhS{4j^i;vb3^@(UD(ERB|^vk_7JrtDDwd0m4ogU#(Y
zT_m@$<7C%YfIb3%3dy4kx!z%oc}4}R4&Bo!=W<E#r(NLP8esef4hgK?7-ySx00000
LNkvXXu0mjfG3n()

literal 0
HcmV?d00001

diff --git a/predict/images/target-8-sm.png b/predict/images/target-8-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8bb701e63112edde7453a38febe8119e2242c1f
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RV1_Kf<3KsNOivR!s8FWQhbVF}#
zZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0h&ofK~xyi1;O2KOK}{);m^0{w5Lu>
zEE87MRA0s{MbvvGYBZ7tvCM@8HzM&5NW|3=;R08#gu97I<{uD(i$x?7k!;CqONnlr
zuHB5CvvxgBSN(Y&0q8Bp(Y0__S0OSa8S|taXqwd-YutWU8|{c&V$@Um^TYtp@}XR;
zkQ~{tXH)M#zs4^d*cTkEr`Co$Z=IXqJ=CUi>oy;}o_o17yDOE~j;iw%C~{mfq*Yn3
z_<nS1r}6v8ed)peD?PiTiNj=7o+C0%Szf949MiLM&%B|c-7!d-_w_*E`l3$@(9aIu
zs1H1n7nEB+dF_nxSPe^GCrKr`oYoz~4LdXmV92b@W3?Cfvtlz_x2VY?p_ZvY6JMpe
zF!_Z!rqnlejsen*t;AQiaG_nmTlLh}h9y)zS6hqmdue<9T18)!6Y7Avq|V5x)*(`E
zj0bZgjMXNjGqLhS*z4Dft37ws{@|^6cpDivjnNFMN&CB$mMmIR_GdmiX9a+6pTWhA
vmq`Tg5D7)Z(?!j<|59o`Wu|ePPfqne1P7wE>?+mh00000NkvXXu0mjfUKsJF

literal 0
HcmV?d00001

diff --git a/predict/index.php b/predict/index.php
index 034055c..cdf153d 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -25,9 +25,11 @@ var current_uuid = '<?php echo ( isset($_GET['uuid'])? $_GET['uuid'] : "0" ); ?>
 
 var map;
 var map_items = [];
-var launch_img = "images/marker-sm-red.png";
-var land_img = "images/marker-sm-red.png";
+var launch_img = "images/target-1-sm.png";
+var land_img = "images/target-8-sm.png";
 var burst_img = "images/pop-marker.png";
+var clickListener;
+var clickMarker;
 
 function initialize() {
     // make the map and set center
@@ -59,6 +61,20 @@ function initialize() {
             }
         }
     });
+    // activate the "Set with Map" link
+    $("#setWithClick").click(function() {
+        setLatLonByClick(true);
+    });
+    // attach onchange handlers to the lat/long boxes
+    $("#lat").change(function() {
+        plotClick();
+    });
+    $("#lon").change(function() {
+        plotClick();
+    });
+    $("#site").change(function() {
+        plotClick();
+    });
     $("#input_form").draggable({containment: '#map_canvas'});
     if ( current_uuid != '0' ) {
         appendDebug("Got an old UUID to plot:<br>" + current_uuid);
@@ -78,6 +94,8 @@ function initialize() {
         toggleWindow("input_form", "showHideForm", "Show Launch Card",
             "Hide Launch Card");
     });
+    // plot the initial launch location
+    plotClick();
 }
 
 
@@ -103,7 +121,7 @@ function initialize() {
 
 <div id="scenario_info" class="box">
 <h1>Scenario Information</h1>
-<span id="from_launch_lat">
+<span id="cursor_info">Lat: <span id="cursor_lat"></span> Lon: <span id="cursor_lon"></span></span><br />
 <a><span id="showHideDebug">Show Debug</span></a></span> | 
 <a><span id="showHideForm">Hide Launch Card</span></a></span>
 </div>
@@ -124,7 +142,7 @@ function initialize() {
 			</select>
 		</td>
 	<tr>
-		<td>Latitude:</td>
+		<td>Latitude: <a id="setWithClick">Set with map</a></td>
 		<td><input id="lat" type="text" name="lat" value="52.2135" onKeyDown="SetSiteOther()"></td>
 	</tr>
     <tr>
diff --git a/predict/js/pred.js b/predict/js/pred.js
index 7aa6d14..a51534c 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -122,6 +122,10 @@ function parseCSV(lines) {
     var path = [];
     var max_height = -10; //just any -ve number
     var max_point = null;
+    var launch_lat;
+    var launch_lon;
+    var land_lat;
+    var land_lon;
     var launch_pt;
     var land_pt;
         $.each(lines, function(idx, line) {
@@ -129,15 +133,15 @@ function parseCSV(lines) {
             if(entry.length >= 4) { // check valid entry length
                 var point = new google.maps.LatLng( parseFloat(entry[1]), parseFloat(entry[2]) );
                 if ( idx == 0 ) { // get the launch lat/long for marker
-                    var launch_lat = entry[1];
-                    var launch_lon = entry[2];
+                    launch_lat = entry[1];
+                    launch_lon = entry[2];
                     launch_pt = point;
                 }
 
                 // set on every iteration, last valid entry
                 // gives landing position
-                var land_lat = entry[1];
-                var land_lon = entry[2];
+                land_lat = entry[1];
+                land_lon = entry[2];
                 land_pt = point;
                 
                 if(parseFloat(entry[3]) > max_height) {
@@ -168,14 +172,14 @@ function parseCSV(lines) {
         position: launch_pt,
         map: map,
         icon: launch_icon,
-        title: 'Balloon launch'
+        title: 'Balloon launch ('+launch_lat+', '+launch_lon+')'
     });
 
     var land_marker = new google.maps.Marker({
         position: land_pt,
         map:map,
         icon: land_icon,
-        title: 'Predicted Landing'
+        title: 'Predicted Landing ('+land_lat+', '+land_lon+')'
     });
 
     var path_polyline = new google.maps.Polyline({
@@ -207,6 +211,49 @@ function parseCSV(lines) {
 
 }
 
+function plotClick() {
+    // clear the old marker
+    clearMapItems();
+    // get the new values from the form
+    click_lat = parseFloat($("#lat").val());
+    click_lon = parseFloat($("#lon").val());
+    var click_pt = new google.maps.LatLng(click_lat, click_lon);
+    clickMarker = new google.maps.Marker({
+        position: click_pt,
+        map: map,
+        icon: 'images/target-1-sm.png',
+        title: 'Currently selected launch location ('+click_lat+', '+click_lon+')'
+    });
+    map_items.push(clickMarker);
+    map.panTo(click_pt);
+    map.setZoom(8);
+}
+    
+
+function setFormLatLon(GLatLng) {
+    $("#lat").val(GLatLng.lat().toFixed(4));
+    $("#lon").val(GLatLng.lng().toFixed(4));
+    // remove the event handler so another click doesn't register
+    setLatLonByClick(false);
+    // change the dropdown to read "other"
+    SetSiteOther();
+    // plot the new marker for launch location
+    plotClick();
+}
+
+function setLatLonByClick(state) {
+    if ( state == true ) {
+        clickListener = google.maps.event.addListener(map, 'click', function(event) {
+            setFormLatLon(event.latLng);
+        });
+    } else if ( state == false ) {
+        google.maps.event.removeListener(clickListener);
+    } else {
+        appendDebug("Unrecognised state for setLatLonByClick");
+    }
+
+}
+
 function enableMap(map, state) {
     if ( state != false && state != true) {
         appendDebug("Unrecognised map state");
@@ -299,8 +346,6 @@ function UpdateLaunchSite(id) {
 
 function SetSiteOther() {
         optOther = document.getElementById("other");
-        //cmbSite = document.getElementById("site");
-        //cmbSite.selectedIndex = 1;
         optOther.selected = true;
 }
 

From 611143195b6516070baa9a47a0c1ff0b7be23146 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Thu, 3 Jun 2010 22:37:17 +0100
Subject: [PATCH 10/23] Current cursor position shown, also finalised selection
 launch pos from map closes #9

---
 predict/index.php  | 11 ++++++++++-
 predict/js/pred.js |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/predict/index.php b/predict/index.php
index cdf153d..c700530 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -96,6 +96,9 @@ function initialize() {
     });
     // plot the initial launch location
     plotClick();
+    google.maps.event.addListener(map, 'mousemove', function(event) {
+        showMousePos(event.latLng);
+    });
 }
 
 
@@ -121,7 +124,13 @@ function initialize() {
 
 <div id="scenario_info" class="box">
 <h1>Scenario Information</h1>
-<span id="cursor_info">Lat: <span id="cursor_lat"></span> Lon: <span id="cursor_lon"></span></span><br />
+<span id="cursor_info">Current mouse position: 
+Lat: <span id="cursor_lat">?</span> 
+Lon: <span id="cursor_lon">?</span>
+</span><br />
+<span id="cursor_pred">
+Put stuff here
+</span><br />
 <a><span id="showHideDebug">Show Debug</span></a></span> | 
 <a><span id="showHideForm">Hide Launch Card</span></a></span>
 </div>
diff --git a/predict/js/pred.js b/predict/js/pred.js
index a51534c..0303f28 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -33,6 +33,11 @@ function populateFormByUUID(pred_uuid) {
     }, 'json');
 }
 
+function showMousePos(GLatLng) {
+    $("#cursor_lat").html(GLatLng.lat().toFixed(4));
+    $("#cursor_lon").html(GLatLng.lng().toFixed(4));
+}
+
 function handlePred(pred_uuid) {
     $("#prediction_status").html("Searching for wind data...");
     $("#input_form").hide("slide", { direction: "down" }, 500);

From b8dd855c9ef77aaba0b0234035b962606fc951bc Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Fri, 4 Jun 2010 09:31:55 +0100
Subject: [PATCH 11/23] Proper user information window, prompts for click after
 SetWithMap, gives warning after server form data rejected

---
 predict/css/pred.css | 13 ++++++++++++
 predict/index.php    | 13 +++++++++++-
 predict/js/pred.js   | 47 +++++++++++++++++++++++++++++---------------
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/predict/css/pred.css b/predict/css/pred.css
index 2973fce..3ead515 100644
--- a/predict/css/pred.css
+++ b/predict/css/pred.css
@@ -29,6 +29,19 @@ a { text-decoration: underline; color: #333; cursor: pointer; }
     display: none;
 }
 
+#error_window {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 400px;
+    height: 50px;
+    margin-left: -200px;
+    margin-top: -50px;
+    padding: 1em;
+    text-align: center;
+    display: none;
+}
+
 .box {
 	position: absolute; 
 	background-color: white; 
diff --git a/predict/index.php b/predict/index.php
index c700530..5ae09d4 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -47,11 +47,13 @@ function initialize() {
         url: 'ajax.php?action=submitForm',
         type: 'POST',
         success: function(data) {
-            predSub();
             var data_split = data.split("|");
             if ( data_split[0] == 0 ) {
                 appendDebug("The server rejected the submitted form data");
+                throwError("The server rejected the submitted form data");
+                resetGUI();
             } else {
+                predSub();
                 appendDebug("The server accepted the form data");
                 // update the global current_uuid variable
                 current_uuid = data_split[1];
@@ -94,6 +96,9 @@ function initialize() {
         toggleWindow("input_form", "showHideForm", "Show Launch Card",
             "Hide Launch Card");
     });
+    $("#closeErrorWindow").click(function() {
+        $("#error_window").fadeOut();
+    });
     // plot the initial launch location
     plotClick();
     google.maps.event.addListener(map, 'mousemove', function(event) {
@@ -122,6 +127,12 @@ function initialize() {
 <a><span id="showHideDebug_status">Toggle Debug</span></a></span>
 </div>
 
+<div id="error_window" class="box">
+<span id="error_message">Nothing here!</span>
+<br /><br />
+<a id="closeErrorWindow">Close</a>
+</div>
+
 <div id="scenario_info" class="box">
 <h1>Scenario Information</h1>
 <span id="cursor_info">Current mouse position: 
diff --git a/predict/js/pred.js b/predict/js/pred.js
index 0303f28..314334d 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -38,6 +38,11 @@ function showMousePos(GLatLng) {
     $("#cursor_lon").html(GLatLng.lng().toFixed(4));
 }
 
+function throwError(data) {
+    $("#error_message").html(data);
+    $("#error_window").fadeIn();
+}
+
 function handlePred(pred_uuid) {
     $("#prediction_status").html("Searching for wind data...");
     $("#input_form").hide("slide", { direction: "down" }, 500);
@@ -72,6 +77,20 @@ function getJSONProgress(pred_uuid) {
     });
 }
 
+function resetGUI() {
+    $("#status_message").fadeOut(500);
+    // now clear the status window
+    $("#prediction_status").html("");
+    $("#prediction_progress").progressbar("options", "value", 0);
+    $("#prediction_percent").html("");
+    // bring the input form back up
+    toggleWindow("input_form", null, null, null, "show");
+    toggleWindow("scenario_info", null, null, null, "show");
+    // un-fade the map canvas
+    $("#map_canvas").fadeTo(1500, 1);
+}
+
+
 function processProgress(progress) {
     if ( progress['error'] ) {
         clearInterval(ajaxEventHandle);
@@ -81,20 +100,10 @@ function processProgress(progress) {
         if ( progress['gfs_complete'] == true ) {
             if ( progress['pred_complete'] == true ) { // pred has finished
                 $("#prediction_status").html("Prediction finished.");
-                $("#status_message").fadeOut(500);
-                // now clear the status window
-                $("#prediction_status").html("");
-                $("#prediction_progress").progressbar("options", "value", 0);
-                $("#prediction_percent").html("");
-                // bring the input form back up
-                $("#input_form").show("slide", { direction: "down" }, 500);
-                $("#scenario_info").show("slide", { direction: "up" }, 500);
-                toggleWindow("scenario_template", "showHideDebug", "Show Debug",
-                        "Hide Debug", "hide");
-                // un-fade the map canvas
-                $("#map_canvas").fadeTo(1500, 1);
                 appendDebug("Server says: the predictor finished running.");
                 appendDebug("Attemping to retrieve flight path from server");
+                // reset the GUI
+                resetGUI();
                 // stop polling for JSON
                 clearInterval(ajaxEventHandle);
                 // parse the data
@@ -249,8 +258,10 @@ function setFormLatLon(GLatLng) {
 function setLatLonByClick(state) {
     if ( state == true ) {
         clickListener = google.maps.event.addListener(map, 'click', function(event) {
+            $("#error_window").fadeOut();
             setFormLatLon(event.latLng);
         });
+        throwError("Now click your desired launch location on the map");
     } else if ( state == false ) {
         google.maps.event.removeListener(clickListener);
     } else {
@@ -311,11 +322,15 @@ function toggleWindow(window_name, linker, onhide, onshow, force) {
             $("#"+linker).html(onshow);
         }
     } else if ( force == "hide" ) {
-        $("#"+window_name+"").hide("slide", { direction: "down" }, 500);
-        $("#"+linker).html(onhide);
+        if( $("#"+window_name).css('display') != "none" ){
+            $("#"+window_name+"").hide("slide", { direction: "down" }, 500);
+            $("#"+linker).html(onhide);
+        }
     } else if ( force == "show") {
-        $("#"+window_name).show("slide", { direction: "down" }, 500);
-        $("#"+linker).html(onshow);
+        if( $("#"+window_name).css('display') == "none" ){
+            $("#"+window_name).show("slide", { direction: "down" }, 500);
+            $("#"+linker).html(onshow);
+        }
     } else {
         appendDebug("toggleWindow force parameter unrecognised");
     }

From 2db39d1c08b92ee2829bd4d9dbbbcbf0daadb1b5 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Fri, 4 Jun 2010 09:38:06 +0100
Subject: [PATCH 12/23] Checks that clickListener isn't already existent before
 running setWithMap

---
 predict/js/pred.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/predict/js/pred.js b/predict/js/pred.js
index 314334d..ca8c1ea 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -257,13 +257,19 @@ function setFormLatLon(GLatLng) {
 
 function setLatLonByClick(state) {
     if ( state == true ) {
-        clickListener = google.maps.event.addListener(map, 'click', function(event) {
-            $("#error_window").fadeOut();
-            setFormLatLon(event.latLng);
-        });
+        // check this listener doesn't already exist
+        if (!clickListener) {
+            clickListener = google.maps.event.addListener(map,
+                    'click', function(event) {
+                $("#error_window").fadeOut();
+                setFormLatLon(event.latLng);
+            });
+        }
+        // tell the user what to do next
         throwError("Now click your desired launch location on the map");
     } else if ( state == false ) {
         google.maps.event.removeListener(clickListener);
+        clickListener = null;
     } else {
         appendDebug("Unrecognised state for setLatLonByClick");
     }

From f3d0c0af8311225ecd255f1af85b2294e8e7b403 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Sat, 5 Jun 2010 00:59:49 +0100
Subject: [PATCH 13/23] Displays flight time/range and cursor range from
 launch/land closes #7

---
 predict/css/pred.css |  3 +-
 predict/index.php    | 15 ++++++---
 predict/js/pred.js   | 73 +++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/predict/css/pred.css b/predict/css/pred.css
index 3ead515..53b94ab 100644
--- a/predict/css/pred.css
+++ b/predict/css/pred.css
@@ -103,8 +103,9 @@ a { text-decoration: underline; color: #333; cursor: pointer; }
     top: 25px;
     right: 0px;
     border-right: none;
-    height:70px;
     width: 400px;
+    text-align:center;
+    padding: 10px;
 }
 
 
diff --git a/predict/index.php b/predict/index.php
index 5ae09d4..29b5408 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -133,17 +133,22 @@ function initialize() {
 <a id="closeErrorWindow">Close</a>
 </div>
 
+<!-- scenario info -->
 <div id="scenario_info" class="box">
 <h1>Scenario Information</h1>
+<a><span id="showHideDebug">Show Debug</span></a></span> | 
+<a><span id="showHideForm">Hide Launch Card</span></a></span>
+<br />
 <span id="cursor_info">Current mouse position: 
 Lat: <span id="cursor_lat">?</span> 
 Lon: <span id="cursor_lon">?</span>
 </span><br />
-<span id="cursor_pred">
-Put stuff here
-</span><br />
-<a><span id="showHideDebug">Show Debug</span></a></span> | 
-<a><span id="showHideForm">Hide Launch Card</span></a></span>
+<span id="cursor_pred" style="display:none">
+Range: <span id="cursor_pred_range"></span>km, 
+Flight Time: <span id="cursor_pred_time"></span><br />
+Cursor range from launch: <span id="cursor_pred_launchrange">?</span>km, 
+land: <span id="cursor_pred_landrange">?</span>km
+</span>
 </div>
 
 <div id="input_form" class="box"> 
diff --git a/predict/js/pred.js b/predict/js/pred.js
index ca8c1ea..d15535a 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -34,8 +34,21 @@ function populateFormByUUID(pred_uuid) {
 }
 
 function showMousePos(GLatLng) {
-    $("#cursor_lat").html(GLatLng.lat().toFixed(4));
-    $("#cursor_lon").html(GLatLng.lng().toFixed(4));
+    var curr_lat = GLatLng.lat().toFixed(4);
+    var curr_lon = GLatLng.lng().toFixed(4);
+    $("#cursor_lat").html(curr_lat);
+    $("#cursor_lon").html(curr_lon);
+    // if we have a prediction displayed
+    // show range from launch and land:
+    if ( current_uuid != 0 && map_items['launch_marker'] != null ) {
+        var launch_pt = map_items['launch_marker'].position;
+        var land_pt = map_items['land_marker'].position;
+        var range_launch = distHaversine(launch_pt, GLatLng);
+        var range_land = distHaversine(land_pt, GLatLng);
+        $("#cursor_pred_launchrange").html(range_launch);
+        $("#cursor_pred_landrange").html(range_land);
+    }
+    
 }
 
 function throwError(data) {
@@ -83,6 +96,7 @@ function resetGUI() {
     $("#prediction_status").html("");
     $("#prediction_progress").progressbar("options", "value", 0);
     $("#prediction_percent").html("");
+    $("#cursor_pred").hide();
     // bring the input form back up
     toggleWindow("input_form", null, null, null, "show");
     toggleWindow("scenario_info", null, null, null, "show");
@@ -142,6 +156,8 @@ function parseCSV(lines) {
     var land_lon;
     var launch_pt;
     var land_pt;
+    var launch_time;
+    var land_time;
         $.each(lines, function(idx, line) {
             entry = line.split(',');
             if(entry.length >= 4) { // check valid entry length
@@ -149,6 +165,7 @@ function parseCSV(lines) {
                 if ( idx == 0 ) { // get the launch lat/long for marker
                     launch_lat = entry[1];
                     launch_lon = entry[2];
+                    launch_time = entry[0];
                     launch_pt = point;
                 }
 
@@ -156,6 +173,7 @@ function parseCSV(lines) {
                 // gives landing position
                 land_lat = entry[1];
                 land_lon = entry[2];
+                land_time = entry[0];
                 land_pt = point;
                 
                 if(parseFloat(entry[3]) > max_height) {
@@ -169,6 +187,16 @@ function parseCSV(lines) {
     appendDebug("Flight data parsed, creating map plot...");
     clearMapItems();
     
+    // calculate range and time of flight
+    var range = distHaversine(launch_pt, land_pt, 1);
+    var flighttime = land_time - launch_time;
+    var f_hours = Math.floor((flighttime % 86400) / 3600);
+    var f_minutes = Math.floor(((flighttime % 86400) % 3600) / 60);
+    flighttime = f_hours + "hr" + f_minutes;
+    $("#cursor_pred_range").html(range);
+    $("#cursor_pred_time").html(flighttime);
+    $("#cursor_pred").show();
+    
     // make some nice icons
     var launch_icon = new google.maps.MarkerImage(launch_img,
         new google.maps.Size(16,16),
@@ -212,10 +240,12 @@ function parseCSV(lines) {
     });
 
     // now add the launch/land markers to map
-    map_items.push(launch_marker);
-    map_items.push(land_marker);
-    map_items.push(pop_marker);
-    map_items.push(path_polyline);
+    // we might need these later, so push them
+    // associatively
+    map_items['launch_marker'] = launch_marker;
+    map_items['land_marker'] = land_marker;
+    map_items['pop_marker'] = pop_marker;
+    map_items['path_polyline'] = path_polyline;
 
     // pan to the new position
     map.panTo(launch_pt);
@@ -238,7 +268,7 @@ function plotClick() {
         icon: 'images/target-1-sm.png',
         title: 'Currently selected launch location ('+click_lat+', '+click_lon+')'
     });
-    map_items.push(clickMarker);
+    map_items['clickMarker'] = clickMarker;
     map.panTo(click_pt);
     map.setZoom(8);
 }
@@ -293,7 +323,8 @@ function enableMap(map, state) {
 }
 
 function clearMapItems() {
-    if(map_items.length > 0) {
+    $("#cursor_pred").hide();
+    if(getAssocSize(map_items) > 0) {
     appendDebug("Clearing previous map trace");
         for(i in map_items) {
             map_items[i].setMap(null);
@@ -302,6 +333,14 @@ function clearMapItems() {
     map_items = [];
 }
 
+function getAssocSize(arr) {
+    var i = 0;
+    for ( j in arr ) {
+        i++;
+    }
+    return i;
+}
+
 function appendDebug(appendage, clear) {
     if ( clear == null ){
         var curr = $("#debuginfo").html();
@@ -375,3 +414,21 @@ function SetSiteOther() {
         optOther.selected = true;
 }
 
+rad = function(x) {return x*Math.PI/180;}
+
+distHaversine = function(p1, p2, precision) {
+  var R = 6371; // earth's mean radius in km
+  var dLat  = rad(p2.lat() - p1.lat());
+  var dLong = rad(p2.lng() - p1.lng());
+
+  var a = Math.sin(dLat/2) * Math.sin(dLat/2) +
+          Math.cos(rad(p1.lat())) * Math.cos(rad(p2.lat())) * Math.sin(dLong/2) * Math.sin(dLong/2);
+  var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+  var d = R * c;
+  if ( precision == null ) {
+      return d.toFixed(3);
+  } else {
+      return d.toFixed(precision);
+  }
+}
+

From 2bd107d7bb4bc5bc3735fe5600c588fea6deea29 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Sat, 5 Jun 2010 01:42:05 +0100
Subject: [PATCH 14/23] Hover marker information added and fixed JS getHours
 bug

---
 predict/includes/functions.inc.php |  2 +-
 predict/js/pred.js                 | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/predict/includes/functions.inc.php b/predict/includes/functions.inc.php
index b179897..3fa948a 100644
--- a/predict/includes/functions.inc.php
+++ b/predict/includes/functions.inc.php
@@ -9,7 +9,7 @@ function createModel($post_array) {
     $pred_model = array();
 
     // first, populate the prediction model
-    $pred_model['hour'] = $post_array['hour'] + 1; //adjust for GMT
+    $pred_model['hour'] = $post_array['hour']; //adjust for GMT
     $pred_model['min'] = $post_array['min'];
     $pred_model['sec'] = $post_array['sec'];
 
diff --git a/predict/js/pred.js b/predict/js/pred.js
index d15535a..082833a 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -214,14 +214,14 @@ function parseCSV(lines) {
         position: launch_pt,
         map: map,
         icon: launch_icon,
-        title: 'Balloon launch ('+launch_lat+', '+launch_lon+')'
+        title: 'Balloon launch ('+launch_lat+', '+launch_lon+') at ' + POSIXtoHM(launch_time)
     });
 
     var land_marker = new google.maps.Marker({
         position: land_pt,
         map:map,
         icon: land_icon,
-        title: 'Predicted Landing ('+land_lat+', '+land_lon+')'
+        title: 'Predicted Landing ('+land_lat+', '+land_lon+') at ' + POSIXtoHM(land_time)
     });
 
     var path_polyline = new google.maps.Polyline({
@@ -381,6 +381,14 @@ function toggleWindow(window_name, linker, onhide, onshow, force) {
     }
 }
 
+function POSIXtoHM(timestamp) {
+    var ts = new Date();
+    ts.setTime(timestamp*1000);
+    var adjHours = ts.getHours() + (ts.getTimezoneOffset()/60);
+    var str = adjHours + ":" + ts.getMinutes();
+    return str;
+}
+
 // launch site dropdown switcher
 function UpdateLaunchSite(id) {
         txtLat = document.getElementById("lat");

From 18f927a888a6a889f4c683949c52b7e6a3f82fe3 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Sat, 5 Jun 2010 08:19:43 +0100
Subject: [PATCH 15/23] Fixed typecasting bug causing predictor to run for the
 wrong time

---
 predict/includes/functions.inc.php | 12 ++++++------
 predict/index.php                  |  6 +++---
 predict/js/pred.js                 |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/predict/includes/functions.inc.php b/predict/includes/functions.inc.php
index 3fa948a..5e65bb7 100644
--- a/predict/includes/functions.inc.php
+++ b/predict/includes/functions.inc.php
@@ -9,13 +9,13 @@ function createModel($post_array) {
     $pred_model = array();
 
     // first, populate the prediction model
-    $pred_model['hour'] = $post_array['hour']; //adjust for GMT
-    $pred_model['min'] = $post_array['min'];
-    $pred_model['sec'] = $post_array['sec'];
+    $pred_model['hour'] = (int)$post_array['hour']; //adjust for GMT
+    $pred_model['min'] = (int)$post_array['min'];
+    $pred_model['sec'] = (int)$post_array['sec'];
 
-    $pred_model['month'] = $post_array['month'];
-    $pred_model['day'] = $post_array['day'];
-    $pred_model['year'] = $post_array['year'];
+    $pred_model['month'] = (int)$post_array['month'];
+    $pred_model['day'] = (int)$post_array['day'];
+    $pred_model['year'] = (int)$post_array['year'];
 
     $pred_model['lat'] = $post_array['lat'];
     $pred_model['lon'] = $post_array['lon'];
diff --git a/predict/index.php b/predict/index.php
index 29b5408..95f2992 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -136,9 +136,6 @@ function initialize() {
 <!-- scenario info -->
 <div id="scenario_info" class="box">
 <h1>Scenario Information</h1>
-<a><span id="showHideDebug">Show Debug</span></a></span> | 
-<a><span id="showHideForm">Hide Launch Card</span></a></span>
-<br />
 <span id="cursor_info">Current mouse position: 
 Lat: <span id="cursor_lat">?</span> 
 Lon: <span id="cursor_lon">?</span>
@@ -149,6 +146,9 @@ Flight Time: <span id="cursor_pred_time"></span><br />
 Cursor range from launch: <span id="cursor_pred_launchrange">?</span>km, 
 land: <span id="cursor_pred_landrange">?</span>km
 </span>
+<br />
+<a><span id="showHideDebug">Show Debug</span></a></span> | 
+<a><span id="showHideForm">Hide Launch Card</span></a></span>
 </div>
 
 <div id="input_form" class="box"> 
diff --git a/predict/js/pred.js b/predict/js/pred.js
index 082833a..ab3ccad 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -43,8 +43,8 @@ function showMousePos(GLatLng) {
     if ( current_uuid != 0 && map_items['launch_marker'] != null ) {
         var launch_pt = map_items['launch_marker'].position;
         var land_pt = map_items['land_marker'].position;
-        var range_launch = distHaversine(launch_pt, GLatLng);
-        var range_land = distHaversine(land_pt, GLatLng);
+        var range_launch = distHaversine(launch_pt, GLatLng, 1);
+        var range_land = distHaversine(land_pt, GLatLng, 1);
         $("#cursor_pred_launchrange").html(range_launch);
         $("#cursor_pred_landrange").html(range_land);
     }

From c17ddd41f1501c84316ddfdf41d9e04acf23649e Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Sat, 5 Jun 2010 08:33:41 +0100
Subject: [PATCH 16/23] Rearranged form and its respective stuff in
 functions.inc.php

---
 predict/includes/functions.inc.php |  1 -
 predict/index.php                  | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/predict/includes/functions.inc.php b/predict/includes/functions.inc.php
index 5e65bb7..4182902 100644
--- a/predict/includes/functions.inc.php
+++ b/predict/includes/functions.inc.php
@@ -23,7 +23,6 @@ function createModel($post_array) {
     $pred_model['alt'] = $post_array['initial_alt'];
     $pred_model['des'] = $post_array['drag'];
     $pred_model['burst'] = $post_array['burst'];
-    $pred_model['float'] = $post_array['float_time'];
 
     $pred_model['delta_lat'] = $post_array['delta_lat'];
     $pred_model['delta_lon'] = $post_array['delta_lon'];
diff --git a/predict/index.php b/predict/index.php
index 95f2992..4d272a6 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -167,13 +167,17 @@ land: <span id="cursor_pred_landrange">?</span>km
 			</select>
 		</td>
 	<tr>
-		<td>Latitude: <a id="setWithClick">Set with map</a></td>
+		<td>Latitude:</td>
 		<td><input id="lat" type="text" name="lat" value="52.2135" onKeyDown="SetSiteOther()"></td>
 	</tr>
     <tr>
         <td>Longitude:</td>
         <td><input id="lon" type="text" name="lon" value="0.0964" onKeyDown="SetSiteOther()"></td>
     </tr>
+    <tr>
+    <td><a id="setWithClick">Set with map</a></td>
+    <td><a id="requestLocationSave">Request to save</a></td>
+    </tr>
     <tr>
         <td>Launch altitude (m):</td>
         <td><input id="initial_alt" type="text" name="initial_alt" value="0"></td>
@@ -214,10 +218,6 @@ land: <span id="cursor_pred_landrange">?</span>km
         <td>Burst Altitude (m):</td>
         <td><input id="burst" type="text" name="burst" value="30000"></td>
     </tr>
-    <tr>
-        <td>Float time at apogee (s):</td>
-        <td><input id="float" type="text" name="float_time" value="0"></td>
-    </tr>
     <tr>
         <td>Landing prediction software: </td><td>
         <select id="software" name="software">

From 8d176080957a4313a40792ec6f22f1f42bd1c79a Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Sat, 5 Jun 2010 16:36:59 +0100
Subject: [PATCH 17/23] Preloads most form fields when given an old UUID,
 doesn't do software and deltas yet

---
 predict/includes/functions.inc.php | 12 +++++
 predict/index.php                  | 80 ++++++++++++++++++++----------
 2 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/predict/includes/functions.inc.php b/predict/includes/functions.inc.php
index 4182902..bdfc24b 100644
--- a/predict/includes/functions.inc.php
+++ b/predict/includes/functions.inc.php
@@ -103,10 +103,22 @@ function makeINI($pred_model) { // makes an ini file
     $w_string .= "month = " . $pred_model['month'] . "\nsecond = " . $pred_model['sec'] . "\n";
     $w_string .= "year = " . $pred_model['year'] . "\nday = " . $pred_model['day'] . "\nminute = ";
     $w_string .= $pred_model['min'] . "\n";
+    // add our predictor stuff
+    $w_string .= "[predictor]\nlat-delta = " . $pred_model['delta_lat'] . "\n";
+    $w_string .= "lon-delta = " . $pred_model['delta_lon'] . "\nsoftware = ";
+    $w_string .= $pred_model['software'] . "\n";
 
     fwrite($fh, $w_string);
     fclose($fh);
 }
 
+function getModelByUUID($uuid) {
+    if ( file_exists("preds/".$uuid."/scenario.ini") ) {
+        $pred_model = parse_ini_file("preds/".$uuid."/scenario.ini");
+        return $pred_model;
+    } else {
+        return false;
+    }
+}
 
 ?>
diff --git a/predict/index.php b/predict/index.php
index 4d272a6..fbe58ed 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -1,6 +1,16 @@
 <?php
+require_once("includes/functions.inc.php");
 // get the time for pre-populating the form
 $time = time() + 3600;
+$current_uuid = ( isset($_GET['uuid'])? $_GET['uuid'] : "0" );
+// if we were given a UUID, try and construct its model
+if ( $current_uuid != 0 ) {
+    if ( $pred_model = getModelByUUID($current_uuid) ) {
+    } else {
+        // assume we weren't given a UUID (bad FIXME)
+        $current_uuid = 0;
+    }
+}
 ?>
 
 <html>
@@ -21,7 +31,7 @@ google.load("jqueryui", "1.8.1");
 <script type="text/javascript">
 
 var ajaxEventHandle;
-var current_uuid = '<?php echo ( isset($_GET['uuid'])? $_GET['uuid'] : "0" ); ?>';
+var current_uuid = '<?php echo $current_uuid ?>';
 
 var map;
 var map_items = [];
@@ -168,11 +178,15 @@ land: <span id="cursor_pred_landrange">?</span>km
 		</td>
 	<tr>
 		<td>Latitude:</td>
-		<td><input id="lat" type="text" name="lat" value="52.2135" onKeyDown="SetSiteOther()"></td>
+                <td><input id="lat" type="text" name="lat" value="<?php
+                    echo ($current_uuid!=0 ? $pred_model['latitude'] : "52.2135");
+                    ?>" onKeyDown="SetSiteOther()"></td>
 	</tr>
     <tr>
         <td>Longitude:</td>
-        <td><input id="lon" type="text" name="lon" value="0.0964" onKeyDown="SetSiteOther()"></td>
+        <td><input id="lon" type="text" name="lon" value="<?php
+            echo ($current_uuid!=0 ? $pred_model['longitude'] : "0.0964");
+            ?>" onKeyDown="SetSiteOther()"></td>
     </tr>
     <tr>
     <td><a id="setWithClick">Set with map</a></td>
@@ -180,43 +194,57 @@ land: <span id="cursor_pred_landrange">?</span>km
     </tr>
     <tr>
         <td>Launch altitude (m):</td>
-        <td><input id="initial_alt" type="text" name="initial_alt" value="0"></td>
+        <td><input id="initial_alt" type="text" name="initial_alt" value="<?php
+                echo ($current_uuid!=0 ? $pred_model['altitude'] : "0");?>"></td>
     </tr>
 	<tr>
 		<td>Launch Time:</td>
 		<td>
-			<input id="hour" type="text" name="hour" value="<?php echo date("H", $time); ?>" maxlength="2" size="2"> :
-			<input id="min" type="text" name="min" value="<?php echo date("i", $time); ?>" maxlength="2" size="2">
-			<input id="sec" type="hidden" name="sec" value="0"></td></tr>
+                        <input id="hour" type="text" name="hour" value="<?php
+                    echo ($current_uuid!=0 ? $pred_model['hour'] : date("H", $time));
+                    ?>" maxlength="2" size="2"> :
+                        <input id="min" type="text" name="min" value="<?php
+                    echo ($current_uuid!=0 ? $pred_model['minute'] : date("i", $time));
+                    ?>" maxlength="2" size="2">
+			<input id="sec" type="hidden" name="second" value="0"></td></tr>
 			<tr><td>Launch Date:</td><td>
-			<input id="day" type="text" name="day" value="<?php echo date("d", $time); ?>" maxlength="2" size="2">
-			<select id="month" name="month">
-				<option value="1"<?php if (date("n", $time) == 1) echo " selected"; ?>>Jan</option>
-				<option value="2"<?php if (date("n", $time) == 2) echo " selected"; ?>>Feb</option>
-				<option value="3"<?php if (date("n", $time) == 3) echo " selected"; ?>>Mar</option>
-				<option value="4"<?php if (date("n", $time) == 4) echo " selected"; ?>>Apr</option>
-				<option value="5"<?php if (date("n", $time) == 5) echo " selected"; ?>>May</option>
-				<option value="6"<?php if (date("n", $time) == 6) echo " selected"; ?>>Jun</option>
-				<option value="7"<?php if (date("n", $time) == 7) echo " selected"; ?>>Jul</option>
-				<option value="8"<?php if (date("n", $time) == 8) echo " selected"; ?>>Aug</option>
-				<option value="9"<?php if (date("n", $time) == 9) echo " selected"; ?>>Sep</option>
-				<option value="10"<?php if (date("n", $time) == 10) echo " selected"; ?>>Oct</option>
-				<option value="11"<?php if (date("n", $time) == 11) echo " selected"; ?>>Nov</option>
-				<option value="12"<?php if (date("n", $time) == 12) echo " selected"; ?>>Dec</option>
-			</select>
-			<input id="year" type="text" name="year" value="<?php echo date("Y", $time); ?>" maxlength="4" size="4">
+                        <input id="day" type="text" name="day" value="<?php
+                    echo ($current_uuid!=0 ? $pred_model['day'] : date("d", $time));
+                    ?>" maxlength="2" size="2">
+                        <select id="month" name="month"><?php
+                    // php enumeration
+                    for($i=1;$i<=12;$i++) {
+                        echo "<option value=\"" . $i . "\"";
+                        if ($i == date("n", $time) && $current_uuid==0 ) {
+                            echo " selected=\"selected\"";
+                        } else if ($current_uuid != 0 && $i == $pred_model['month']) {
+                            echo " selected=\"selected\"";
+                        }
+                        echo ">".date("M", mktime(0,0,0,$i,11,1978))."</option>\n";
+                    }
+
+                    ?></select>
+                        <input id="year" type="text" name="year" value="<?php
+                    echo ($current_uuid!=0 ? $pred_model['year'] : date("Y", $time));
+                    ?>" maxlength="4" size="4">
 		</td>
     <tr>
         <td>Ascent Rate (m/s):</td>
-        <td><input id="ascent" type="text" name="ascent" value="5"></td>
+        <td><input id="ascent" type="text" name="ascent" value="<?php
+                    echo ($current_uuid!=0 ? $pred_model['ascent-rate'] : "5");
+                    ?>"></td>
     </tr>
     <tr>
         <td>Descent Rate (sea level m/s):</td>
-        <td><input id="drag" type="text" name="drag" value="5"></td>
+        <td><input id="drag" type="text" name="drag" value="<?php
+                    echo ($current_uuid!=0 ? $pred_model['descent-rate'] : "5");
+                    ?>"></td>
     </tr>
     <tr>
         <td>Burst Altitude (m):</td>
-        <td><input id="burst" type="text" name="burst" value="30000"></td>
+        <td><input id="burst" type="text" name="burst" value="<?php
+                    echo ($current_uuid!=0 ? $pred_model['burst-altitude'] : "30000");
+                    ?>"></td>
     </tr>
     <tr>
         <td>Landing prediction software: </td><td>

From 9e9169e2958a7697d10cc60fedd08618e846f1f4 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Sat, 5 Jun 2010 16:44:39 +0100
Subject: [PATCH 18/23] Auto selects launch location 'other' when viewing old
 UUID

---
 predict/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/predict/index.php b/predict/index.php
index fbe58ed..d9b978c 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -173,7 +173,9 @@ land: <span id="cursor_pred_landrange">?</span>km
 				<option value="Glenrothes">Glenrothes</option>
 				<option value="Bujaraloz, Monegros">Bujaraloz, Monegros</option>
 				<option value="Adelaide Airport">Adelaide Airport</option>
-				<option id="other" value="other">Other</option>
+                                <option id="other" value="other"<?php
+                                if ($current_uuid !=0) echo " selected=\"selected\"";
+                                ?>>Other</option>
 			</select>
 		</td>
 	<tr>

From 7c80b0aa05ad6896dfb38898ee54fbd6072313ad Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Sat, 5 Jun 2010 17:28:49 +0100
Subject: [PATCH 19/23] Adds hashlink to url after running prediction, gets
 hashlink from url on page load. Doesn't populate form yet

---
 predict/index.php  | 4 ++++
 predict/js/pred.js | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/predict/index.php b/predict/index.php
index d9b978c..0b80980 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -42,6 +42,10 @@ var clickListener;
 var clickMarker;
 
 function initialize() {
+    if(window.location.hash != "") {
+        var ln = window.location.hash.split("=");
+        current_uuid = ln[1];
+    }
     // make the map and set center
     var latlng = new google.maps.LatLng(52, 0);
     var myOptions = {
diff --git a/predict/js/pred.js b/predict/js/pred.js
index ab3ccad..36c457f 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -33,6 +33,11 @@ function populateFormByUUID(pred_uuid) {
     }, 'json');
 }
 
+function addHashLink(link) {
+   var ln = "#!/" + link;
+   window.location = ln;
+}
+
 function showMousePos(GLatLng) {
     var curr_lat = GLatLng.lat().toFixed(4);
     var curr_lon = GLatLng.lng().toFixed(4);
@@ -122,6 +127,7 @@ function processProgress(progress) {
                 clearInterval(ajaxEventHandle);
                 // parse the data
                 getCSV(current_uuid);
+                addHashLink("uuid="+current_uuid);
             } else if ( progress['pred_running'] != true ) {
                 $("#prediction_status").html("Waiting for predictor to run...");
                 appendDebug("Server says: predictor not yet running...");

From b05394e628d11e1f9026bd2590c38cd2574ed1fb Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Sun, 6 Jun 2010 10:21:44 +0100
Subject: [PATCH 20/23] Properly handles users asking for non-existent UUIDs

---
 predict/ajax.php                | 11 +++++++----
 predict/css/pred.css            |  1 -
 predict/includes/config.inc.php |  9 +++++++++
 predict/js/pred.js              | 20 +++++++++++++-------
 4 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 predict/includes/config.inc.php

diff --git a/predict/ajax.php b/predict/ajax.php
index 263ad04..ebbce2a 100644
--- a/predict/ajax.php
+++ b/predict/ajax.php
@@ -1,5 +1,6 @@
 <?php
 require_once("includes/functions.inc.php");
+require_once("includes/config.inc.php");
 
 $action = $_GET['action'];
 
@@ -8,7 +9,9 @@ $software_available = array("gfs", "gfs_hd");
 switch($action) {
 case "getCSV":
     $uuid = $_GET['uuid'];
-    $fh = fopen("preds/".$uuid."/flight_path.csv", "r") or die("No CSV for UUID");
+    $tryfile = $c_preds_path.$uuid."/".$c_flight_csv;
+    if(!file_exists($tryfile)) return false;
+    $fh = fopen($tryfile, "r");
     $data = array();
     while (!feof($fh)) {
         $line = trim(fgets($fh));
@@ -20,7 +23,7 @@ case "getCSV":
 
 case "JSONexists":
     $uuid = $_GET['uuid'];
-    if(file_exists("preds/$uuid/progress.json")) {
+    if(file_exists($c_preds_path.$uuid."/".$c_progress_json)) {
         echo true;
     } else {
         echo false;
@@ -32,11 +35,11 @@ case "getModelByUUID":
     if( !uuid ) die ("No uuid given to getModelByUUID");
     // make a new model
     $pred_model = array();
-    if ( !file_exists("preds/".$uuid."/scenario.ini") ) {
+    if ( !file_exists($c_preds_path.$uuid."/".$c_scenario_file) ) {
         $pred_model['valid'] = false;
     } else {
         // populate the array, JSON encode it and return
-        $pred_model = parse_ini_file("preds/".$uuid."/scenario.ini");
+        $pred_model = parse_ini_file($c_preds_path.$uuid."/".$c_scenario_file);
         if ( verifyModel($pred_model, $software_available) ){
             $pred_model['valid'] == true;
         } else {
diff --git a/predict/css/pred.css b/predict/css/pred.css
index 53b94ab..4f0cc13 100644
--- a/predict/css/pred.css
+++ b/predict/css/pred.css
@@ -34,7 +34,6 @@ a { text-decoration: underline; color: #333; cursor: pointer; }
     left: 50%;
     top: 50%;
     width: 400px;
-    height: 50px;
     margin-left: -200px;
     margin-top: -50px;
     padding: 1em;
diff --git a/predict/includes/config.inc.php b/predict/includes/config.inc.php
new file mode 100644
index 0000000..da3db10
--- /dev/null
+++ b/predict/includes/config.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+$c_preds_path = "preds/";
+
+$c_scenario_file = "scenario.ini";
+$c_flight_csv = "flight_path.csv";
+$c_progress_json = "progress.json";
+
+?>
diff --git a/predict/js/pred.js b/predict/js/pred.js
index 36c457f..b0dde63 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -73,13 +73,19 @@ function handlePred(pred_uuid) {
 
 function getCSV(pred_uuid) {
     $.get("ajax.php", { "action":"getCSV", "uuid":pred_uuid }, function(data) {
-        appendDebug("Got JSON response from server for flight path, parsing...");
-        if (parseCSV(data) ) {
-            appendDebug("Parsing function returned successfully.");
-            appendDebug("Done, AJAX functions quitting.");
-        } else {
-            appendDebug("The parsing function failed.");
-        }
+            if(data != null) {
+                appendDebug("Got JSON response from server for flight path, parsing...");
+                if (parseCSV(data) ) {
+                    appendDebug("Parsing function returned successfully.");
+                    appendDebug("Done, AJAX functions quitting.");
+                } else {
+                    appendDebug("The parsing function failed.");
+                }
+            } else {
+                appendDebug("Server couldn't find a CSV for that UUID");
+                throwError("Sorry, we couldn't find the data for that UUID. "+
+                    "Please run another prediction.");
+            }
     }, 'json');
 }
 

From 2a1b678d2cdfcd3caed8e60f2c591324b16b4072 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Sun, 6 Jun 2010 10:25:09 +0100
Subject: [PATCH 21/23] Fixed model validity verification bug in getModelByUUID

---
 predict/ajax.php   | 4 ++--
 predict/js/pred.js | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/predict/ajax.php b/predict/ajax.php
index ebbce2a..8db8c48 100644
--- a/predict/ajax.php
+++ b/predict/ajax.php
@@ -41,9 +41,9 @@ case "getModelByUUID":
         // populate the array, JSON encode it and return
         $pred_model = parse_ini_file($c_preds_path.$uuid."/".$c_scenario_file);
         if ( verifyModel($pred_model, $software_available) ){
-            $pred_model['valid'] == true;
+            $pred_model['valid'] = true;
         } else {
-            $pred_model['valid'] == false;
+            $pred_model['valid'] = false;
         }
         $pred_model['uuid'] = $uuid;
     }
diff --git a/predict/js/pred.js b/predict/js/pred.js
index b0dde63..6df74a2 100644
--- a/predict/js/pred.js
+++ b/predict/js/pred.js
@@ -28,7 +28,6 @@ function populateFormByUUID(pred_uuid) {
             appendDebug("The server said the model it made was invalid");
         } else {
             // we're good to go, populate the form
-            alert(data);
         }
     }, 'json');
 }

From f34072ff19d7916c3d716414ef9b7a46e5bd323c Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Mon, 7 Jun 2010 20:11:06 +0100
Subject: [PATCH 22/23] Added about window and links and event handlers

---
 predict/css/pred.css | 12 ++++++++++++
 predict/index.php    | 22 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/predict/css/pred.css b/predict/css/pred.css
index 4f0cc13..e64a926 100644
--- a/predict/css/pred.css
+++ b/predict/css/pred.css
@@ -41,6 +41,18 @@ a { text-decoration: underline; color: #333; cursor: pointer; }
     display: none;
 }
 
+#about_window {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 500px;
+    margin-left: -250px;
+    margin-top: -120px;
+    padding: 1em;
+    text-align: center;
+    display: none;
+}
+
 .box {
 	position: absolute; 
 	background-color: white; 
diff --git a/predict/index.php b/predict/index.php
index 0b80980..ae451df 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -113,6 +113,12 @@ function initialize() {
     $("#closeErrorWindow").click(function() {
         $("#error_window").fadeOut();
     });
+    $("#about_window_close").click(function() {
+        $("#about_window").fadeOut();
+    });
+    $("#about_window_show").click(function() {
+        $("#about_window").fadeIn();
+    });
     // plot the initial launch location
     plotClick();
     google.maps.event.addListener(map, 'mousemove', function(event) {
@@ -163,6 +169,22 @@ land: <span id="cursor_pred_landrange">?</span>km
 <br />
 <a><span id="showHideDebug">Show Debug</span></a></span> | 
 <a><span id="showHideForm">Hide Launch Card</span></a></span>
+<br />
+<a style="font-size: 10px" id="about_window_show">About this software</a>
+</div>
+
+<!-- the about window -->
+<div id="about_window" class="box">
+<b>Cambridge University Spaceflight Landing Predictor</b>
+<br /><br />
+A tool to predict the flight path and landing location of latex sounding balloons based on wind data from the NOAA.
+<br /><br />
+Written by <a href="http://github.com/jonsowman" target="_blank">Jon Sowman</a> and <a href="http://github.com/randomskk" target="_blank">Adam Greig</a> for <a href="http://www.cuspaceflight.co.uk" target="_blank">CUSF</a>.
+Credit also to <a href="http://github.com/rjw57" target="_blank">Rich Wareham</a> for work on the predictor. Some parts of code taken from old landing prediction software, credit to Rob Anderson, Fergus Noble and Ed Moore.
+<br /><br />
+No guarantee is given for the accuracy, precision or relability of the data produced by this softare, and you use it at your own risk.
+<br /><br />
+<a id="about_window_close">Close</a>
 </div>
 
 <div id="input_form" class="box"> 

From cc6d3dacfa339f7f0cd0e99a94c978a6a3a6c6f4 Mon Sep 17 00:00:00 2001
From: jonsowman <jon@hexoc.com>
Date: Mon, 7 Jun 2010 20:12:10 +0100
Subject: [PATCH 23/23] Fixed typo in about window

---
 predict/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/predict/index.php b/predict/index.php
index ae451df..d3ef920 100644
--- a/predict/index.php
+++ b/predict/index.php
@@ -182,7 +182,7 @@ A tool to predict the flight path and landing location of latex sounding balloon
 Written by <a href="http://github.com/jonsowman" target="_blank">Jon Sowman</a> and <a href="http://github.com/randomskk" target="_blank">Adam Greig</a> for <a href="http://www.cuspaceflight.co.uk" target="_blank">CUSF</a>.
 Credit also to <a href="http://github.com/rjw57" target="_blank">Rich Wareham</a> for work on the predictor. Some parts of code taken from old landing prediction software, credit to Rob Anderson, Fergus Noble and Ed Moore.
 <br /><br />
-No guarantee is given for the accuracy, precision or relability of the data produced by this softare, and you use it at your own risk.
+No guarantee is given for the accuracy, precision or reliability of the data produced by this softare, and you use it at your own risk.
 <br /><br />
 <a id="about_window_close">Close</a>
 </div>