add bicycle & driving type to return projects in diff order

app/controllers/projects_controller.rb

@@ -1,7 +1,8 @@
 class ProjectsController < ApplicationController
 
   def index
-    @projects = Project.all
+    @projects = []
+    address_order.each {|x| @projects << Project.find_by(address: x)}
   end
 
   def show
@@ -44,4 +45,15 @@ def result
     @project = Project.find(params[:id])
   end
 
+  private
+  def address_order
+    if params[:type] == 'walking'
+      ['青年大教堂', '红楼', '省博', '黄鹤楼', '武汉大学', '昙华林']
+    elsif params[:type] == 'bicycle'
+      %w(武汉大学 昙华林 黄鹤楼 省博 青年大教堂 红楼)
+    else
+      %w(黄鹤楼 省博 昙华林 红楼 青年大教堂 武汉大学)
+    end
+  end
+
 end

app/views/projects/index.rabl

@@ -1,7 +1,5 @@
-collection :@projects
-
-attributes :id, :name, :description, :sponsor, :address, :background, :image, :unit_type, :unit_steps_count
-
-node(:distance) do |pro|
-  "#{pro.distance([params[:coordinates].try(&:first).to_f, params[:coordinates].try(&:last).to_f])} km"
+node(:projects) do
+  @projects.map do |v|
+    partial 'projects/project', object: v
+  end
 end

app/views/projects/project.rabl

@@ -0,0 +1,5 @@
+attributes :id, :name, :description, :sponsor, :address, :background, :image, :unit_type, :unit_steps_count
+
+node(:distance) do |pro|
+  "#{pro.distance([params[:coordinates].try(&:first).to_f, params[:coordinates].try(&:last).to_f])} km"
+end