Merge pull request projecthorus#23 from darksidelemm/main

Update welcome area, make chase car uploads work

Author: darksidelemm

index.html

@@ -61,22 +61,32 @@
             <h2><i class="icon-question rfloat"></i>Welcome</h2>
             <hr/>
             <div id="motda">
-                                
-                <h4>How do I receive?</h4>
-                Set up a receiver station using 
-                <a href="https://github.com/projecthorus/horusdemodlib/wiki/1.1-Horus-GUI-Reception-Guide-(Windows-Linux-OSX)" target="_blank" rel="noopener">Horus-GUI</a> or <a href="https://github.com/projecthorus/horusdemodlib/wiki/1.2--Raspberry-Pi-'Headless'-RX-Guide" target="_blank" rel="noopener">horusdemodlib</a>.
+                This site displays telemetry from Amateur Radio high-altitude balloon launches, using the 
+                <a href="https://github.com/projecthorus/sondehub-infra/wiki" target="_blank" rel="noopener">SondeHub-Amateur</a> database.
+                The tracker and database are still under development, so some features may be non-functional.
+                <br/>
+                If you're looking for meteorological radiosondes, try the regular
+                <a href="https://tracker.sondehub.org/" target="_blank" rel="noopener">SondeHub Tracker.</a>
+
+                <h4>How do I help receive?</h4>
+                Information on receiving common telemetry formats is 
+                <a href="https://github.com/projecthorus/sondehub-amateur-tracker/wiki/Receiving-High-Altitude-Balloon-Telemetry" target="_blank" rel="noopener">available here.</a> 
+                <br/>
+
+                <h4>I'm launching a balloon!</h4>
+                <a href="https://github.com/projecthorus/sondehub-amateur-tracker/wiki/Getting-your-Flight-on-the-Sondehub-Amateur-Tracker" target="_blank" rel="noopener">Click here</a>
+                for information on how to get your balloon on the map!
                 <br/>
 
                 <h4>Support Us!</h4>
                 AWS hosting unfortunately does not come cheap. 
                 If you use SondeHub Amateur regularly, please consider <a href="https://www.patreon.com/sondehub" target="_blank" rel="noopener">supporting us on Patreon</a>, or with a <a href="https://sondehub.org/go/donate" target="_blank" rel="noopener">donation on Paypal</a>.
+                <br />
+                A huge thanks to 
+                <a href="https://www.ampr.org/" target="_blank" rel="noopener">Amateur Radio Digital Communications</a> for supporting us with a grant!
 
-                <h4>Info</h4>
-                This site uses data from the <a href="https://github.com/projecthorus/sondehub-infra/wiki" target="_blank" rel="noopener">SondeHub Amateur</a> database, which will remove the  
-                load from the Habitat tracking database.
-                
                 <h4>Predictions</h4>
-                You can predict the flight paths of future sondes using the <a href="https://predict.sondehub.org/" target="_blank" rel="noopener">SondeHub Predictor</a>.
+                You can predict the flight paths of future launches using the <a href="https://predict.sondehub.org/" target="_blank" rel="noopener">SondeHub Predictor</a>.
 
             </div>
             <h2>Contribute</h2>
@@ -224,7 +234,7 @@ <h2><i class="icon-car rfloat"></i>Chase Mode</h2>
                 <span class="r"><input type="text" id="cc_callsign" style="width: 140px;"/></span>
             </div>
             <div class="row">
-                <span><b>Notice: If you enable this, your location will be uploaded to SondeHub; making it publicly visible on the map.</b></span>
+                <span><b>Notice: If you enable this, your location will be uploaded to SondeHub-Amateur, making it publicly visible on the map.</b></span>
             </div>
             <hr>
             <div class="row">

js/chasecar.lib.js

@@ -8,7 +8,7 @@
  */
 
 ChaseCar = {
-    db_uri: "https://api.v2.sondehub.org/listeners",   // Sondehub API
+    db_uri: "https://api.v2.sondehub.org/amateur/listeners",   // Sondehub API
 };
 
 // Updated SondeHub position upload function.
@@ -22,7 +22,7 @@ ChaseCar.updatePosition = function(callsign, position) {
     _position_alt = ((!!position.coords.altitude) ? position.coords.altitude : 0);
 
     var _doc = {
-        "software_name": "SondeHub Amateur",
+        "software_name": "SondeHub-Amateur",
         "software_version": "{VER}",
         "uploader_callsign": callsign,
         "uploader_position": [position.coords.latitude, position.coords.longitude, _position_alt],