Merge pull request #2 from flightaware/FA-first-on-map

moved flightaware first when a plane is selected
2015-06-10 17:45:29 -05:00 · 2015-06-10 22:33:28 +00:00 · 2015-06-10 16:35:57 -05:00 · 2015-06-10 19:29:10 +00:00 · 2015-06-10 15:26:11 +00:00 · 2015-06-09 22:03:14 +00:00
2 changed files with 9 additions and 4 deletions
--- a/debian/dump1090-mutability.init
+++ b/debian/dump1090-mutability.init
@ -63,8 +63,13 @@ if [ "x$OVERSAMPLE" = "xyes" ]; then ARGS="$ARGS --oversample"; fi
 if [ "x$FIX_CRC" = "xyes" ]; then ARGS="$ARGS --fix"; fi
 if [ "x$PHASE_ENHANCE" = "xyes" ]; then ARGS="$ARGS --phase-enhance"; fi
 if [ "x$AGGRESSIVE" = "xyes" ]; then ARGS="$ARGS --aggressive"; fi
-if [ -n "$LAT" ]; then ARGS="$ARGS --lat $LAT"; fi
-if [ -n "$LON" ]; then ARGS="$ARGS --lon $LON"; fi
+LATLONFILE=/var/lib/dump1090/latlon
+if [ -e $LATLONFILE ]; then
+	LATVAL=$(sed -n '1p' < $LATLONFILE)
+	LONVAL=$(sed -n '2p' < $LATLONFILE)
+fi
+if [ -n "$LAT" ]; then ARGS="$ARGS --lat $LAT"; elif [ -n $LATVAL ]; then ARGS="$ARGS --lat $LATVAL"; fi
+if [ -n "$LON" ]; then ARGS="$ARGS --lon $LON"; elif [ -n $LONVAL ]; then ARGS="$ARGS --lon $LONVAL"; fi
 ARGS="$ARGS --max-range $MAX_RANGE"; fi

 # net:
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@ -119,9 +119,9 @@
                                        <span id="selected_icaotype"></span>
                                        <span id="selected_emergency"></span>
                                        <span id="selected_links">
-                                          <a id="selected_fr24_link" href="" target="_blank">[FR24]</a>
-                                          <a id="selected_flightstats_link" href="" target="_blank">[FlightStats]</a>
                                          <a id="selected_flightaware_link" href="" target="_blank">[FlightAware]</a>
+										  <a id="selected_fr24_link" href="" target="_blank">[FR24]</a>
+                                          <a id="selected_flightstats_link" href="" target="_blank">[FlightStats]</a>
                                        </span>
                                      </td>
                                    </tr>
Author	SHA1	Message	Date
Taylor Vaughn	a3d26ea510	Merge pull request #2 from flightaware/FA-first-on-map moved flightaware first when a plane is selected	2015-06-10 17:45:29 -05:00
Taylor Vaughn	0e8726a12c	moved flightaware first when a plane is selected	2015-06-10 22:33:28 +00:00
Karl Lehenbauer	c033f621dc	Merge pull request #1 from flightaware/latlon Latlon	2015-06-10 16:35:57 -05:00
Taylor Vaughn	ffd083c2e6	Merge branch 'master' into latlon	2015-06-10 19:29:10 +00:00
Taylor Vaughn	4837fb615d	fixed typo and bad if statement syntax	2015-06-10 15:26:11 +00:00
Taylor Vaughn	84413b20f4	we should edit init file. We dont actually want to hard code the template	2015-06-09 22:03:14 +00:00
Taylor Vaughn	be08514799	config updated to support lat/lon saved in file	2015-06-09 19:18:11 +00:00