Initial KML overlay working

predict/index.php

@@ -143,8 +143,8 @@ google.load("jqueryui", "1.8.1");
     <br /><br />
     Written by <a href="http://github.com/jonsowman" target="_blank">Jon Sowman</a> and <a href="http://github.com/adamgreig" 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 /><br />
-    Minor credit to Robert Harrison for integrating the NOTAM and airspace KML from www.notaminfo.com with kind permission from David Massie.
+    Minor credit to Robert Harrison for integrating the NOTAM and airspace KML from <a href="http://www.notaminfo.com/" >www.notaminfo.com</a> with kind permission from author David Massie.
     <br /><br />
     No guarantee is given for the accuracy, precision or reliability of the data produced by this software, and you use it entirely at your own risk. For more information, see #highaltitude on irc.freenode.net.
 </div>
@@ -291,99 +291,16 @@ google.load("jqueryui", "1.8.1");
     <img src="images/drag_handle.png" class="handle" />
     <div id="notam-settings">
         <b>Advanced NOTAM & Airspace Settings</b>
-        <br>
+        <p>
+	<b>NB This is not yet functional !!!</b>
         <table id="input_table">
-            <tr class="input_row">
-                <td class="input_label" colspan="2">Payload Mass (g)</td>
-                <td class="input_instruction" rowspan="3">AND</td>
-
-                <td class="input_label" colspan="2">Balloon Mass (g)</td>
-            </tr>
-            <tr class="input_row">
-                <td colspan="2">
-                    <input type="text" id="mp" class="input_field" value="1500" 
-                        tabindex="1"/>
-                </td>
-                <td colspan="2">
-                    <select class="input_field" id="mb" tabindex="2"> 
-
-                        <option value="200">200</option>
-                        <option value="300">300</option>
-                        <option value="350">350</option>
-                        <option value="450">450</option>
-                        <option value="500">500</option>
-                        <option value="600">600</option>
-
-                        <option value="700">700</option>
-                        <option value="800">800</option>
-                        <option value="1000" selected="selected">1000</option>
-                        <option value="1200">1200</option>
-                        <option value="1500">1500</option>
-                        <option value="2000">2000</option>
-
-                        <option value="3000">3000</option>
-                    </select>
-                </td>
-            </tr>
-            <tr class="warning_row">
-                <td colspan="2" id="mp_w">&nbsp;</td>
-                <td colspan="2" id="mb_w">&nbsp;</td>
-            </tr>
             <tr>
-                <td class="input_instruction" colspan="5">THEN</td>
+	    <td> 
-            </tr>
+<form name="userselection" action = "" method = "GET"  ><fieldset id="notamsFieldset" name="notams" ><legend>NOTAM details</legend><div id="notamsDiv" style="display: block"><input type="checkbox" name="warnings" id="warnings" onclick="setNOTAMs();" value="yes" checked="checked" />Show NOTAMs<br /></fieldset><fieldset id="airspaceFieldset"><legend>Airspace Details</legend><div id="airspaceDiv" style="display: block"><input type="checkbox" id = "defaultAirspace" name="default" value="yes" onclick="showStdAirspace();"/>Show Default airspace<br><input type="checkbox" id="clA" name="clA" value="yes" onclick="setAirspace();"/>Show class A airspace<br><input type="checkbox" id="clD" name="clD" value="yes" onclick="setAirspace();"/>Show class D airspace<br><input type="checkbox" id="clE" name="clE" value="yes" onclick="setAirspace();"/>Show class E airspace<br><input type="checkbox" id="clG" name="clG" value="yes" onclick="setAirspace();"/>Show class G airspace<br><input type="checkbox" id="clP" name="clP" value="yes" onclick="setAirspace();"/>Show prohibited airspace<br><input type="checkbox" id="clR" name="clR" value="yes" onclick="setAirspace();"/>Show restricted airspace<br><input type="checkbox" id="clM" name="clM" value="yes" onclick="setAirspace();"/>Show MATZs<br><input type="checkbox" id="clQ" name="clQ" value="yes" onclick="setAirspace();"/>Show danger areas<br><input type="checkbox" id="clX" name="clX" value="yes" onclick="setAirspace();"/>Show offshore/NOTAMed danger areas<br><input type="checkbox" id="clH" name="clH" value="yes" onclick="setAirspace();"/>Show hazards (HIRTA/AIAA etc)</fieldset></tr></table></form>
-            <tr class="input_row">
+            </td>
-                <td class="input_label" colspan="2">Target Burst Altitude (m)</td>
-
-                <td class="input_instruction" rowspan="3">OR</td>
-                <td class="input_label" colspan="2">Target Ascent Rate (m/s)</td>
-            </tr>
-            <tr class="input_row">
-                <td colspan="2">
-                    <input type="text" id="tba" class="input_field" value="33000" tabindex="3"/>
-                </td>
-                <td colspan="2">
-
-                    <input type="text" id="tar" class="input_field" tabindex="4"/>
-                </td>
-            </tr>
-            <tr class="warning_row">
-                <td id="tba_w" colspan="2">&nbsp;</td>
-                <td id="tar_w" colspan="2">&nbsp;</td>
-            </tr>
-            <tr class="output_row">
-                <td class="output_label">Burst Altitude:</td>
-                <td class="output_data"><span id="ba">33000</span> m</td>
-                <td></td>
-                <td class="output_label">Ascent Rate:</td>
-                <td class="output_data"><span id="ar">2.33</span> m/s</td>
-
-            </tr>
-            <tr class="output_row">
-                <td class="output_label">Time to Burst:</td>
-                <td class="output_data"><span id="ttb">238</span> min</td>
-                <td></td>
-                <td class="output_label">Neck Lift:</td>
-                <td class="output_data"><span id="nl">1733</span> g</td>
-
-            </tr>
-            <tr class="output_row">
-                <td class="output_label">Launch Volume:</td>
-                <td class="output_data"><span id="lv_m3">2.66</span> 
-                    m<sup>3</sup></td>
-                <td></td>
-                <td class="output_data"><span id="lv_l">2660</span> L</td>
-                <td class="output_data"><span id="lv_cf">93.9</span>
-                     ft<sup>3</sup></td>
-
             </tr>
         </table>
-        <br>
+        <input type="button" id="notam-settings-close" name="notam-settings-submit" 
-        <input type="button" id="burst-calc-advanced-show"
-            name="burst-calc-advanced-show" value="Advanced">
-        <input type="button" id="burst-calc-use" name="burst-calc-submit" 
-            value="Use Values"/ >
-        <input type="button" id="burst-calc-close" name="burst-calc-submit" 
             value="Close"/ >
     </div>
 </div>
@@ -510,7 +427,7 @@ google.load("jqueryui", "1.8.1");
     </tr>
     <tr><td>Display UK NOTAMS &amp; Airspace: </td>
         <td>
-	<input type="checkbox" name="notams" value="notams" />
+	<input id="notam-display" type="checkbox" name="notams" value="notams" />
             <a id="notam-settings-show" class="tipsyLink"
                 title="Advanced NOTAM &amp; Airspace Settings">
                 Advanced</a>

predict/js/pred/pred-config.js

@@ -17,6 +17,7 @@ var ajaxEventHandle;
 var current_uuid = '0';
 
 var map;
+var kmlLayer = null;
 var map_items = [];
 var launch_img = "images/target-1-sm.png";
 var land_img = "images/target-8-sm.png";

predict/js/pred/pred-event.js

@@ -68,43 +68,25 @@ function EH_BurstCalc() {
 }
 
 function EH_NOTAMSettings() {
-    // Activate the "use burst calc" links
+    // Activate the checkbox 
+    $("#notam-display").click(function() {
+        if (document.modelForm.notams.checked){
+            if (kmlLayer == null) kmlLayer = new google.maps.KmlLayer('http://www.habhub.org/kml_testing/notam_and_restrict.kml', {preserveViewport: true});
+            kmlLayer.setMap(map);
+	}
+	else {
+	    kmlLayer.setMap(null);
+	}
+    });
+    // Activate the "notam settings" links
     $("#notam-settings-show").click(function() {
-	alert("RJH");
         $("#notam-settings-wrapper").show();
     });
-    $("#burst-calc-show").hover(
+    $("#notam-settings-close").click(function() {
-        function() {
+        // Close the notam settings doing anything
-            $("#ascent,#burst").css("background-color", "#AACCFF");
+        $("#notam-settings-wrapper").hide();
-        },
-        function() {
-            $("#ascent,#burst").css("background-color", "#FFFFFF");
-        });
-    $("#burst-calc-use").click(function() {
-        // Write the ascent rate and burst altitude to the launch card
-        $("#ascent").val($("#ar").html());
-        $("#burst").val($("#ba").html());
-        $("#burst-calc-wrapper").hide();
-    });
-    $("#burst-calc-close").click(function() {
-        // Close the burst calc without doing anything
-        $("#burst-calc-wrapper").hide();
         $("#modelForm").show();
     });
-    $("#burst-calc-advanced-show").click(function() {
-        // Show the burst calculator constants
-        // We use a callback function to fade in the new content to make
-        // sure the old content has gone, in order to create a smooth effect
-        $("#burst-calc").fadeOut('fast', function() {
-            $("#burst-calc-constants").fadeIn();
-        });
-    });
-    $("#burst-calc-advanced-hide").click(function() {
-        // Show the burst calculator constants
-        $("#burst-calc-constants").fadeOut('fast', function() {
-            $("#burst-calc").fadeIn();
-        });
-    });
 }
 
 function EH_LaunchCard() {

predict/js/pred/pred-map.js

@@ -23,8 +23,6 @@ function initMap(centre_lat, centre_lon, zoom_level) {
       center: latlng
     };
     map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);
-    var ctaLayer = new google.maps.KmlLayer('http://www.habhub.org/kml_testing/notam_and_restrict.kml', {preserveViewport: true});
-    ctaLayer.setMap(map);
 }
 
 // Enable or disable user control of the map canvas, including scrolling,