Add an around bus stop search using HTML5 geolocation API

yamamuteki · Apr 25, 2016 · ebcad9a · ebcad9a
1 parent 146e8a1
commit ebcad9a
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 34 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -15,5 +15,5 @@
 //= require bootstrap-sprockets
 //= require underscore-min
 //= require gmaps/google
-//= require turbolinks
+// require turbolinks
 //= require_tree .
diff --git a/app/assets/javascripts/geolocation.coffee b/app/assets/javascripts/geolocation.coffee
@@ -0,0 +1,19 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
+$ ->
+ $("input[data-geolocation]").click (e) ->
+ return if ($('#q').val() != '') # keyword search
+ if (navigator.geolocation)
+ navigator.geolocation.getCurrentPosition(success, error)
+ else
+ console.warn('Navigator.geolocation not supported.')
+ false
+
+success = (position) ->
+ lat = position.coords.latitude
+ long = position.coords.longitude
+ window.location.href = '/bus_stops/?position=' + lat + ',' + long
+
+error = (err) ->
+ console.warn('ERROR(' + err.code + '): ' + err.message)
diff --git a/app/controllers/bus_stops_controller.rb b/app/controllers/bus_stops_controller.rb
@@ -1,7 +1,14 @@
 class BusStopsController < ApplicationController
  def index
  session[:q] = params[:q]
- @bus_stops = BusStop.where("name like '%#{params[:q]}%'").limit(100)
+ @bus_stops = []
+ if params[:q] then
+ @bus_stops = BusStop.where("name like '%#{params[:q]}%'").limit(100)
+ elsif params[:position]
+ latitude = params[:position].split(',')[0].to_f
+ longitude = params[:position].split(',')[1].to_f
+ @bus_stops = BusStop.near([latitude, longitude], 20000).limit(25)
+ end
  @hash = Gmaps4rails.build_markers(@bus_stops) do |bus_stop, marker|
  marker.lat bus_stop.latitude
  marker.lng bus_stop.longitude

diff --git a/app/models/bus_stop.rb b/app/models/bus_stop.rb
@@ -1,5 +1,6 @@
 class BusStop < ActiveRecord::Base
  has_and_belongs_to_many :bus_route_infos
+ reverse_geocoded_by :latitude, :longitude
  def address
  Geocoder.address("#{self.latitude},#{self.longitude}")
  end

diff --git a/app/views/application/_bus_stop_search_form.html.erb b/app/views/application/_bus_stop_search_form.html.erb
@@ -0,0 +1,8 @@
+<%= form_tag bus_stops_path, :method => 'get' do %>
+ <div class="input-group">
+ <%= text_field_tag :q, params[:q] || session[:q], placeholder: 'バス停名を省略すると周辺を検索します。', class: 'form-control' %>
+ <span class="input-group-btn">
+ <%= submit_tag '検索', name: nil, class: 'btn btn-primary', data: { geolocation: '' } %>
+ </span>
+ </div>
+<% end %>
diff --git a/app/views/bus_route_infos/show.html.erb b/app/views/bus_route_infos/show.html.erb
@@ -1,13 +1,6 @@
 <div class="row page-top-search-box">
  <div class="col-sm-4">
- <%= form_tag bus_stops_path, :method => 'get' do %>
- <div class="input-group">
- <%= text_field_tag :q, session[:q], placeholder: 'バス停名を入力してください。', class: 'form-control' %>
- <span class="input-group-btn">
- <%= submit_tag "検索", name: nil, class: 'btn btn-primary' %>
- </span>
- </div>
- <% end %>
+ <%= render partial: 'bus_stop_search_form' %>
  <h1><%= @bus_route_info.line_name %></h1>
  <p>
  <%= "#{@bus_route_info.operation_company}" %><br />

diff --git a/app/views/bus_stops/index.html.erb b/app/views/bus_stops/index.html.erb
@@ -1,13 +1,6 @@
 <div class="row page-top-search-box">
  <div class="col-sm-4">
- <%= form_tag bus_stops_path, :method => 'get' do %>
- <div class="input-group">
- <%= text_field_tag :q, params[:q], placeholder: 'バス停名を入力してください。', class: 'form-control' %>
- <span class="input-group-btn">
- <%= submit_tag "検索", name: nil, class: 'btn btn-primary' %>
- </span>
- </div>
- <% end %>
+ <%= render partial: 'bus_stop_search_form' %>
  <h1>検索結果</h1>
  <ol class="find-result">
  <% @bus_stops.each do |bus_stop| %>

diff --git a/app/views/bus_stops/show.html.erb b/app/views/bus_stops/show.html.erb
@@ -1,13 +1,6 @@
 <div class="row page-top-search-box">
  <div class="col-sm-4">
- <%= form_tag bus_stops_path, :method => 'get' do %>
- <div class="input-group">
- <%= text_field_tag :q, session[:q], placeholder: 'バス停名を入力してください。', class: 'form-control' %>
- <span class="input-group-btn">
- <%= submit_tag "検索", name: nil, class: 'btn btn-primary' %>
- </span>
- </div>
- <% end %>
+ <%= render partial: 'bus_stop_search_form' %>
  <h1><%= @bus_stop.name %></h1>
  <p><%= link_to @bus_stop.address + '付近', "http://maps.google.co.jp/maps?q=#{@bus_stop.latitude},#{@bus_stop.longitude}" %></p>
  <ol>

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -15,14 +15,7 @@
  </p>
  </div>
  <div class="col-sm-offset-4 col-sm-4 text-center">
- <%= form_tag bus_stops_path, :method => 'get' do %>
- <div class="input-group">
- <%= text_field_tag :q, params[:q], placeholder: 'バス停名を入力してください。', class: 'form-control' %>
- <span class="input-group-btn">
- <%= submit_tag "検索", name: nil, class: 'btn btn-primary' %>
- </span>
- </div>
- <% end %>
+ <%= render partial: 'bus_stop_search_form' %>
  </div>
  <div class="col-sm-offset-4 col-sm-4">
  <ul class="reference-info">