Merge pull request james#1 from lazyatom/master

Find bus stops near me using geolocation

bus.rb

@@ -10,10 +10,17 @@
 get '/' do
   if params[:search] && params[:search] != ""
     @search_results = STOPS.select {|x| x["name"] =~ /#{params[:search]}/i}
+  elsif params[:lat] && params[:lon] && params[:lat] != "" && params[:lon] != ""
+    @search_results = STOPS.select { |x| approximate_distance_between(x, params) < 0.005 }
+    @search_results.sort_by! { |x| approximate_distance_between(x, params) }
   end
   erb :index
 end
 
+get '/nearby' do
+  erb :nearby
+end
+
 get '/stop/:stop_id' do |stop_id|
   @stop = STOPS.select {|x| x["id"] =~ /#{stop_id}/i}.first
   get_stop_json(stop_id)
@@ -44,3 +51,9 @@ def get_stop_json(stop_id)
 def make_request(stop_id)
   Net::HTTP.get(URI.parse("http://countdown.tfl.gov.uk/stopBoard/#{stop_id}/"))
 end
+
+def approximate_distance_between(stop, coords)
+  lat_diff = (stop["lat"].to_f - coords[:lat].to_f).abs
+  lon_diff = (stop["lng"].to_f - coords[:lon].to_f).abs
+  diff = Math.sqrt(lat_diff**2 + lon_diff**2)
+end

templates/index.erb

@@ -1,4 +1,4 @@
-<p>Search for a bus stop name here.</p>
+<p>Search for a bus stop name here, or try <a href="/nearby">autolocation</a>.</p>
 <form action="/" method="get">
   <input name="search" type="text" />
   <input type="submit" value="Search">
@@ -14,8 +14,9 @@
           <% if result["stopIndicator"] %>
             (<%= result["stopIndicator"] %>)
           <% end %>
-        </a> <br />
+        </a> (<a href="http://maps.google.com/maps?z=16&q=loc:<%= result["lat"]%>+<%= result["lng"]%>">map</a>)
         <% if result["towards"] %>
+        <br />
           Towards <%= result["towards"].downcase.gsub(/\b\w/){$&.upcase} %>
         <% end %>
         <br />

templates/nearby.erb

@@ -0,0 +1,6 @@
+<p>Determining location...</p>
+<script>
+  navigator.geolocation.getCurrentPosition(function(location) {
+    window.location = ("/?lat=" + location.coords.latitude + "&lon=" + location.coords.longitude);
+  });
+</script>