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

moved flightaware first when a plane is selected

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
+LATLONFILE=/var/lib/dump1090/latlon
-if [ -n "$LON" ]; then ARGS="$ARGS --lon $LON"; fi
+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:

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>